From 0418c6591424ef6a0425b9364f7be13fcab89a77 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 25 Feb 2024 19:25:00 +0800 Subject: [PATCH] [pre-commit.ci] pre-commit autoupdate (#5488) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [pre-commit.ci] pre-commit autoupdate updates: - [github.com/psf/black: 23.12.1 → 24.2.0](https://github.com/psf/black/compare/23.12.1...24.2.0) - [github.com/finsberg/clang-format-docs: v0.2.2 → v0.3.0](https://github.com/finsberg/clang-format-docs/compare/v0.2.2...v0.3.0) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 +- docs/source/_ext/version.py | 6 +- examples/Abaqus/skewExample.py | 1 + examples/Parameter-Identification/optimize.py | 1 + .../Adaptivity/AdaptiveMeshConstraintState.py | 32 ++-- src/abaqus/Adaptivity/AdaptivityStep.py | 168 +++++++++--------- ...DisplacementAdaptiveMeshConstraintState.py | 32 ++-- src/abaqus/Adaptivity/RuleResult.py | 3 +- .../VelocityAdaptiveMeshConstraintState.py | 32 ++-- src/abaqus/Assembly/AssemblyModel.py | 3 +- src/abaqus/Assembly/ModelInstance.py | 3 +- src/abaqus/BasicGeometry/EdgeArray.py | 9 +- src/abaqus/BasicGeometry/FaceArray.py | 9 +- src/abaqus/BasicGeometry/IgnoredEdgeArray.py | 9 +- .../BasicGeometry/IgnoredVertexArray.py | 9 +- src/abaqus/BasicGeometry/VertexArray.py | 9 +- .../BoundaryCondition/BoundaryCondition.py | 6 +- src/abaqus/Canvas/Canvas.py | 3 +- src/abaqus/Canvas/Displayable.py | 3 +- src/abaqus/Canvas/Highlight.py | 1 + .../Connector/ConnectorBehaviorOption.py | 3 +- src/abaqus/EditMesh/MeshEditAssembly.py | 3 +- src/abaqus/EditMesh/MeshEditPart.py | 6 +- src/abaqus/Feature/Feature.py | 36 ++-- src/abaqus/Field/AnalyticalField.py | 28 +-- src/abaqus/Field/FieldOdb.py | 3 +- src/abaqus/Field/OdbMeshRegionData.py | 28 +-- src/abaqus/FieldReport/FieldReportSession.py | 5 +- src/abaqus/Interaction/ContactExp.py | 3 +- src/abaqus/Interaction/ContactStd.py | 3 +- src/abaqus/Job/JobFromInputFile.py | 6 +- src/abaqus/Job/ModelJob.py | 6 +- src/abaqus/Mdb/MdbCommands.py | 1 + src/abaqus/Odb/FieldOutput.py | 12 +- src/abaqus/Odb/HistoryOutput.py | 11 +- src/abaqus/Odb/HistoryPoint.py | 3 +- src/abaqus/Odb/HistoryRegion.py | 8 +- src/abaqus/Odb/OdbFrame.py | 6 +- src/abaqus/Odb/OdbPartBase.py | 6 +- src/abaqus/Odb/UserData.py | 3 +- src/abaqus/OdbDisplay/OdbDisplay.py | 3 +- src/abaqus/Part/PartBase.py | 6 +- src/abaqus/Part/PartFeature.py | 5 +- src/abaqus/PathAndProbe/ProbeOptions.py | 24 +-- src/abaqus/PlugInRegistration/AFXBaseTable.py | 3 +- .../PlugInRegistration/AFXDataComponent.py | 3 +- .../PlugInRegistration/AFXTogglableKeyword.py | 3 +- .../PlugInRegistration/AFXTransition.py | 3 +- src/abaqus/PlugInRegistration/FXChore.py | 3 +- src/abaqus/PlugInRegistration/FXColor.py | 3 +- src/abaqus/PlugInRegistration/FXExponent.py | 3 +- src/abaqus/PlugInRegistration/FXFontDesc.py | 3 +- .../PlugInRegistration/FXIconListSortFunc.py | 3 +- .../PlugInRegistration/FXInputHandle.py | 3 +- src/abaqus/PlugInRegistration/FXMDIClient.py | 3 +- src/abaqus/PlugInRegistration/FXMenuPane.py | 3 +- src/abaqus/PlugInRegistration/FXMetaClass.py | 3 +- .../PlugInRegistration/FXProgressBar.py | 3 +- src/abaqus/PlugInRegistration/FXRGB.py | 3 +- src/abaqus/PlugInRegistration/FXSelector.py | 3 +- src/abaqus/PlugInRegistration/FXSrollArea.py | 3 +- src/abaqus/PlugInRegistration/FXTimer.py | 3 +- src/abaqus/PlugInRegistration/FXToolbar.py | 3 +- src/abaqus/PlugInRegistration/FXVisual.py | 3 +- .../PlugInRegistration/GUIPlugInCommands.py | 1 + .../KernelPlugInCommands.py | 1 + .../PlugInRegistration/PluginToolset.py | 3 +- .../PlugInRegistration/PluginToolsetBase.py | 3 +- src/abaqus/PlugInRegistration/SOCKET.py | 3 +- src/abaqus/Region/Region.py | 3 +- src/abaqus/Region/Set.py | 3 +- src/abaqus/Region/Surface.py | 3 +- src/abaqus/Sketcher/ConstrainedSketch.py | 3 +- .../ConstrainedSketchOptions.py | 5 +- .../ConstrainedSketcherOptions.py | 5 +- src/abaqus/TableCollection/EventSeriesData.py | 3 +- src/abaqus/UtilityAndView/Callback.py | 1 + src/abaqus/UtilityAndView/Customization.py | 1 + src/abaqus/UtilityAndView/Status.py | 3 +- src/abaqus/UtilityAndView/User.py | 4 +- src/abaqus/XY/XYData.py | 115 ++++++------ src/abaqus/XY/XYDataCommands.py | 112 ++++++------ src/abaqus/XY/XYSession.py | 76 ++++---- src/abqpy/config.py | 3 +- src/sketch.py | 6 +- src/symbolicConstants.py | 1 + tests/conftest.py | 1 + 87 files changed, 465 insertions(+), 515 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8ce0659f03..4718ec0a3b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/psf/black - rev: "23.12.1" + rev: "24.2.0" hooks: - id: black @@ -12,7 +12,7 @@ repos: - black - repo: https://github.com/finsberg/clang-format-docs - rev: v0.2.2 + rev: v0.3.0 hooks: - id: clang-format-docs additional_dependencies: diff --git a/docs/source/_ext/version.py b/docs/source/_ext/version.py index 0052e25d56..6a2ada8eb1 100644 --- a/docs/source/_ext/version.py +++ b/docs/source/_ext/version.py @@ -35,11 +35,7 @@ def run(self): version = ( major if self.type == "major" - else minor - if self.type == "minor" - else patch - if self.type == "patch" - else f"{major}.{minor}.{patch}" + else minor if self.type == "minor" else patch if self.type == "patch" else f"{major}.{minor}.{patch}" ) text = f"{prefix}{version}{suffix}" return [nodes.Text(text, text)], [] diff --git a/examples/Abaqus/skewExample.py b/examples/Abaqus/skewExample.py index 6b139141fc..9c050fd1f1 100644 --- a/examples/Abaqus/skewExample.py +++ b/examples/Abaqus/skewExample.py @@ -30,6 +30,7 @@ The theoretical results are also plotted. """ + import visualization from abaqus import * from abaqusConstants import * diff --git a/examples/Parameter-Identification/optimize.py b/examples/Parameter-Identification/optimize.py index 60d14366da..087c3d3d13 100644 --- a/examples/Parameter-Identification/optimize.py +++ b/examples/Parameter-Identification/optimize.py @@ -35,6 +35,7 @@ The model script of this example can be found :doc:`here `. """ + import os import numpy as np diff --git a/src/abaqus/Adaptivity/AdaptiveMeshConstraintState.py b/src/abaqus/Adaptivity/AdaptiveMeshConstraintState.py index 54bee0234c..766cd6dc99 100644 --- a/src/abaqus/Adaptivity/AdaptiveMeshConstraintState.py +++ b/src/abaqus/Adaptivity/AdaptiveMeshConstraintState.py @@ -51,21 +51,23 @@ class AdaptiveMeshConstraintState: def __init__( self, amplitudeState: Literal[C.UNSET, C.SET, C.FREED, C.UNCHANGED, C.MODIFIED] | None = None, - status: Literal[ - C.NOT_YET_ACTIVE, - C.PROPAGATED_FROM_BASE_STATE, - C.DEACTIVATED_FROM_BASE_STATE, - C.DEACTIVATED, - C.MODIFIED_FROM_BASE_STATE, - C.PROPAGATED, - C.NO_LONGER_ACTIVE, - C.CREATED, - C.INSTANCE_NOT_APPLICABLE, - C.BUILT_INTO_MODES, - C.TYPE_NOT_APPLICABLE, - C.MODIFIED, - ] - | None = None, + status: ( + Literal[ + C.NOT_YET_ACTIVE, + C.PROPAGATED_FROM_BASE_STATE, + C.DEACTIVATED_FROM_BASE_STATE, + C.DEACTIVATED, + C.MODIFIED_FROM_BASE_STATE, + C.PROPAGATED, + C.NO_LONGER_ACTIVE, + C.CREATED, + C.INSTANCE_NOT_APPLICABLE, + C.BUILT_INTO_MODES, + C.TYPE_NOT_APPLICABLE, + C.MODIFIED, + ] + | None + ) = None, amplitude: str = "", ): """The AdaptiveMeshConstraintState object is the abstract base type for other Arbitrary Lagrangian diff --git a/src/abaqus/Adaptivity/AdaptivityStep.py b/src/abaqus/Adaptivity/AdaptivityStep.py index aefcbbe21c..77fef2ff64 100644 --- a/src/abaqus/Adaptivity/AdaptivityStep.py +++ b/src/abaqus/Adaptivity/AdaptivityStep.py @@ -32,21 +32,23 @@ class AdaptivityStep(StepBase): def AdaptiveMeshConstraintState( self, amplitudeState: Literal[C.UNSET, C.SET, C.FREED, C.UNCHANGED, C.MODIFIED] | None = None, - status: Literal[ - C.NOT_YET_ACTIVE, - C.PROPAGATED_FROM_BASE_STATE, - C.DEACTIVATED_FROM_BASE_STATE, - C.DEACTIVATED, - C.MODIFIED_FROM_BASE_STATE, - C.PROPAGATED, - C.NO_LONGER_ACTIVE, - C.CREATED, - C.INSTANCE_NOT_APPLICABLE, - C.BUILT_INTO_MODES, - C.TYPE_NOT_APPLICABLE, - C.MODIFIED, - ] - | None = None, + status: ( + Literal[ + C.NOT_YET_ACTIVE, + C.PROPAGATED_FROM_BASE_STATE, + C.DEACTIVATED_FROM_BASE_STATE, + C.DEACTIVATED, + C.MODIFIED_FROM_BASE_STATE, + C.PROPAGATED, + C.NO_LONGER_ACTIVE, + C.CREATED, + C.INSTANCE_NOT_APPLICABLE, + C.BUILT_INTO_MODES, + C.TYPE_NOT_APPLICABLE, + C.MODIFIED, + ] + | None + ) = None, amplitude: str = "", ) -> AdaptiveMeshConstraintState: """The AdaptiveMeshConstraintState object is the abstract base type for other Arbitrary Lagrangian @@ -110,21 +112,23 @@ def DisplacementAdaptiveMeshConstraintState( ur2State: Literal[C.UNSET, C.SET, C.FREED, C.UNCHANGED, C.MODIFIED] | None = None, ur3State: Literal[C.UNSET, C.SET, C.FREED, C.UNCHANGED, C.MODIFIED] | None = None, amplitudeState: Literal[C.UNSET, C.SET, C.FREED, C.UNCHANGED, C.MODIFIED] | None = None, - status: Literal[ - C.NOT_YET_ACTIVE, - C.PROPAGATED_FROM_BASE_STATE, - C.DEACTIVATED_FROM_BASE_STATE, - C.DEACTIVATED, - C.MODIFIED_FROM_BASE_STATE, - C.PROPAGATED, - C.NO_LONGER_ACTIVE, - C.CREATED, - C.INSTANCE_NOT_APPLICABLE, - C.BUILT_INTO_MODES, - C.TYPE_NOT_APPLICABLE, - C.MODIFIED, - ] - | None = None, + status: ( + Literal[ + C.NOT_YET_ACTIVE, + C.PROPAGATED_FROM_BASE_STATE, + C.DEACTIVATED_FROM_BASE_STATE, + C.DEACTIVATED, + C.MODIFIED_FROM_BASE_STATE, + C.PROPAGATED, + C.NO_LONGER_ACTIVE, + C.CREATED, + C.INSTANCE_NOT_APPLICABLE, + C.BUILT_INTO_MODES, + C.TYPE_NOT_APPLICABLE, + C.MODIFIED, + ] + | None + ) = None, amplitude: str = "", ) -> DisplacementAdaptiveMeshConstraintState: """The DisplacementAdaptiveMeshConstraintState object stores the propagating data for an Arbitrary @@ -194,24 +198,24 @@ def DisplacementAdaptiveMeshConstraintState( A String specifying the name of the amplitude reference. The String is empty if the adaptive mesh constraint has no amplitude reference. """ - self.adaptiveMeshConstraintStates[ - amplitude - ] = adaptiveMeshConstraintState = DisplacementAdaptiveMeshConstraintState( - u1, - u2, - u3, - ur1, - ur2, - ur3, - u1State, - u2State, - u3State, - ur1State, - ur2State, - ur3State, - amplitudeState, - status, - amplitude, + self.adaptiveMeshConstraintStates[amplitude] = adaptiveMeshConstraintState = ( + DisplacementAdaptiveMeshConstraintState( + u1, + u2, + u3, + ur1, + ur2, + ur3, + u1State, + u2State, + u3State, + ur1State, + ur2State, + ur3State, + amplitudeState, + status, + amplitude, + ) ) return adaptiveMeshConstraintState @@ -231,21 +235,23 @@ def VelocityAdaptiveMeshConstraintState( vr2State: Literal[C.UNSET, C.SET, C.FREED, C.UNCHANGED, C.MODIFIED] | None = None, vr3State: Literal[C.UNSET, C.SET, C.FREED, C.UNCHANGED, C.MODIFIED] | None = None, amplitudeState: Literal[C.UNSET, C.SET, C.FREED, C.UNCHANGED, C.MODIFIED] | None = None, - status: Literal[ - C.NOT_YET_ACTIVE, - C.PROPAGATED_FROM_BASE_STATE, - C.DEACTIVATED_FROM_BASE_STATE, - C.DEACTIVATED, - C.MODIFIED_FROM_BASE_STATE, - C.PROPAGATED, - C.NO_LONGER_ACTIVE, - C.CREATED, - C.INSTANCE_NOT_APPLICABLE, - C.BUILT_INTO_MODES, - C.TYPE_NOT_APPLICABLE, - C.MODIFIED, - ] - | None = None, + status: ( + Literal[ + C.NOT_YET_ACTIVE, + C.PROPAGATED_FROM_BASE_STATE, + C.DEACTIVATED_FROM_BASE_STATE, + C.DEACTIVATED, + C.MODIFIED_FROM_BASE_STATE, + C.PROPAGATED, + C.NO_LONGER_ACTIVE, + C.CREATED, + C.INSTANCE_NOT_APPLICABLE, + C.BUILT_INTO_MODES, + C.TYPE_NOT_APPLICABLE, + C.MODIFIED, + ] + | None + ) = None, amplitude: str = "", ) -> VelocityAdaptiveMeshConstraintState: """The VelocityAdaptiveMeshConstraintState object stores the propagating data for an Arbitrary @@ -315,24 +321,24 @@ def VelocityAdaptiveMeshConstraintState( A String specifying the name of the amplitude reference. The String is empty if the adaptive mesh constraint has no amplitude reference. """ - self.adaptiveMeshConstraintStates[ - amplitude - ] = adaptiveMeshConstraintState = VelocityAdaptiveMeshConstraintState( - v1, - v2, - v3, - vr1, - vr2, - vr3, - v1State, - v2State, - v3State, - vr1State, - vr2State, - vr3State, - amplitudeState, - status, - amplitude, + self.adaptiveMeshConstraintStates[amplitude] = adaptiveMeshConstraintState = ( + VelocityAdaptiveMeshConstraintState( + v1, + v2, + v3, + vr1, + vr2, + vr3, + v1State, + v2State, + v3State, + vr1State, + vr2State, + vr3State, + amplitudeState, + status, + amplitude, + ) ) return adaptiveMeshConstraintState diff --git a/src/abaqus/Adaptivity/DisplacementAdaptiveMeshConstraintState.py b/src/abaqus/Adaptivity/DisplacementAdaptiveMeshConstraintState.py index 9eb3edc767..951c2594cd 100644 --- a/src/abaqus/Adaptivity/DisplacementAdaptiveMeshConstraintState.py +++ b/src/abaqus/Adaptivity/DisplacementAdaptiveMeshConstraintState.py @@ -108,21 +108,23 @@ def __init__( ur2State: Literal[C.UNSET, C.SET, C.FREED, C.UNCHANGED, C.MODIFIED] | None = None, ur3State: Literal[C.UNSET, C.SET, C.FREED, C.UNCHANGED, C.MODIFIED] | None = None, amplitudeState: Literal[C.UNSET, C.SET, C.FREED, C.UNCHANGED, C.MODIFIED] | None = None, - status: Literal[ - C.NOT_YET_ACTIVE, - C.PROPAGATED_FROM_BASE_STATE, - C.DEACTIVATED_FROM_BASE_STATE, - C.DEACTIVATED, - C.MODIFIED_FROM_BASE_STATE, - C.PROPAGATED, - C.NO_LONGER_ACTIVE, - C.CREATED, - C.INSTANCE_NOT_APPLICABLE, - C.BUILT_INTO_MODES, - C.TYPE_NOT_APPLICABLE, - C.MODIFIED, - ] - | None = None, + status: ( + Literal[ + C.NOT_YET_ACTIVE, + C.PROPAGATED_FROM_BASE_STATE, + C.DEACTIVATED_FROM_BASE_STATE, + C.DEACTIVATED, + C.MODIFIED_FROM_BASE_STATE, + C.PROPAGATED, + C.NO_LONGER_ACTIVE, + C.CREATED, + C.INSTANCE_NOT_APPLICABLE, + C.BUILT_INTO_MODES, + C.TYPE_NOT_APPLICABLE, + C.MODIFIED, + ] + | None + ) = None, amplitude: str = "", ): """ diff --git a/src/abaqus/Adaptivity/RuleResult.py b/src/abaqus/Adaptivity/RuleResult.py index 046d61646d..07f533a065 100644 --- a/src/abaqus/Adaptivity/RuleResult.py +++ b/src/abaqus/Adaptivity/RuleResult.py @@ -4,8 +4,7 @@ # Prevent circular import -class ErrorIndicatorResult: - ... +class ErrorIndicatorResult: ... @abaqus_class_doc diff --git a/src/abaqus/Adaptivity/VelocityAdaptiveMeshConstraintState.py b/src/abaqus/Adaptivity/VelocityAdaptiveMeshConstraintState.py index 471b1d370f..927ce2ad53 100644 --- a/src/abaqus/Adaptivity/VelocityAdaptiveMeshConstraintState.py +++ b/src/abaqus/Adaptivity/VelocityAdaptiveMeshConstraintState.py @@ -102,21 +102,23 @@ def __init__( vr2State: Literal[C.UNSET, C.SET, C.FREED, C.UNCHANGED, C.MODIFIED] | None = None, vr3State: Literal[C.UNSET, C.SET, C.FREED, C.UNCHANGED, C.MODIFIED] | None = None, amplitudeState: Literal[C.UNSET, C.SET, C.FREED, C.UNCHANGED, C.MODIFIED] | None = None, - status: Literal[ - C.NOT_YET_ACTIVE, - C.PROPAGATED_FROM_BASE_STATE, - C.DEACTIVATED_FROM_BASE_STATE, - C.DEACTIVATED, - C.MODIFIED_FROM_BASE_STATE, - C.PROPAGATED, - C.NO_LONGER_ACTIVE, - C.CREATED, - C.INSTANCE_NOT_APPLICABLE, - C.BUILT_INTO_MODES, - C.TYPE_NOT_APPLICABLE, - C.MODIFIED, - ] - | None = None, + status: ( + Literal[ + C.NOT_YET_ACTIVE, + C.PROPAGATED_FROM_BASE_STATE, + C.DEACTIVATED_FROM_BASE_STATE, + C.DEACTIVATED, + C.MODIFIED_FROM_BASE_STATE, + C.PROPAGATED, + C.NO_LONGER_ACTIVE, + C.CREATED, + C.INSTANCE_NOT_APPLICABLE, + C.BUILT_INTO_MODES, + C.TYPE_NOT_APPLICABLE, + C.MODIFIED, + ] + | None + ) = None, amplitude: str = "", ): """The VelocityAdaptiveMeshConstraintState object stores the propagating data for an Arbitrary diff --git a/src/abaqus/Assembly/AssemblyModel.py b/src/abaqus/Assembly/AssemblyModel.py index ea3aff8160..bf44edb3bf 100644 --- a/src/abaqus/Assembly/AssemblyModel.py +++ b/src/abaqus/Assembly/AssemblyModel.py @@ -5,8 +5,7 @@ # Prevent circular import -class ModelBase: - ... +class ModelBase: ... @abaqus_class_doc diff --git a/src/abaqus/Assembly/ModelInstance.py b/src/abaqus/Assembly/ModelInstance.py index 79b7da37bc..863f12980b 100644 --- a/src/abaqus/Assembly/ModelInstance.py +++ b/src/abaqus/Assembly/ModelInstance.py @@ -14,8 +14,7 @@ # prevent circular imports -class Model: - ... +class Model: ... @abaqus_class_doc diff --git a/src/abaqus/BasicGeometry/EdgeArray.py b/src/abaqus/BasicGeometry/EdgeArray.py index de442a01ac..5c3a6a8a83 100644 --- a/src/abaqus/BasicGeometry/EdgeArray.py +++ b/src/abaqus/BasicGeometry/EdgeArray.py @@ -70,8 +70,7 @@ def findAt( self, coordinates: tuple[float, float, float], printWarning: Boolean = True, - ) -> Edge: - ... + ) -> Edge: ... @overload @abaqus_method_doc @@ -79,8 +78,7 @@ def findAt( self, coordinates: tuple[tuple[float, float, float],], printWarning: Boolean = True, - ) -> list[Edge]: - ... + ) -> list[Edge]: ... @overload @abaqus_method_doc @@ -88,8 +86,7 @@ def findAt( self, *coordinates: tuple[tuple[float, float, float],], printWarning: Boolean = True, - ) -> list[Edge]: - ... + ) -> list[Edge]: ... @abaqus_method_doc def findAt(self, *args, **kwargs) -> Union[Edge, list[Edge]]: diff --git a/src/abaqus/BasicGeometry/FaceArray.py b/src/abaqus/BasicGeometry/FaceArray.py index a13a82ea5b..df5b7171cc 100644 --- a/src/abaqus/BasicGeometry/FaceArray.py +++ b/src/abaqus/BasicGeometry/FaceArray.py @@ -70,8 +70,7 @@ def findAt( self, coordinates: tuple[float, float, float], printWarning: Boolean = True, - ) -> Face: - ... + ) -> Face: ... @overload @abaqus_method_doc @@ -79,8 +78,7 @@ def findAt( self, coordinates: tuple[tuple[float, float, float],], printWarning: Boolean = True, - ) -> list[Face]: - ... + ) -> list[Face]: ... @overload @abaqus_method_doc @@ -88,8 +86,7 @@ def findAt( self, *coordinates: tuple[tuple[float, float, float],], printWarning: Boolean = True, - ) -> list[Face]: - ... + ) -> list[Face]: ... @abaqus_method_doc def findAt(self, *args, **kwargs) -> Union[Face, list[Face]]: diff --git a/src/abaqus/BasicGeometry/IgnoredEdgeArray.py b/src/abaqus/BasicGeometry/IgnoredEdgeArray.py index 7b981af814..cf95bfe1ec 100644 --- a/src/abaqus/BasicGeometry/IgnoredEdgeArray.py +++ b/src/abaqus/BasicGeometry/IgnoredEdgeArray.py @@ -25,8 +25,7 @@ class IgnoredEdgeArray(List[IgnoredEdge]): @overload @abaqus_method_doc - def findAt(self, coordinates: tuple[float, float, float], printWarning: Boolean = True) -> IgnoredEdge: - ... + def findAt(self, coordinates: tuple[float, float, float], printWarning: Boolean = True) -> IgnoredEdge: ... @overload @abaqus_method_doc @@ -34,8 +33,7 @@ def findAt( self, coordinates: tuple[tuple[float, float, float],], printWarning: Boolean = True, - ) -> list[IgnoredEdge]: - ... + ) -> list[IgnoredEdge]: ... @overload @abaqus_method_doc @@ -43,8 +41,7 @@ def findAt( self, *coordinates: tuple[tuple[float, float, float],], printWarning: Boolean = True, - ) -> list[IgnoredEdge]: - ... + ) -> list[IgnoredEdge]: ... @abaqus_method_doc def findAt(self, *args, **kwargs) -> Union[IgnoredEdge, list[IgnoredEdge]]: diff --git a/src/abaqus/BasicGeometry/IgnoredVertexArray.py b/src/abaqus/BasicGeometry/IgnoredVertexArray.py index 7f75b3a075..1f06e2d84f 100644 --- a/src/abaqus/BasicGeometry/IgnoredVertexArray.py +++ b/src/abaqus/BasicGeometry/IgnoredVertexArray.py @@ -25,8 +25,7 @@ class IgnoredVertexArray(List[IgnoredVertex]): @overload @abaqus_method_doc - def findAt(self, coordinates: tuple[float, float, float], printWarning: Boolean = True) -> IgnoredVertex: - ... + def findAt(self, coordinates: tuple[float, float, float], printWarning: Boolean = True) -> IgnoredVertex: ... @overload @abaqus_method_doc @@ -34,8 +33,7 @@ def findAt( self, coordinates: tuple[tuple[float, float, float],], printWarning: Boolean = True, - ) -> list[IgnoredVertex]: - ... + ) -> list[IgnoredVertex]: ... @overload @abaqus_method_doc @@ -43,8 +41,7 @@ def findAt( self, *coordinates: tuple[tuple[float, float, float],], printWarning: Boolean = True, - ) -> list[IgnoredVertex]: - ... + ) -> list[IgnoredVertex]: ... @abaqus_method_doc def findAt(self, *args, **kwargs) -> Union[IgnoredVertex, list[IgnoredVertex]]: diff --git a/src/abaqus/BasicGeometry/VertexArray.py b/src/abaqus/BasicGeometry/VertexArray.py index 416db1f70a..283ad521bf 100644 --- a/src/abaqus/BasicGeometry/VertexArray.py +++ b/src/abaqus/BasicGeometry/VertexArray.py @@ -64,8 +64,7 @@ def findAt( self, coordinates: tuple[float, float, float], printWarning: Boolean = True, - ) -> ConstrainedSketchVertex: - ... + ) -> ConstrainedSketchVertex: ... @overload @abaqus_method_doc @@ -73,8 +72,7 @@ def findAt( self, coordinates: tuple[tuple[float, float, float],], printWarning: Boolean = True, - ) -> list[ConstrainedSketchVertex]: - ... + ) -> list[ConstrainedSketchVertex]: ... @overload @abaqus_method_doc @@ -82,8 +80,7 @@ def findAt( self, *coordinates: tuple[tuple[float, float, float],], printWarning: Boolean = True, - ) -> list[ConstrainedSketchVertex]: - ... + ) -> list[ConstrainedSketchVertex]: ... @abaqus_method_doc def findAt(self, *args, **kwargs) -> Union[ConstrainedSketchVertex, list[ConstrainedSketchVertex]]: diff --git a/src/abaqus/BoundaryCondition/BoundaryCondition.py b/src/abaqus/BoundaryCondition/BoundaryCondition.py index 6339cab5f3..1e08eed557 100644 --- a/src/abaqus/BoundaryCondition/BoundaryCondition.py +++ b/src/abaqus/BoundaryCondition/BoundaryCondition.py @@ -92,8 +92,6 @@ def delete(self, indices: tuple): """ ... - def setValues(self, *args, **kwargs): - ... + def setValues(self, *args, **kwargs): ... - def setValuesInStep(self, *args, **kwargs): - ... + def setValuesInStep(self, *args, **kwargs): ... diff --git a/src/abaqus/Canvas/Canvas.py b/src/abaqus/Canvas/Canvas.py index edb9b32473..353008c310 100644 --- a/src/abaqus/Canvas/Canvas.py +++ b/src/abaqus/Canvas/Canvas.py @@ -1,2 +1 @@ -class Canvas: - ... +class Canvas: ... diff --git a/src/abaqus/Canvas/Displayable.py b/src/abaqus/Canvas/Displayable.py index a9c611366d..00b4ef17ee 100644 --- a/src/abaqus/Canvas/Displayable.py +++ b/src/abaqus/Canvas/Displayable.py @@ -1,2 +1 @@ -class Displayable: - ... +class Displayable: ... diff --git a/src/abaqus/Canvas/Highlight.py b/src/abaqus/Canvas/Highlight.py index d71bc0d24e..faeb23f7ee 100644 --- a/src/abaqus/Canvas/Highlight.py +++ b/src/abaqus/Canvas/Highlight.py @@ -1,5 +1,6 @@ """The Highlight commands are used to highlight objects in the current viewport and to remove the highlighting.""" + from abqpy.decorators import abaqus_function_doc diff --git a/src/abaqus/Connector/ConnectorBehaviorOption.py b/src/abaqus/Connector/ConnectorBehaviorOption.py index bf10ae15bc..1146624cba 100644 --- a/src/abaqus/Connector/ConnectorBehaviorOption.py +++ b/src/abaqus/Connector/ConnectorBehaviorOption.py @@ -21,8 +21,7 @@ # Prevent circular import -class DerivedComponent: - ... +class DerivedComponent: ... @abaqus_class_doc diff --git a/src/abaqus/EditMesh/MeshEditAssembly.py b/src/abaqus/EditMesh/MeshEditAssembly.py index 68769c42b4..055dd0470d 100644 --- a/src/abaqus/EditMesh/MeshEditAssembly.py +++ b/src/abaqus/EditMesh/MeshEditAssembly.py @@ -186,8 +186,7 @@ def mergeNodes(self, node1: MeshNode, node2: MeshNode, removeDuplicateElements: ... @abaqus_method_doc - def mergeNodes(self, *args, **kwargs): - ... + def mergeNodes(self, *args, **kwargs): ... def splitElement(self, elements: tuple): """This method splits quadrilateral elements into triangular elements. diff --git a/src/abaqus/EditMesh/MeshEditPart.py b/src/abaqus/EditMesh/MeshEditPart.py index 48abaf36e6..8e39de36fa 100644 --- a/src/abaqus/EditMesh/MeshEditPart.py +++ b/src/abaqus/EditMesh/MeshEditPart.py @@ -18,8 +18,7 @@ @abaqus_class_doc -class Node(MeshNode): - ... +class Node(MeshNode): ... class MeshEditPart(PartBase): @@ -377,8 +376,7 @@ def mergeNodes( ... @abaqus_method_doc - def mergeNodes(self, *args, **kwargs): - ... + def mergeNodes(self, *args, **kwargs): ... def orientElements(self, pickedElements: Sequence[MeshElement], referenceRegion: MeshFace): """This method orients the stack direction of elements in a continuum shell or gasket mesh. diff --git a/src/abaqus/Feature/Feature.py b/src/abaqus/Feature/Feature.py index ffef837424..c6177eedeb 100644 --- a/src/abaqus/Feature/Feature.py +++ b/src/abaqus/Feature/Feature.py @@ -224,36 +224,24 @@ def AttachmentPointsOffsetFromEdges( spacingMethod: Literal[C.AUTO_FIT_PTS, C.SPECIFY_NUM_PTS] = AUTO_FIT_PTS, patterningMethod: Literal[C.PATTERN_ORTHOGONALLY, C.PATTERN_ALONG_DIRECTION] = C.PATTERN_ORTHOGONALLY, referenceFace: str = "", - startPointForPatternDirection: ConstrainedSketchVertex - | Datum - | ReferencePoint - | MeshNode - | InterestingPoint - | Sequence[float] = (0.0, 0.0, 0.0), - endPointForPatternDirection: ConstrainedSketchVertex - | Datum - | ReferencePoint - | MeshNode - | InterestingPoint - | Sequence[float] = (0.0, 0.0, 0.0), + startPointForPatternDirection: ( + ConstrainedSketchVertex | Datum | ReferencePoint | MeshNode | InterestingPoint | Sequence[float] + ) = (0.0, 0.0, 0.0), + endPointForPatternDirection: ( + ConstrainedSketchVertex | Datum | ReferencePoint | MeshNode | InterestingPoint | Sequence[float] + ) = (0.0, 0.0, 0.0), offsetFromEdges: str = "", numberOfRows: int = 1, spacingBetweenRows: str = "", projectionMethod: Literal[C.PROJECT_BY_PROXIMITY, C.PROJECT_BY_DIRECTION] = PROJECT_BY_PROXIMITY, projectOnFaces: Sequence[Face] = (), projectOnElementFaces: Sequence[MeshFace] = (), - projectionDirStartPt: ConstrainedSketchVertex - | Datum - | ReferencePoint - | MeshNode - | InterestingPoint - | Sequence[float] = (0.0, 0.0, 0.0), - projectionDirEndPt: ConstrainedSketchVertex - | Datum - | ReferencePoint - | MeshNode - | InterestingPoint - | Sequence[float] = (0.0, 0.0, 0.0), + projectionDirStartPt: ( + ConstrainedSketchVertex | Datum | ReferencePoint | MeshNode | InterestingPoint | Sequence[float] + ) = (0.0, 0.0, 0.0), + projectionDirEndPt: ( + ConstrainedSketchVertex | Datum | ReferencePoint | MeshNode | InterestingPoint | Sequence[float] + ) = (0.0, 0.0, 0.0), setName: str = "", ) -> Feature: """This method creates a Feature object by creating attachment points along or offset from one or more diff --git a/src/abaqus/Field/AnalyticalField.py b/src/abaqus/Field/AnalyticalField.py index f7aa9c830b..37b879ad92 100644 --- a/src/abaqus/Field/AnalyticalField.py +++ b/src/abaqus/Field/AnalyticalField.py @@ -105,19 +105,21 @@ def OdbMeshRegionData( sectionPoint: str = "", refinementType: Literal[C.COMPONENT, C.NO_REFINEMENT, C.INVARIANT] | None = None, refinementLabel: str = "", - displayOutputPosition: Literal[ - C.ELEMENT_NODAL, - C.ELEMENT_FACE, - C.WHOLE_ELEMENT, - C.NODAL, - C.INTEGRATION_POINT, - C.ELEMENT_CENTROID, - C.WHOLE_MODEL, - C.GENERAL_PARTICLE, - C.WHOLE_PART_INSTANCE, - C.WHOLE_REGION, - ] - | None = None, + displayOutputPosition: ( + Literal[ + C.ELEMENT_NODAL, + C.ELEMENT_FACE, + C.WHOLE_ELEMENT, + C.NODAL, + C.INTEGRATION_POINT, + C.ELEMENT_CENTROID, + C.WHOLE_MODEL, + C.GENERAL_PARTICLE, + C.WHOLE_PART_INSTANCE, + C.WHOLE_REGION, + ] + | None + ) = None, ) -> OdbMeshRegionData: """This method creates an OdbMeshRegionData object. diff --git a/src/abaqus/Field/FieldOdb.py b/src/abaqus/Field/FieldOdb.py index b7f8ed017e..0caac1e52d 100644 --- a/src/abaqus/Field/FieldOdb.py +++ b/src/abaqus/Field/FieldOdb.py @@ -1,5 +1,4 @@ from ..Odb.OdbBase import OdbBase -class FieldOdb(OdbBase): - ... +class FieldOdb(OdbBase): ... diff --git a/src/abaqus/Field/OdbMeshRegionData.py b/src/abaqus/Field/OdbMeshRegionData.py index 26e7cb45bf..d7183bb2d9 100644 --- a/src/abaqus/Field/OdbMeshRegionData.py +++ b/src/abaqus/Field/OdbMeshRegionData.py @@ -218,19 +218,21 @@ def __init__( sectionPoint: str = "", refinementType: Literal[C.COMPONENT, C.NO_REFINEMENT, C.INVARIANT] | None = None, refinementLabel: str = "", - displayOutputPosition: Literal[ - C.ELEMENT_NODAL, - C.ELEMENT_FACE, - C.WHOLE_ELEMENT, - C.NODAL, - C.INTEGRATION_POINT, - C.ELEMENT_CENTROID, - C.WHOLE_MODEL, - C.GENERAL_PARTICLE, - C.WHOLE_PART_INSTANCE, - C.WHOLE_REGION, - ] - | None = None, + displayOutputPosition: ( + Literal[ + C.ELEMENT_NODAL, + C.ELEMENT_FACE, + C.WHOLE_ELEMENT, + C.NODAL, + C.INTEGRATION_POINT, + C.ELEMENT_CENTROID, + C.WHOLE_MODEL, + C.GENERAL_PARTICLE, + C.WHOLE_PART_INSTANCE, + C.WHOLE_REGION, + ] + | None + ) = None, ): """This method creates an OdbMeshRegionData object. diff --git a/src/abaqus/FieldReport/FieldReportSession.py b/src/abaqus/FieldReport/FieldReportSession.py index c116ab5055..e981b912a2 100644 --- a/src/abaqus/FieldReport/FieldReportSession.py +++ b/src/abaqus/FieldReport/FieldReportSession.py @@ -48,8 +48,9 @@ def writeFieldReport( C.GENERAL_PARTICLE, C.WHOLE_PART_INSTANCE, ], - numericForm: Literal[C.COMPLEX_PHASE, C.COMPLEX_MAG_AT_ANGLE, C.REAL, C.IMAGINARY, C.COMPLEX_MAGNITUDE] - | None = None, + numericForm: ( + Literal[C.COMPLEX_PHASE, C.COMPLEX_MAG_AT_ANGLE, C.REAL, C.IMAGINARY, C.COMPLEX_MAGNITUDE] | None + ) = None, complexAngle: float | None = None, stepFrame: Literal[C.ALL, C.SPECIFY] = SPECIFY, ): diff --git a/src/abaqus/Interaction/ContactExp.py b/src/abaqus/Interaction/ContactExp.py index c4a058fd24..07c490b562 100644 --- a/src/abaqus/Interaction/ContactExp.py +++ b/src/abaqus/Interaction/ContactExp.py @@ -309,5 +309,4 @@ def __init__( """ super().__init__() - def __init__(self, *args, **kwargs): - ... + def __init__(self, *args, **kwargs): ... diff --git a/src/abaqus/Interaction/ContactStd.py b/src/abaqus/Interaction/ContactStd.py index a060303e5e..88e707a378 100644 --- a/src/abaqus/Interaction/ContactStd.py +++ b/src/abaqus/Interaction/ContactStd.py @@ -363,5 +363,4 @@ def __init__( """ ... - def __init__(self, *args, **kwargs): - ... + def __init__(self, *args, **kwargs): ... diff --git a/src/abaqus/Job/JobFromInputFile.py b/src/abaqus/Job/JobFromInputFile.py index f6f0ed2459..560532d1be 100644 --- a/src/abaqus/Job/JobFromInputFile.py +++ b/src/abaqus/Job/JobFromInputFile.py @@ -116,9 +116,9 @@ class JobFromInputFile(Job): #: A SymbolicConstant specifying whether to use the double precision version of #: Abaqus/Explicit. Possible values are SINGLE, FORCE_SINGLE, DOUBLE, #: DOUBLE_CONSTRAINT_ONLY, and DOUBLE_PLUS_PACK. The default value is SINGLE. - explicitPrecision: Literal[ - C.SINGLE, C.FORCE_SINGLE, C.DOUBLE, C.DOUBLE_CONSTRAINT_ONLY, C.DOUBLE_PLUS_PACK - ] = SINGLE + explicitPrecision: Literal[C.SINGLE, C.FORCE_SINGLE, C.DOUBLE, C.DOUBLE_CONSTRAINT_ONLY, C.DOUBLE_PLUS_PACK] = ( + SINGLE + ) #: A SymbolicConstant specifying the precision of the nodal output written to the output #: database. Possible values are SINGLE and FULL. The default value is SINGLE. diff --git a/src/abaqus/Job/ModelJob.py b/src/abaqus/Job/ModelJob.py index fd5ebd5600..1bef28f0dc 100644 --- a/src/abaqus/Job/ModelJob.py +++ b/src/abaqus/Job/ModelJob.py @@ -97,9 +97,9 @@ class ModelJob(Job): #: A SymbolicConstant specifying whether to use the double precision version of #: Abaqus/Explicit. Possible values are SINGLE, FORCE_SINGLE, DOUBLE, #: DOUBLE_CONSTRAINT_ONLY, and DOUBLE_PLUS_PACK. The default value is SINGLE. - explicitPrecision: Literal[ - C.SINGLE, C.FORCE_SINGLE, C.DOUBLE, C.DOUBLE_CONSTRAINT_ONLY, C.DOUBLE_PLUS_PACK - ] = SINGLE + explicitPrecision: Literal[C.SINGLE, C.FORCE_SINGLE, C.DOUBLE, C.DOUBLE_CONSTRAINT_ONLY, C.DOUBLE_PLUS_PACK] = ( + SINGLE + ) #: A SymbolicConstant specifying the precision of the nodal output written to the output #: database. Possible values are SINGLE and FULL. The default value is SINGLE. diff --git a/src/abaqus/Mdb/MdbCommands.py b/src/abaqus/Mdb/MdbCommands.py index 5d7e73ace2..a2f6b8500e 100644 --- a/src/abaqus/Mdb/MdbCommands.py +++ b/src/abaqus/Mdb/MdbCommands.py @@ -10,6 +10,7 @@ * CombineOptResults """ + from __future__ import annotations from typing import Sequence, Union diff --git a/src/abaqus/Odb/FieldOutput.py b/src/abaqus/Odb/FieldOutput.py index c47d418e39..6570b6b242 100644 --- a/src/abaqus/Odb/FieldOutput.py +++ b/src/abaqus/Odb/FieldOutput.py @@ -162,8 +162,7 @@ def __init__(self, field: "FieldOutput", name: str = "", description: str = ""): ... @abaqus_method_doc - def __init__(self, *args, **kwargs): - ... + def __init__(self, *args, **kwargs): ... @overload def addData( @@ -313,8 +312,7 @@ def addData( ... @abaqus_method_doc - def addData(self, *args, **kwargs): - ... + def addData(self, *args, **kwargs): ... @overload def getScalarField(self, invariant: SymbolicConstant): @@ -358,8 +356,7 @@ def getScalarField(self, componentLabel: str): ... @abaqus_method_doc - def getScalarField(self, *args, **kwargs): - ... + def getScalarField(self, *args, **kwargs): ... @overload @abaqus_method_doc @@ -673,8 +670,7 @@ def getTransformedField( ... @abaqus_method_doc - def getTransformedField(self, *args, **kwargs): - ... + def getTransformedField(self, *args, **kwargs): ... def getConnectorFieldXformedToNodeA(self, deformationField: Union["FieldOutput", None] = None): """This method generates a new vector field containing the transformed component values of the parent diff --git a/src/abaqus/Odb/HistoryOutput.py b/src/abaqus/Odb/HistoryOutput.py index 16af89a4f3..fd964a76b6 100644 --- a/src/abaqus/Odb/HistoryOutput.py +++ b/src/abaqus/Odb/HistoryOutput.py @@ -51,10 +51,10 @@ def __init__( name: str, description: str, type: Literal[C.SCALAR], - validInvariants: Literal[ - C.MISES, C.MAX_PRINCIPAL, C.MIN_PRINCIPAL, C.MID_PRINCIPAL, C.MAGNITUDE, C.TRESCA, C.INV3, C.PRESS - ] - | None = None, + validInvariants: ( + Literal[C.MISES, C.MAX_PRINCIPAL, C.MIN_PRINCIPAL, C.MID_PRINCIPAL, C.MAGNITUDE, C.TRESCA, C.INV3, C.PRESS] + | None + ) = None, ) -> None: """This method creates a HistoryOutput object. @@ -133,5 +133,4 @@ def addData(self, data: tuple) -> None: """ ... - def addData(self, *args, **kwargs) -> None: - ... + def addData(self, *args, **kwargs) -> None: ... diff --git a/src/abaqus/Odb/HistoryPoint.py b/src/abaqus/Odb/HistoryPoint.py index eb7693422b..e6c7a0d68b 100644 --- a/src/abaqus/Odb/HistoryPoint.py +++ b/src/abaqus/Odb/HistoryPoint.py @@ -236,5 +236,4 @@ def __init__(self, instance: OdbInstance): """ ... - def __init__(self, *args, **kwargs): - ... + def __init__(self, *args, **kwargs): ... diff --git a/src/abaqus/Odb/HistoryRegion.py b/src/abaqus/Odb/HistoryRegion.py index 2750dbd12f..e7135ae89f 100644 --- a/src/abaqus/Odb/HistoryRegion.py +++ b/src/abaqus/Odb/HistoryRegion.py @@ -142,10 +142,10 @@ def HistoryOutput( name: str, description: str, type: Literal[C.SCALAR], - validInvariants: Literal[ - C.MISES, C.MAX_PRINCIPAL, C.MIN_PRINCIPAL, C.MID_PRINCIPAL, C.MAGNITUDE, C.TRESCA, C.INV3, C.PRESS - ] - | None = None, + validInvariants: ( + Literal[C.MISES, C.MAX_PRINCIPAL, C.MIN_PRINCIPAL, C.MID_PRINCIPAL, C.MAGNITUDE, C.TRESCA, C.INV3, C.PRESS] + | None + ) = None, ) -> HistoryOutput: """This method creates a HistoryOutput object. diff --git a/src/abaqus/Odb/OdbFrame.py b/src/abaqus/Odb/OdbFrame.py index ec613961ce..c308f5a0b5 100644 --- a/src/abaqus/Odb/OdbFrame.py +++ b/src/abaqus/Odb/OdbFrame.py @@ -146,12 +146,10 @@ def __init__(self, loadCase: OdbLoadCase, description: str = "", frequency: floa """ ... - def __init__(self, *args, **kwargs): - ... + def __init__(self, *args, **kwargs): ... @abaqus_method_doc - def Frame(self, *args, **kwargs): - ... + def Frame(self, *args, **kwargs): ... @overload def FieldOutput( diff --git a/src/abaqus/Odb/OdbPartBase.py b/src/abaqus/Odb/OdbPartBase.py index ac1848ef08..eca72100e3 100644 --- a/src/abaqus/Odb/OdbPartBase.py +++ b/src/abaqus/Odb/OdbPartBase.py @@ -156,8 +156,7 @@ def addElements( ... @abaqus_method_doc - def addElements(self, *args, **kwargs): - ... + def addElements(self, *args, **kwargs): ... @overload def addNodes(self, labels: tuple, coordinates: tuple, nodeSetName: str | None = None): @@ -193,8 +192,7 @@ def addNodes(self, nodeData: tuple, nodeSetName: str | None = None): ... @abaqus_method_doc - def addNodes(self, *args, **kwargs): - ... + def addNodes(self, *args, **kwargs): ... def assignBeamOrientation(self, region: str, method: Literal[C.N1_COSINES], vector: tuple): """This method assigns a beam section orientation to a region of a part instance. diff --git a/src/abaqus/Odb/UserData.py b/src/abaqus/Odb/UserData.py index 24acefa467..ceb57dfb9a 100644 --- a/src/abaqus/Odb/UserData.py +++ b/src/abaqus/Odb/UserData.py @@ -1,5 +1,4 @@ from ..Annotation.AnimationUserData import AnimationUserData -class UserData(AnimationUserData): - ... +class UserData(AnimationUserData): ... diff --git a/src/abaqus/OdbDisplay/OdbDisplay.py b/src/abaqus/OdbDisplay/OdbDisplay.py index 8ece12ba2f..4698690b6d 100644 --- a/src/abaqus/OdbDisplay/OdbDisplay.py +++ b/src/abaqus/OdbDisplay/OdbDisplay.py @@ -342,8 +342,7 @@ def setFrame(self, frame: OdbFrame): ... @abaqus_method_doc - def setFrame(self, *args, **kwargs): - ... + def setFrame(self, *args, **kwargs): ... def setPrimaryVariable( self, diff --git a/src/abaqus/Part/PartBase.py b/src/abaqus/Part/PartBase.py index e928b8db82..15fb6b268c 100644 --- a/src/abaqus/Part/PartBase.py +++ b/src/abaqus/Part/PartBase.py @@ -56,8 +56,7 @@ @abaqus_class_doc -class PartInstance: - ... +class PartInstance: ... class PartBase(PartFeature): @@ -271,8 +270,7 @@ def __init__( ... @abaqus_method_doc - def __init__(self, *args, **kwargs): - ... + def __init__(self, *args, **kwargs): ... def PartFromBooleanCut(self, name: str, instanceToBeCut: str, cuttingInstances: Sequence[PartInstance]): """This method creates a Part in the parts repository after subtracting or cutting the geometries of a diff --git a/src/abaqus/Part/PartFeature.py b/src/abaqus/Part/PartFeature.py index a701ba8951..436c1d4ce6 100644 --- a/src/abaqus/Part/PartFeature.py +++ b/src/abaqus/Part/PartFeature.py @@ -1307,8 +1307,9 @@ def OffsetFaces( faceList: Sequence[Face], distance: float | None = None, targetFaces: Sequence[Face] = (), - targetFacesMethod: Literal[C.HALF_OF_AVERAGE, C.CLOSEST_POINT_FRACTION, C.FARTHEST_POINT_FRACTION] - | None = None, + targetFacesMethod: ( + Literal[C.HALF_OF_AVERAGE, C.CLOSEST_POINT_FRACTION, C.FARTHEST_POINT_FRACTION] | None + ) = None, fractionDistance: float | None = None, trimToReferenceRep: Boolean = OFF, ) -> "Feature": diff --git a/src/abaqus/PathAndProbe/ProbeOptions.py b/src/abaqus/PathAndProbe/ProbeOptions.py index ae982121d0..67cadd8755 100644 --- a/src/abaqus/PathAndProbe/ProbeOptions.py +++ b/src/abaqus/PathAndProbe/ProbeOptions.py @@ -117,17 +117,19 @@ def setValues( self, options: Union["ProbeOptions", None] = None, probeEntity: Literal[C.NODE, C.ODB, C.ELEMENT] = ELEMENT, - probeOutputPosition: Literal[ - C.ELEMENT_NODAL, - C.ELEMENT_FACE, - C.ELEMENT, - C.NODAL, - C.INTEGRATION_POINT, - C.NODE, - C.ODB, - C.ELEMENT_CENTROID, - ] - | None = None, + probeOutputPosition: ( + Literal[ + C.ELEMENT_NODAL, + C.ELEMENT_FACE, + C.ELEMENT, + C.NODAL, + C.INTEGRATION_POINT, + C.NODE, + C.ODB, + C.ELEMENT_CENTROID, + ] + | None + ) = None, partInstance: Boolean = ON, elementID: Boolean = ON, elementType: Boolean = ON, diff --git a/src/abaqus/PlugInRegistration/AFXBaseTable.py b/src/abaqus/PlugInRegistration/AFXBaseTable.py index 8b63153ead..424b1e83c2 100644 --- a/src/abaqus/PlugInRegistration/AFXBaseTable.py +++ b/src/abaqus/PlugInRegistration/AFXBaseTable.py @@ -4,5 +4,4 @@ from .FXScrollArea import FXScrollArea -class AFXBaseTable(FXScrollArea, AFXDataComponent): - ... +class AFXBaseTable(FXScrollArea, AFXDataComponent): ... diff --git a/src/abaqus/PlugInRegistration/AFXDataComponent.py b/src/abaqus/PlugInRegistration/AFXDataComponent.py index 93357832db..b66a37bcba 100644 --- a/src/abaqus/PlugInRegistration/AFXDataComponent.py +++ b/src/abaqus/PlugInRegistration/AFXDataComponent.py @@ -1,2 +1 @@ -class AFXDataComponent: - ... +class AFXDataComponent: ... diff --git a/src/abaqus/PlugInRegistration/AFXTogglableKeyword.py b/src/abaqus/PlugInRegistration/AFXTogglableKeyword.py index 218c7b0d9b..4653625fd6 100644 --- a/src/abaqus/PlugInRegistration/AFXTogglableKeyword.py +++ b/src/abaqus/PlugInRegistration/AFXTogglableKeyword.py @@ -1,2 +1 @@ -class AFXTogglableKeyword: - ... +class AFXTogglableKeyword: ... diff --git a/src/abaqus/PlugInRegistration/AFXTransition.py b/src/abaqus/PlugInRegistration/AFXTransition.py index 16aa1acf5c..77acec413a 100644 --- a/src/abaqus/PlugInRegistration/AFXTransition.py +++ b/src/abaqus/PlugInRegistration/AFXTransition.py @@ -14,8 +14,7 @@ class AFXTransition(FXObject): message target. """ - class Operator: - ... + class Operator: ... #: Equal to. EQ: int = hash("EQ") diff --git a/src/abaqus/PlugInRegistration/FXChore.py b/src/abaqus/PlugInRegistration/FXChore.py index d8e1b60e52..d98832c4e7 100644 --- a/src/abaqus/PlugInRegistration/FXChore.py +++ b/src/abaqus/PlugInRegistration/FXChore.py @@ -1,2 +1 @@ -class FXChore: - ... +class FXChore: ... diff --git a/src/abaqus/PlugInRegistration/FXColor.py b/src/abaqus/PlugInRegistration/FXColor.py index 11ae847270..f613517ac2 100644 --- a/src/abaqus/PlugInRegistration/FXColor.py +++ b/src/abaqus/PlugInRegistration/FXColor.py @@ -1,2 +1 @@ -class FXColor: - ... +class FXColor: ... diff --git a/src/abaqus/PlugInRegistration/FXExponent.py b/src/abaqus/PlugInRegistration/FXExponent.py index 82a727d2fb..84acbd8fc8 100644 --- a/src/abaqus/PlugInRegistration/FXExponent.py +++ b/src/abaqus/PlugInRegistration/FXExponent.py @@ -1,2 +1 @@ -class FXExponent: - ... +class FXExponent: ... diff --git a/src/abaqus/PlugInRegistration/FXFontDesc.py b/src/abaqus/PlugInRegistration/FXFontDesc.py index 143a8e67de..1eb5a171b6 100644 --- a/src/abaqus/PlugInRegistration/FXFontDesc.py +++ b/src/abaqus/PlugInRegistration/FXFontDesc.py @@ -1,2 +1 @@ -class FXFontDesc: - ... +class FXFontDesc: ... diff --git a/src/abaqus/PlugInRegistration/FXIconListSortFunc.py b/src/abaqus/PlugInRegistration/FXIconListSortFunc.py index 5b28b882f6..e9e8a4234c 100644 --- a/src/abaqus/PlugInRegistration/FXIconListSortFunc.py +++ b/src/abaqus/PlugInRegistration/FXIconListSortFunc.py @@ -1,2 +1 @@ -class FXIconListSortFunc: - ... +class FXIconListSortFunc: ... diff --git a/src/abaqus/PlugInRegistration/FXInputHandle.py b/src/abaqus/PlugInRegistration/FXInputHandle.py index 900d7f3d46..d8cc7748b4 100644 --- a/src/abaqus/PlugInRegistration/FXInputHandle.py +++ b/src/abaqus/PlugInRegistration/FXInputHandle.py @@ -1,2 +1 @@ -class FXInputHandle: - ... +class FXInputHandle: ... diff --git a/src/abaqus/PlugInRegistration/FXMDIClient.py b/src/abaqus/PlugInRegistration/FXMDIClient.py index fbbc6dc23a..f44bd6fe0c 100644 --- a/src/abaqus/PlugInRegistration/FXMDIClient.py +++ b/src/abaqus/PlugInRegistration/FXMDIClient.py @@ -1,2 +1 @@ -class FXMDIClient: - ... +class FXMDIClient: ... diff --git a/src/abaqus/PlugInRegistration/FXMenuPane.py b/src/abaqus/PlugInRegistration/FXMenuPane.py index d379797346..27da54bfb5 100644 --- a/src/abaqus/PlugInRegistration/FXMenuPane.py +++ b/src/abaqus/PlugInRegistration/FXMenuPane.py @@ -1,2 +1 @@ -class FXMenuPane: - ... +class FXMenuPane: ... diff --git a/src/abaqus/PlugInRegistration/FXMetaClass.py b/src/abaqus/PlugInRegistration/FXMetaClass.py index fd5bb0c425..8de06957e9 100644 --- a/src/abaqus/PlugInRegistration/FXMetaClass.py +++ b/src/abaqus/PlugInRegistration/FXMetaClass.py @@ -1,2 +1 @@ -class FXMetaClass: - ... +class FXMetaClass: ... diff --git a/src/abaqus/PlugInRegistration/FXProgressBar.py b/src/abaqus/PlugInRegistration/FXProgressBar.py index 612beeb439..bfd0c0dbbe 100644 --- a/src/abaqus/PlugInRegistration/FXProgressBar.py +++ b/src/abaqus/PlugInRegistration/FXProgressBar.py @@ -1,2 +1 @@ -class FXProgressBar: - ... +class FXProgressBar: ... diff --git a/src/abaqus/PlugInRegistration/FXRGB.py b/src/abaqus/PlugInRegistration/FXRGB.py index 0866ea7db6..c15cd51b39 100644 --- a/src/abaqus/PlugInRegistration/FXRGB.py +++ b/src/abaqus/PlugInRegistration/FXRGB.py @@ -2,5 +2,4 @@ class FXRGB(FXColor): - def __init__(self, R: int, G: int, B: int): - ... + def __init__(self, R: int, G: int, B: int): ... diff --git a/src/abaqus/PlugInRegistration/FXSelector.py b/src/abaqus/PlugInRegistration/FXSelector.py index a58d27b8c9..6ba7f10600 100644 --- a/src/abaqus/PlugInRegistration/FXSelector.py +++ b/src/abaqus/PlugInRegistration/FXSelector.py @@ -1,2 +1 @@ -class FXSelector: - ... +class FXSelector: ... diff --git a/src/abaqus/PlugInRegistration/FXSrollArea.py b/src/abaqus/PlugInRegistration/FXSrollArea.py index 978656e9f2..7eb25fa3fa 100644 --- a/src/abaqus/PlugInRegistration/FXSrollArea.py +++ b/src/abaqus/PlugInRegistration/FXSrollArea.py @@ -3,5 +3,4 @@ from .FXComposite import FXComposite -class FXSrollArea(FXComposite): - ... +class FXSrollArea(FXComposite): ... diff --git a/src/abaqus/PlugInRegistration/FXTimer.py b/src/abaqus/PlugInRegistration/FXTimer.py index a2533518e1..141c115f64 100644 --- a/src/abaqus/PlugInRegistration/FXTimer.py +++ b/src/abaqus/PlugInRegistration/FXTimer.py @@ -1,2 +1 @@ -class FXTimer: - ... +class FXTimer: ... diff --git a/src/abaqus/PlugInRegistration/FXToolbar.py b/src/abaqus/PlugInRegistration/FXToolbar.py index 80a19b6aac..297be212ce 100644 --- a/src/abaqus/PlugInRegistration/FXToolbar.py +++ b/src/abaqus/PlugInRegistration/FXToolbar.py @@ -1,2 +1 @@ -class FXToolbar: - ... +class FXToolbar: ... diff --git a/src/abaqus/PlugInRegistration/FXVisual.py b/src/abaqus/PlugInRegistration/FXVisual.py index 785808f4b4..f54e48fb3b 100644 --- a/src/abaqus/PlugInRegistration/FXVisual.py +++ b/src/abaqus/PlugInRegistration/FXVisual.py @@ -1,2 +1 @@ -class FXVisual: - ... +class FXVisual: ... diff --git a/src/abaqus/PlugInRegistration/GUIPlugInCommands.py b/src/abaqus/PlugInRegistration/GUIPlugInCommands.py index a0308e9728..20a1ff444a 100644 --- a/src/abaqus/PlugInRegistration/GUIPlugInCommands.py +++ b/src/abaqus/PlugInRegistration/GUIPlugInCommands.py @@ -1,4 +1,5 @@ """GUI plug-in commands register GUI plug-ins either in the **Plug-ins** menu or in a toolbox.""" + from typing import Sequence from ..UtilityAndView.abaqusConstants import ALL, SymbolicConstant diff --git a/src/abaqus/PlugInRegistration/KernelPlugInCommands.py b/src/abaqus/PlugInRegistration/KernelPlugInCommands.py index f63c80a776..f4df20b8d5 100644 --- a/src/abaqus/PlugInRegistration/KernelPlugInCommands.py +++ b/src/abaqus/PlugInRegistration/KernelPlugInCommands.py @@ -5,6 +5,7 @@ from abaqusGui import getAFXApp toolset=getAFXApp().getAFXMainWindow().getPluginToolset() """ + from typing import Sequence from ..UtilityAndView.abaqusConstants import ALL, SymbolicConstant diff --git a/src/abaqus/PlugInRegistration/PluginToolset.py b/src/abaqus/PlugInRegistration/PluginToolset.py index b930e675b3..7b6810f02d 100644 --- a/src/abaqus/PlugInRegistration/PluginToolset.py +++ b/src/abaqus/PlugInRegistration/PluginToolset.py @@ -2,5 +2,4 @@ from .KernelPlugInCommands import KernelPluginToolset -class PluginToolset(GUIPluginToolset, KernelPluginToolset): - ... +class PluginToolset(GUIPluginToolset, KernelPluginToolset): ... diff --git a/src/abaqus/PlugInRegistration/PluginToolsetBase.py b/src/abaqus/PlugInRegistration/PluginToolsetBase.py index 9cd01d8840..c4f7e0a1b0 100644 --- a/src/abaqus/PlugInRegistration/PluginToolsetBase.py +++ b/src/abaqus/PlugInRegistration/PluginToolsetBase.py @@ -1,2 +1 @@ -class PluginToolsetBase: - ... +class PluginToolsetBase: ... diff --git a/src/abaqus/PlugInRegistration/SOCKET.py b/src/abaqus/PlugInRegistration/SOCKET.py index 3fdc839077..a8123dcfe8 100644 --- a/src/abaqus/PlugInRegistration/SOCKET.py +++ b/src/abaqus/PlugInRegistration/SOCKET.py @@ -1,2 +1 @@ -class SOCKET: - ... +class SOCKET: ... diff --git a/src/abaqus/Region/Region.py b/src/abaqus/Region/Region.py index cb700695c8..3ac757f64c 100644 --- a/src/abaqus/Region/Region.py +++ b/src/abaqus/Region/Region.py @@ -235,5 +235,4 @@ def __init__( """ ... - def __init__(self, *args, **kwargs): - ... + def __init__(self, *args, **kwargs): ... diff --git a/src/abaqus/Region/Set.py b/src/abaqus/Region/Set.py index f685b5b25e..8658414afe 100644 --- a/src/abaqus/Region/Set.py +++ b/src/abaqus/Region/Set.py @@ -197,8 +197,7 @@ def __init__(self, name: str, objectToCopy: Set) -> None: ... @abaqus_method_doc - def __init__(self, *args, **kwargs) -> None: - ... + def __init__(self, *args, **kwargs) -> None: ... def SetByBoolean( self, name: str, sets: Sequence[Set], operation: Literal[C.UNION, C.INTERSECTION, C.DIFFERENCE] = UNION diff --git a/src/abaqus/Region/Surface.py b/src/abaqus/Region/Surface.py index f3821c7678..88798105b4 100644 --- a/src/abaqus/Region/Surface.py +++ b/src/abaqus/Region/Surface.py @@ -215,8 +215,7 @@ def __init__(self, name: str, objectToCopy: Surface) -> None: ... @abaqus_method_doc - def __init__(self, *args, **kwargs) -> None: - ... + def __init__(self, *args, **kwargs) -> None: ... def SurfaceByBoolean( self, diff --git a/src/abaqus/Sketcher/ConstrainedSketch.py b/src/abaqus/Sketcher/ConstrainedSketch.py index d422c6c471..d3e177a78c 100644 --- a/src/abaqus/Sketcher/ConstrainedSketch.py +++ b/src/abaqus/Sketcher/ConstrainedSketch.py @@ -108,8 +108,7 @@ def __init__(self, name: str, objectToCopy: ConstrainedSketch) -> None: ... @abaqus_method_doc - def __init__(self, *args, **kwargs) -> None: - ... + def __init__(self, *args, **kwargs) -> None: ... def ConstrainedSketchFromGeometryFile(self, name: str, geometryFile: AcisFile) -> ConstrainedSketch: """This method creates a ConstrainedSketch object and places it in the sketches repository. diff --git a/src/abaqus/Sketcher/ConstrainedSketchOptions/ConstrainedSketchOptions.py b/src/abaqus/Sketcher/ConstrainedSketchOptions/ConstrainedSketchOptions.py index 722df2578e..7f16661c56 100644 --- a/src/abaqus/Sketcher/ConstrainedSketchOptions/ConstrainedSketchOptions.py +++ b/src/abaqus/Sketcher/ConstrainedSketchOptions/ConstrainedSketchOptions.py @@ -46,8 +46,9 @@ def setValues( maxCoplanarEntities: int = 300, autoConstrainAngularTolerance: float = 0, autoConstrainLinearTolerance: float | None = None, - autoConstrainOptions: Literal[C.PERPENDICULAR, C.EQUALRADIUS, C.IDENTICAL, C.TANGENT, C.PARALLEL, C.CONCENTRIC] - | None = None, + autoConstrainOptions: ( + Literal[C.PERPENDICULAR, C.EQUALRADIUS, C.IDENTICAL, C.TANGENT, C.PARALLEL, C.CONCENTRIC] | None + ) = None, dragMethod: Literal[C.WEIGHTED, C.RELAXATION, C.MINIMUM_MOVE, C.STANDARD] = MINIMUM_MOVE, editMethod: Literal[C.WEIGHTED, C.RELAXATION, C.MINIMUM_MOVE, C.STANDARD] = STANDARD, ): diff --git a/src/abaqus/Sketcher/ConstrainedSketchOptions/ConstrainedSketcherOptions.py b/src/abaqus/Sketcher/ConstrainedSketchOptions/ConstrainedSketcherOptions.py index 04ac20312e..4f4e632afe 100644 --- a/src/abaqus/Sketcher/ConstrainedSketchOptions/ConstrainedSketcherOptions.py +++ b/src/abaqus/Sketcher/ConstrainedSketchOptions/ConstrainedSketcherOptions.py @@ -30,8 +30,9 @@ def setValues( maxCoplanarEntities: int = 300, autoConstrainAngularTolerance: float = 0, autoConstrainLinearTolerance: float | None = None, - autoConstrainOptions: Literal[C.PERPENDICULAR, C.EQUALRADIUS, C.IDENTICAL, C.TANGENT, C.PARALLEL, C.CONCENTRIC] - | None = None, + autoConstrainOptions: ( + Literal[C.PERPENDICULAR, C.EQUALRADIUS, C.IDENTICAL, C.TANGENT, C.PARALLEL, C.CONCENTRIC] | None + ) = None, dragMethod: Literal[C.WEIGHTED, C.RELAXATION, C.MINIMUM_MOVE, C.STANDARD] = MINIMUM_MOVE, editMethod: Literal[C.WEIGHTED, C.RELAXATION, C.MINIMUM_MOVE, C.STANDARD] = STANDARD, ): diff --git a/src/abaqus/TableCollection/EventSeriesData.py b/src/abaqus/TableCollection/EventSeriesData.py index ab1dedbcf2..ad37c7227b 100644 --- a/src/abaqus/TableCollection/EventSeriesData.py +++ b/src/abaqus/TableCollection/EventSeriesData.py @@ -1,2 +1 @@ -class EventSeriesData: - ... +class EventSeriesData: ... diff --git a/src/abaqus/UtilityAndView/Callback.py b/src/abaqus/UtilityAndView/Callback.py index 8f81555abf..96f8976ce0 100644 --- a/src/abaqus/UtilityAndView/Callback.py +++ b/src/abaqus/UtilityAndView/Callback.py @@ -1,4 +1,5 @@ """These functions execute Python commands or functions.""" + from abqpy.decorators import abaqus_function_doc diff --git a/src/abaqus/UtilityAndView/Customization.py b/src/abaqus/UtilityAndView/Customization.py index 11bad95fa6..5fd34af202 100644 --- a/src/abaqus/UtilityAndView/Customization.py +++ b/src/abaqus/UtilityAndView/Customization.py @@ -1,4 +1,5 @@ """The following command is used to record a user-defined command in the Abaqus journal file.""" + from abqpy.decorators import abaqus_function_doc diff --git a/src/abaqus/UtilityAndView/Status.py b/src/abaqus/UtilityAndView/Status.py index 99ba505d4a..8f81daf707 100644 --- a/src/abaqus/UtilityAndView/Status.py +++ b/src/abaqus/UtilityAndView/Status.py @@ -73,5 +73,4 @@ def milestone(message: str, object: str, done: int, total: int): @abaqus_function_doc -def milestone(*args, **kwargs): - ... +def milestone(*args, **kwargs): ... diff --git a/src/abaqus/UtilityAndView/User.py b/src/abaqus/UtilityAndView/User.py index 024e93f0f6..f5fa32fc13 100644 --- a/src/abaqus/UtilityAndView/User.py +++ b/src/abaqus/UtilityAndView/User.py @@ -1,4 +1,5 @@ """The following commands are used to request data entry from a user.""" + from __future__ import annotations from typing import overload @@ -84,8 +85,7 @@ def getInput(fields: tuple, label: str = "", dialogTitle: str = ""): @abaqus_function_doc -def getInput(*args, **kwargs): - ... +def getInput(*args, **kwargs): ... @abaqus_function_doc diff --git a/src/abaqus/XY/XYData.py b/src/abaqus/XY/XYData.py index 8e55752dac..e9b9a2f9d7 100644 --- a/src/abaqus/XY/XYData.py +++ b/src/abaqus/XY/XYData.py @@ -182,8 +182,7 @@ def __init__(self, objectToCopy: "XYData"): ... @abaqus_method_doc - def __init__(self, *args, **kwargs): - ... + def __init__(self, *args, **kwargs): ... def XYDataFromFile( self, @@ -368,43 +367,45 @@ def xyDataListFromField( nodeLabels: Sequence[tuple[str, Union[int, str]]] = (), numericForm: Literal[C.COMPLEX_MAGNITUDE, C.COMPLEX_PHASE, C.REAL, C.IMAGINARY, C.COMPLEX_VAL_AT_ANGLE] = REAL, complexAngle: float = 0, - operator: Literal[ - C.ADD, - C.SUBTRACT, - C.MULTIPLY, - C.DIVIDE, - C.POWER, - C.MINIMUM, - C.MAXIMUM, - C.AVERAGE, - C.RANGE, - C.SRSS, - C.ABSOLUTE, - C.UNARY_NEGATIVE, - C.COSINE, - C.HYPERBOLIC_COSINE, - C.INVERSE_COSINE, - C.SINE, - C.HYPERBOLIC_SINE, - C.INVERSE_SINE, - C.TANGENT, - C.HYPERBOLIC_TANGENT, - C.INVERSE_TANGENT, - C.EXPONENTIAL, - C.NATURAL_LOG, - C.LOG, - C.SQUARE_ROOT, - C.NORMALIZE, - C.DEG2RAD, - C.RAD2DEG, - C.SMOOTH, - C.SWAP, - C.AVERAGE_ALL, - C.MAXIMUM_ENVELOPE, - C.MINIMUM_ENVELOPE, - C.RANGE_ALL, - ] - | None = None, + operator: ( + Literal[ + C.ADD, + C.SUBTRACT, + C.MULTIPLY, + C.DIVIDE, + C.POWER, + C.MINIMUM, + C.MAXIMUM, + C.AVERAGE, + C.RANGE, + C.SRSS, + C.ABSOLUTE, + C.UNARY_NEGATIVE, + C.COSINE, + C.HYPERBOLIC_COSINE, + C.INVERSE_COSINE, + C.SINE, + C.HYPERBOLIC_SINE, + C.INVERSE_SINE, + C.TANGENT, + C.HYPERBOLIC_TANGENT, + C.INVERSE_TANGENT, + C.EXPONENTIAL, + C.NATURAL_LOG, + C.LOG, + C.SQUARE_ROOT, + C.NORMALIZE, + C.DEG2RAD, + C.RAD2DEG, + C.SMOOTH, + C.SWAP, + C.AVERAGE_ALL, + C.MAXIMUM_ENVELOPE, + C.MINIMUM_ENVELOPE, + C.RANGE_ALL, + ] + | None + ) = None, ) -> list[XYData]: """This method creates a list of XYData objects by reading field data from an Odb object. @@ -708,23 +709,25 @@ def XYDataFromPath( includeAllElements: Boolean = False, step: int | None = None, frame: int | None = None, - variable: Literal[ - C.ELEMENT_FACE, - C.ELEMENT_NODAL, - C.S22, - C.WHOLE_ELEMENT, - C.NODAL, - C.INTEGRATION_POINT, - C.ELEMENT_CENTROID, - C.INVARIANT, - C.S11, - C.WHOLE_MODEL, - C.GENERAL_PARTICLE, - C.STEEL, - C.SNEG, - C.WHOLE_PART_INSTANCE, - ] - | None = None, + variable: ( + Literal[ + C.ELEMENT_FACE, + C.ELEMENT_NODAL, + C.S22, + C.WHOLE_ELEMENT, + C.NODAL, + C.INTEGRATION_POINT, + C.ELEMENT_CENTROID, + C.INVARIANT, + C.S11, + C.WHOLE_MODEL, + C.GENERAL_PARTICLE, + C.STEEL, + C.SNEG, + C.WHOLE_PART_INSTANCE, + ] + | None + ) = None, deformedMag: float | None = None, numericForm: Literal[C.COMPLEX_MAGNITUDE, C.COMPLEX_PHASE, C.REAL, C.IMAGINARY, C.COMPLEX_VAL_AT_ANGLE] = REAL, complexAngle: float = 0, diff --git a/src/abaqus/XY/XYDataCommands.py b/src/abaqus/XY/XYDataCommands.py index c35426d457..a804f2021e 100644 --- a/src/abaqus/XY/XYDataCommands.py +++ b/src/abaqus/XY/XYDataCommands.py @@ -199,43 +199,45 @@ def xyDataListFromField( nodeLabels: Sequence[tuple[str, Union[int, str]]] = (), numericForm: Literal[C.COMPLEX_MAGNITUDE, C.COMPLEX_PHASE, C.REAL, C.IMAGINARY, C.COMPLEX_VAL_AT_ANGLE] = REAL, complexAngle: float = 0, - operator: Literal[ - C.ADD, - C.SUBTRACT, - C.MULTIPLY, - C.DIVIDE, - C.POWER, - C.MINIMUM, - C.MAXIMUM, - C.AVERAGE, - C.RANGE, - C.SRSS, - C.ABSOLUTE, - C.UNARY_NEGATIVE, - C.COSINE, - C.HYPERBOLIC_COSINE, - C.INVERSE_COSINE, - C.SINE, - C.HYPERBOLIC_SINE, - C.INVERSE_SINE, - C.TANGENT, - C.HYPERBOLIC_TANGENT, - C.INVERSE_TANGENT, - C.EXPONENTIAL, - C.NATURAL_LOG, - C.LOG, - C.SQUARE_ROOT, - C.NORMALIZE, - C.DEG2RAD, - C.RAD2DEG, - C.SMOOTH, - C.SWAP, - C.AVERAGE_ALL, - C.MAXIMUM_ENVELOPE, - C.MINIMUM_ENVELOPE, - C.RANGE_ALL, - ] - | None = None, + operator: ( + Literal[ + C.ADD, + C.SUBTRACT, + C.MULTIPLY, + C.DIVIDE, + C.POWER, + C.MINIMUM, + C.MAXIMUM, + C.AVERAGE, + C.RANGE, + C.SRSS, + C.ABSOLUTE, + C.UNARY_NEGATIVE, + C.COSINE, + C.HYPERBOLIC_COSINE, + C.INVERSE_COSINE, + C.SINE, + C.HYPERBOLIC_SINE, + C.INVERSE_SINE, + C.TANGENT, + C.HYPERBOLIC_TANGENT, + C.INVERSE_TANGENT, + C.EXPONENTIAL, + C.NATURAL_LOG, + C.LOG, + C.SQUARE_ROOT, + C.NORMALIZE, + C.DEG2RAD, + C.RAD2DEG, + C.SMOOTH, + C.SWAP, + C.AVERAGE_ALL, + C.MAXIMUM_ENVELOPE, + C.MINIMUM_ENVELOPE, + C.RANGE_ALL, + ] + | None + ) = None, ) -> list[XYData]: """This method creates a list of XYData objects by reading field data from an Odb object. @@ -539,23 +541,25 @@ def XYDataFromPath( includeAllElements: Boolean = False, step: int | None = None, frame: int | None = None, - variable: Literal[ - C.ELEMENT_FACE, - C.ELEMENT_NODAL, - C.S22, - C.WHOLE_ELEMENT, - C.NODAL, - C.INTEGRATION_POINT, - C.ELEMENT_CENTROID, - C.INVARIANT, - C.S11, - C.WHOLE_MODEL, - C.GENERAL_PARTICLE, - C.STEEL, - C.SNEG, - C.WHOLE_PART_INSTANCE, - ] - | None = None, + variable: ( + Literal[ + C.ELEMENT_FACE, + C.ELEMENT_NODAL, + C.S22, + C.WHOLE_ELEMENT, + C.NODAL, + C.INTEGRATION_POINT, + C.ELEMENT_CENTROID, + C.INVARIANT, + C.S11, + C.WHOLE_MODEL, + C.GENERAL_PARTICLE, + C.STEEL, + C.SNEG, + C.WHOLE_PART_INSTANCE, + ] + | None + ) = None, deformedMag: float | None = None, numericForm: Literal[C.COMPLEX_MAGNITUDE, C.COMPLEX_PHASE, C.REAL, C.IMAGINARY, C.COMPLEX_VAL_AT_ANGLE] = REAL, complexAngle: float = 0, diff --git a/src/abaqus/XY/XYSession.py b/src/abaqus/XY/XYSession.py index 8581ce7c7a..c7ac6d40f5 100644 --- a/src/abaqus/XY/XYSession.py +++ b/src/abaqus/XY/XYSession.py @@ -671,43 +671,45 @@ def xyDataListFromField( nodeLabels: Sequence[tuple[str, Union[int, str]]] = (), numericForm: Literal[C.COMPLEX_MAGNITUDE, C.COMPLEX_PHASE, C.REAL, C.IMAGINARY, C.COMPLEX_VAL_AT_ANGLE] = REAL, complexAngle: float = 0, - operator: Literal[ - C.ADD, - C.SUBTRACT, - C.MULTIPLY, - C.DIVIDE, - C.POWER, - C.MINIMUM, - C.MAXIMUM, - C.AVERAGE, - C.RANGE, - C.SRSS, - C.ABSOLUTE, - C.UNARY_NEGATIVE, - C.COSINE, - C.HYPERBOLIC_COSINE, - C.INVERSE_COSINE, - C.SINE, - C.HYPERBOLIC_SINE, - C.INVERSE_SINE, - C.TANGENT, - C.HYPERBOLIC_TANGENT, - C.INVERSE_TANGENT, - C.EXPONENTIAL, - C.NATURAL_LOG, - C.LOG, - C.SQUARE_ROOT, - C.NORMALIZE, - C.DEG2RAD, - C.RAD2DEG, - C.SMOOTH, - C.SWAP, - C.AVERAGE_ALL, - C.MAXIMUM_ENVELOPE, - C.MINIMUM_ENVELOPE, - C.RANGE_ALL, - ] - | None = None, + operator: ( + Literal[ + C.ADD, + C.SUBTRACT, + C.MULTIPLY, + C.DIVIDE, + C.POWER, + C.MINIMUM, + C.MAXIMUM, + C.AVERAGE, + C.RANGE, + C.SRSS, + C.ABSOLUTE, + C.UNARY_NEGATIVE, + C.COSINE, + C.HYPERBOLIC_COSINE, + C.INVERSE_COSINE, + C.SINE, + C.HYPERBOLIC_SINE, + C.INVERSE_SINE, + C.TANGENT, + C.HYPERBOLIC_TANGENT, + C.INVERSE_TANGENT, + C.EXPONENTIAL, + C.NATURAL_LOG, + C.LOG, + C.SQUARE_ROOT, + C.NORMALIZE, + C.DEG2RAD, + C.RAD2DEG, + C.SMOOTH, + C.SWAP, + C.AVERAGE_ALL, + C.MAXIMUM_ENVELOPE, + C.MINIMUM_ENVELOPE, + C.RANGE_ALL, + ] + | None + ) = None, ) -> list[XYDataType]: """This method creates a list of XYData objects by reading field data from an Odb object. diff --git a/src/abqpy/config.py b/src/abqpy/config.py index 004ff30ff9..34daf7ff8a 100644 --- a/src/abqpy/config.py +++ b/src/abqpy/config.py @@ -45,8 +45,7 @@ class AbaqusConfig(CompatibleBaseModel): cli_traceback_limit: int = 0 -class AbaqusCommandOptions(AbaqusCAEConfig, AbaqusPythonConfig): - ... +class AbaqusCommandOptions(AbaqusCAEConfig, AbaqusPythonConfig): ... defaults = ast.literal_eval(os.environ.get("ABAQUS_COMMAND_OPTIONS", str({}))) diff --git a/src/sketch.py b/src/sketch.py index 702d03aff1..7c8e560d6f 100644 --- a/src/sketch.py +++ b/src/sketch.py @@ -1,16 +1,14 @@ from __future__ import annotations -class FeatureSketch: - ... +class FeatureSketch: ... def Sketch(self, sheetSize: float = 200, gridSize: float = 5) -> FeatureSketch: return FeatureSketch() -def SketchTransform(): - ... +def SketchTransform(): ... __all__ = [ diff --git a/src/symbolicConstants.py b/src/symbolicConstants.py index d09c0994f0..27ea8d2141 100644 --- a/src/symbolicConstants.py +++ b/src/symbolicConstants.py @@ -23,6 +23,7 @@ module, and makes this module aware of the cache by adding the _addSymConstToTable function to this module. Outside Abaqus/CAE, we do not have the same requirement. """ + from __future__ import annotations from abaqusConstants import * diff --git a/tests/conftest.py b/tests/conftest.py index f6841d0fc6..1ccd8a2c87 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,6 +1,7 @@ """ conftest.py: sharing fixtures across multiple files. https://docs.pytest.org/en/7.1.x/reference/fixtures.html#conftest-py-sharing-fixtures-across-multiple-files. """ + import os import sys