Skip to content

Commit

Permalink
Revert "[pre-commit.ci] pre-commit autoupdate (#5488)"
Browse files Browse the repository at this point in the history
This reverts commit 0418c65.
  • Loading branch information
haiiliin committed Feb 25, 2024
1 parent 95aa67a commit ca21407
Show file tree
Hide file tree
Showing 87 changed files with 515 additions and 465 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/psf/black
rev: "24.2.0"
rev: "23.12.1"
hooks:
- id: black

Expand All @@ -12,7 +12,7 @@ repos:
- black

- repo: https://github.com/finsberg/clang-format-docs
rev: v0.3.0
rev: v0.2.2
hooks:
- id: clang-format-docs
additional_dependencies:
Expand Down
6 changes: 5 additions & 1 deletion docs/source/_ext/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ 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)], []
Expand Down
1 change: 0 additions & 1 deletion examples/Abaqus/skewExample.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
The theoretical results are also plotted.
"""

import visualization
from abaqus import *
from abaqusConstants import *
Expand Down
1 change: 0 additions & 1 deletion examples/Parameter-Identification/optimize.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
The model script of this example can be found :doc:`here <compression>`.
"""

import os

import numpy as np
Expand Down
32 changes: 15 additions & 17 deletions src/abaqus/Adaptivity/AdaptiveMeshConstraintState.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,23 +51,21 @@ 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
Expand Down
168 changes: 81 additions & 87 deletions src/abaqus/Adaptivity/AdaptivityStep.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,21 @@ 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
Expand Down Expand Up @@ -112,23 +110,21 @@ 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
Expand Down Expand Up @@ -198,24 +194,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

Expand All @@ -235,23 +231,21 @@ 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
Expand Down Expand Up @@ -321,24 +315,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

Expand Down
32 changes: 15 additions & 17 deletions src/abaqus/Adaptivity/DisplacementAdaptiveMeshConstraintState.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,23 +108,21 @@ 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 = "",
):
"""
Expand Down
3 changes: 2 additions & 1 deletion src/abaqus/Adaptivity/RuleResult.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@


# Prevent circular import
class ErrorIndicatorResult: ...
class ErrorIndicatorResult:
...


@abaqus_class_doc
Expand Down
32 changes: 15 additions & 17 deletions src/abaqus/Adaptivity/VelocityAdaptiveMeshConstraintState.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,23 +102,21 @@ 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
Expand Down
3 changes: 2 additions & 1 deletion src/abaqus/Assembly/AssemblyModel.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@


# Prevent circular import
class ModelBase: ...
class ModelBase:
...


@abaqus_class_doc
Expand Down
3 changes: 2 additions & 1 deletion src/abaqus/Assembly/ModelInstance.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@


# prevent circular imports
class Model: ...
class Model:
...


@abaqus_class_doc
Expand Down
Loading

0 comments on commit ca21407

Please sign in to comment.