Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[typing] Fix typing error about data arrays (backport #5732) #5746

Merged
merged 6 commits into from
Aug 28, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 28, 2024

Description

Unfinished, search with regular expression (#:|\s) A (tuple|sequence) of (\w+?) (1655 results in total).

Fixes #5731.


This is an automatic backport of pull request #5732 done by [Mergify](https://mergify.com).

Cherry-pick of 5033556 has failed:

On branch mergify/bp/2020/pr-5732
Your branch is up to date with 'origin/2020'.

You are currently cherry-picking commit 50335563.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/abaqus/Adaptivity/RemeshingRule.py
	modified:   src/abaqus/Adaptivity/RuleResult.py
	modified:   src/abaqus/Amplitude/BaselineCorrection.py
	modified:   src/abaqus/Amplitude/Correlation.py
	modified:   src/abaqus/Amplitude/EquallySpacedAmplitude.py
	modified:   src/abaqus/Amplitude/PeriodicAmplitude.py
	modified:   src/abaqus/Amplitude/PsdDefinition.py
	modified:   src/abaqus/Amplitude/SmoothStepAmplitude.py
	modified:   src/abaqus/Amplitude/SpectrumAmplitude.py
	modified:   src/abaqus/Amplitude/TabularAmplitude.py
	modified:   src/abaqus/Annotation/Arrow.py
	modified:   src/abaqus/Annotation/Text.py
	modified:   src/abaqus/BasicGeometry/Cell.py
	modified:   src/abaqus/BasicGeometry/Edge.py
	modified:   src/abaqus/BasicGeometry/Face.py
	modified:   src/abaqus/BasicGeometry/IgnoredEdge.py
	modified:   src/abaqus/BasicGeometry/IgnoredVertex.py
	modified:   src/abaqus/BeamSectionProfile/ArbitraryProfile.py
	modified:   src/abaqus/BoundaryCondition/SubmodelBCState.py
	modified:   src/abaqus/BoundaryCondition/TemperatureBCState.py
	modified:   src/abaqus/Calibration/DataSet.py
	modified:   src/abaqus/Canvas/ViewportBase.py
	modified:   src/abaqus/Connector/CDCTerm.py
	modified:   src/abaqus/Connector/ConnectorDamage.py
	modified:   src/abaqus/Connector/ConnectorDamping.py
	modified:   src/abaqus/Connector/ConnectorElasticity.py
	modified:   src/abaqus/Connector/ConnectorFailure.py
	modified:   src/abaqus/Connector/ConnectorFriction.py
	modified:   src/abaqus/Connector/ConnectorLock.py
	modified:   src/abaqus/Connector/ConnectorPlasticity.py
	modified:   src/abaqus/Connector/ConnectorStop.py
	modified:   src/abaqus/Connector/TangentialBehavior.py
	modified:   src/abaqus/Datum/DatumAxis.py
	modified:   src/abaqus/Datum/DatumPlane.py
	modified:   src/abaqus/Datum/DatumPoint.py
	modified:   src/abaqus/DisplayGroup/LeafFromElementLabels.py
	modified:   src/abaqus/DisplayGroup/LeafFromElementSets.py
	modified:   src/abaqus/DisplayGroup/LeafFromModelElemLabels.py
	modified:   src/abaqus/DisplayGroup/LeafFromModelNodeLabels.py
	modified:   src/abaqus/DisplayGroup/LeafFromNodeLabels.py
	modified:   src/abaqus/DisplayGroup/LeafFromNodeSets.py
	modified:   src/abaqus/DisplayGroup/LeafFromPartInstance.py
	modified:   src/abaqus/DisplayGroup/LeafFromSurfaceSets.py
	modified:   src/abaqus/DisplayOptions/AssemblyDisplayOptions.py
	modified:   src/abaqus/EngineeringFeature/AssembledFastener.py
	modified:   src/abaqus/EngineeringFeature/ContourIntegral.py
	modified:   src/abaqus/EngineeringFeature/DiscreteFastener.py
	modified:   src/abaqus/EngineeringFeature/HeatCapacitance.py
	modified:   src/abaqus/EngineeringFeature/PointFastener.py
	modified:   src/abaqus/EngineeringFeature/XFEMCrack.py
	modified:   src/abaqus/Field/DataTable.py
	modified:   src/abaqus/Field/DiscreteField.py
	modified:   src/abaqus/Field/MappedField.py
	modified:   src/abaqus/InputFileParser/InputFile.py
	modified:   src/abaqus/InputFileParser/Keyword.py
	modified:   src/abaqus/Interaction/AcousticImpedanceProp.py
	modified:   src/abaqus/Interaction/ActuatorSensor.py
	modified:   src/abaqus/Interaction/ActuatorSensorProp.py
	modified:   src/abaqus/Interaction/CavityRadiation.py
	modified:   src/abaqus/Interaction/CavityRadiationProp.py
	modified:   src/abaqus/Interaction/CavityRadiationState.py
	modified:   src/abaqus/Interaction/CohesiveBehavior.py
	modified:   src/abaqus/Interaction/ContactDamage.py
	modified:   src/abaqus/Interaction/ContactTangentialBehavior.py
	modified:   src/abaqus/Interaction/FilmConditionProp.py
	modified:   src/abaqus/Interaction/FluidCavityProperty.py
	modified:   src/abaqus/Interaction/FluidExchangeProperty.py
	modified:   src/abaqus/Interaction/FractureCriterion.py
	modified:   src/abaqus/Interaction/GapElectricalConductance.py
	modified:   src/abaqus/Interaction/NormalBehavior.py
	modified:   src/abaqus/Interaction/PressurePenetrationState.py
	modified:   src/abaqus/Interaction/Radiation.py
	modified:   src/abaqus/Interaction/ThermalConductance.py
	modified:   src/abaqus/Job/Job.py
	modified:   src/abaqus/Job/JobFromInputFile.py
	modified:   src/abaqus/Job/ModelJob.py
	modified:   src/abaqus/Load/CoriolisForce.py
	modified:   src/abaqus/Load/InertiaReliefState.py
	modified:   src/abaqus/Load/RotationalBodyForce.py
	modified:   src/abaqus/Load/SubstructureLoadState.py
	modified:   src/abaqus/Material/ProgressiveDamageFailure/DamageInitiation.py
	modified:   src/abaqus/Material/Ratios.py
	modified:   src/abaqus/Material/TestData/MullinsEffect.py
	modified:   src/abaqus/Odb/AnalyticSurface.py
	modified:   src/abaqus/Odb/AnalyticSurfaceSegment.py
	modified:   src/abaqus/Odb/BeamOrientation.py
	modified:   src/abaqus/Odb/FieldBulkData.py
	modified:   src/abaqus/Odb/FieldOutput.py
	modified:   src/abaqus/Odb/FieldValue.py
	modified:   src/abaqus/Odb/OdbDatumCsys.py
	modified:   src/abaqus/Odb/OdbMeshElement.py
	modified:   src/abaqus/Odb/OdbMeshNode.py
	modified:   src/abaqus/Odb/OdbPretensionSection.py
	modified:   src/abaqus/Odb/OdbSet.py
	modified:   src/abaqus/Odb/OdbStepBase.py
	modified:   src/abaqus/Odb/SectorDefinition.py
	modified:   src/abaqus/OdbDisplay/ContourOptions.py
	modified:   src/abaqus/OdbDisplay/OdbDisplay.py
	modified:   src/abaqus/OdbDisplay/ViewCut.py
	modified:   src/abaqus/Optimization/CombinedTermDesignResponse.py
	modified:   src/abaqus/Optimization/ShapeRotationalSymmetry.py
	modified:   src/abaqus/PathAndProbe/CurrentProbeValues.py
	modified:   src/abaqus/PathAndProbe/NodeQuery.py
	modified:   src/abaqus/PathAndProbe/SelectedProbeValues.py
	modified:   src/abaqus/PlotOptions/BasicOptions.py
	modified:   src/abaqus/PlotOptions/OdbContactDiagnostics.py
	modified:   src/abaqus/PredefinedField/FieldState.py
	modified:   src/abaqus/PredefinedField/IMARegion.py
	modified:   src/abaqus/PredefinedField/KinematicHardening.py
	modified:   src/abaqus/PredefinedField/TemperatureState.py
	modified:   src/abaqus/PredefinedField/Velocity.py
	modified:   src/abaqus/Property/MaterialOrientation.py
	modified:   src/abaqus/Region/Surface.py
	modified:   src/abaqus/Section/BeamSection.py
	modified:   src/abaqus/Section/GeneralStiffnessSection.py
	modified:   src/abaqus/Sketcher/ConstrainedSketchGeometry/ConstrainedSketchGeometry.py
	modified:   src/abaqus/Sketcher/ConstrainedSketchVertex/ConstrainedSketchVertex.py
	modified:   src/abaqus/StepOutput/FieldOutputRequestState.py
	modified:   src/abaqus/StepOutput/HistoryOutputRequestState.py
	modified:   src/abaqus/StepOutput/TimePoint.py
	modified:   src/abaqus/UtilityAndView/View.py
	modified:   src/abaqus/XY/AxisData.py
	modified:   src/abaqus/XY/Chart.py
	modified:   src/abaqus/XY/XYPlotBase.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   src/abaqus/EngineeringFeature/DataImperfection.py
	both modified:   src/abaqus/EngineeringFeature/EngineeringFeature.py
	deleted by us:   src/abaqus/EngineeringFeature/FileImperfection.py
	both modified:   src/abaqus/Job/Coexecution.py
	deleted by us:   src/abaqus/Material/Plastic/CrushStress/CrushStress.py
	deleted by us:   src/abaqus/Material/Plastic/CrushStress/CrushStressVelocityFactor.py
	deleted by us:   src/abaqus/Material/Plastic/PlasticityCorrection.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

(cherry picked from commit 5033556)

# Conflicts:
#	src/abaqus/EngineeringFeature/DataImperfection.py
#	src/abaqus/EngineeringFeature/EngineeringFeature.py
#	src/abaqus/EngineeringFeature/FileImperfection.py
#	src/abaqus/Job/Coexecution.py
#	src/abaqus/Material/Plastic/CrushStress/CrushStress.py
#	src/abaqus/Material/Plastic/CrushStress/CrushStressVelocityFactor.py
#	src/abaqus/Material/Plastic/PlasticityCorrection.py
@mergify mergify bot added 2020 backport Backport pull request created by Mergify conflicts Conflict with its base branch labels Aug 28, 2024
Copy link
Contributor Author

mergify bot commented Aug 28, 2024

Cherry-pick of 5033556 has failed:

On branch mergify/bp/2020/pr-5732
Your branch is up to date with 'origin/2020'.

You are currently cherry-picking commit 50335563.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/abaqus/Adaptivity/RemeshingRule.py
	modified:   src/abaqus/Adaptivity/RuleResult.py
	modified:   src/abaqus/Amplitude/BaselineCorrection.py
	modified:   src/abaqus/Amplitude/Correlation.py
	modified:   src/abaqus/Amplitude/EquallySpacedAmplitude.py
	modified:   src/abaqus/Amplitude/PeriodicAmplitude.py
	modified:   src/abaqus/Amplitude/PsdDefinition.py
	modified:   src/abaqus/Amplitude/SmoothStepAmplitude.py
	modified:   src/abaqus/Amplitude/SpectrumAmplitude.py
	modified:   src/abaqus/Amplitude/TabularAmplitude.py
	modified:   src/abaqus/Annotation/Arrow.py
	modified:   src/abaqus/Annotation/Text.py
	modified:   src/abaqus/BasicGeometry/Cell.py
	modified:   src/abaqus/BasicGeometry/Edge.py
	modified:   src/abaqus/BasicGeometry/Face.py
	modified:   src/abaqus/BasicGeometry/IgnoredEdge.py
	modified:   src/abaqus/BasicGeometry/IgnoredVertex.py
	modified:   src/abaqus/BeamSectionProfile/ArbitraryProfile.py
	modified:   src/abaqus/BoundaryCondition/SubmodelBCState.py
	modified:   src/abaqus/BoundaryCondition/TemperatureBCState.py
	modified:   src/abaqus/Calibration/DataSet.py
	modified:   src/abaqus/Canvas/ViewportBase.py
	modified:   src/abaqus/Connector/CDCTerm.py
	modified:   src/abaqus/Connector/ConnectorDamage.py
	modified:   src/abaqus/Connector/ConnectorDamping.py
	modified:   src/abaqus/Connector/ConnectorElasticity.py
	modified:   src/abaqus/Connector/ConnectorFailure.py
	modified:   src/abaqus/Connector/ConnectorFriction.py
	modified:   src/abaqus/Connector/ConnectorLock.py
	modified:   src/abaqus/Connector/ConnectorPlasticity.py
	modified:   src/abaqus/Connector/ConnectorStop.py
	modified:   src/abaqus/Connector/TangentialBehavior.py
	modified:   src/abaqus/Datum/DatumAxis.py
	modified:   src/abaqus/Datum/DatumPlane.py
	modified:   src/abaqus/Datum/DatumPoint.py
	modified:   src/abaqus/DisplayGroup/LeafFromElementLabels.py
	modified:   src/abaqus/DisplayGroup/LeafFromElementSets.py
	modified:   src/abaqus/DisplayGroup/LeafFromModelElemLabels.py
	modified:   src/abaqus/DisplayGroup/LeafFromModelNodeLabels.py
	modified:   src/abaqus/DisplayGroup/LeafFromNodeLabels.py
	modified:   src/abaqus/DisplayGroup/LeafFromNodeSets.py
	modified:   src/abaqus/DisplayGroup/LeafFromPartInstance.py
	modified:   src/abaqus/DisplayGroup/LeafFromSurfaceSets.py
	modified:   src/abaqus/DisplayOptions/AssemblyDisplayOptions.py
	modified:   src/abaqus/EngineeringFeature/AssembledFastener.py
	modified:   src/abaqus/EngineeringFeature/ContourIntegral.py
	modified:   src/abaqus/EngineeringFeature/DiscreteFastener.py
	modified:   src/abaqus/EngineeringFeature/HeatCapacitance.py
	modified:   src/abaqus/EngineeringFeature/PointFastener.py
	modified:   src/abaqus/EngineeringFeature/XFEMCrack.py
	modified:   src/abaqus/Field/DataTable.py
	modified:   src/abaqus/Field/DiscreteField.py
	modified:   src/abaqus/Field/MappedField.py
	modified:   src/abaqus/InputFileParser/InputFile.py
	modified:   src/abaqus/InputFileParser/Keyword.py
	modified:   src/abaqus/Interaction/AcousticImpedanceProp.py
	modified:   src/abaqus/Interaction/ActuatorSensor.py
	modified:   src/abaqus/Interaction/ActuatorSensorProp.py
	modified:   src/abaqus/Interaction/CavityRadiation.py
	modified:   src/abaqus/Interaction/CavityRadiationProp.py
	modified:   src/abaqus/Interaction/CavityRadiationState.py
	modified:   src/abaqus/Interaction/CohesiveBehavior.py
	modified:   src/abaqus/Interaction/ContactDamage.py
	modified:   src/abaqus/Interaction/ContactTangentialBehavior.py
	modified:   src/abaqus/Interaction/FilmConditionProp.py
	modified:   src/abaqus/Interaction/FluidCavityProperty.py
	modified:   src/abaqus/Interaction/FluidExchangeProperty.py
	modified:   src/abaqus/Interaction/FractureCriterion.py
	modified:   src/abaqus/Interaction/GapElectricalConductance.py
	modified:   src/abaqus/Interaction/NormalBehavior.py
	modified:   src/abaqus/Interaction/PressurePenetrationState.py
	modified:   src/abaqus/Interaction/Radiation.py
	modified:   src/abaqus/Interaction/ThermalConductance.py
	modified:   src/abaqus/Job/Job.py
	modified:   src/abaqus/Job/JobFromInputFile.py
	modified:   src/abaqus/Job/ModelJob.py
	modified:   src/abaqus/Load/CoriolisForce.py
	modified:   src/abaqus/Load/InertiaReliefState.py
	modified:   src/abaqus/Load/RotationalBodyForce.py
	modified:   src/abaqus/Load/SubstructureLoadState.py
	modified:   src/abaqus/Material/ProgressiveDamageFailure/DamageInitiation.py
	modified:   src/abaqus/Material/Ratios.py
	modified:   src/abaqus/Material/TestData/MullinsEffect.py
	modified:   src/abaqus/Odb/AnalyticSurface.py
	modified:   src/abaqus/Odb/AnalyticSurfaceSegment.py
	modified:   src/abaqus/Odb/BeamOrientation.py
	modified:   src/abaqus/Odb/FieldBulkData.py
	modified:   src/abaqus/Odb/FieldOutput.py
	modified:   src/abaqus/Odb/FieldValue.py
	modified:   src/abaqus/Odb/OdbDatumCsys.py
	modified:   src/abaqus/Odb/OdbMeshElement.py
	modified:   src/abaqus/Odb/OdbMeshNode.py
	modified:   src/abaqus/Odb/OdbPretensionSection.py
	modified:   src/abaqus/Odb/OdbSet.py
	modified:   src/abaqus/Odb/OdbStepBase.py
	modified:   src/abaqus/Odb/SectorDefinition.py
	modified:   src/abaqus/OdbDisplay/ContourOptions.py
	modified:   src/abaqus/OdbDisplay/OdbDisplay.py
	modified:   src/abaqus/OdbDisplay/ViewCut.py
	modified:   src/abaqus/Optimization/CombinedTermDesignResponse.py
	modified:   src/abaqus/Optimization/ShapeRotationalSymmetry.py
	modified:   src/abaqus/PathAndProbe/CurrentProbeValues.py
	modified:   src/abaqus/PathAndProbe/NodeQuery.py
	modified:   src/abaqus/PathAndProbe/SelectedProbeValues.py
	modified:   src/abaqus/PlotOptions/BasicOptions.py
	modified:   src/abaqus/PlotOptions/OdbContactDiagnostics.py
	modified:   src/abaqus/PredefinedField/FieldState.py
	modified:   src/abaqus/PredefinedField/IMARegion.py
	modified:   src/abaqus/PredefinedField/KinematicHardening.py
	modified:   src/abaqus/PredefinedField/TemperatureState.py
	modified:   src/abaqus/PredefinedField/Velocity.py
	modified:   src/abaqus/Property/MaterialOrientation.py
	modified:   src/abaqus/Region/Surface.py
	modified:   src/abaqus/Section/BeamSection.py
	modified:   src/abaqus/Section/GeneralStiffnessSection.py
	modified:   src/abaqus/Sketcher/ConstrainedSketchGeometry/ConstrainedSketchGeometry.py
	modified:   src/abaqus/Sketcher/ConstrainedSketchVertex/ConstrainedSketchVertex.py
	modified:   src/abaqus/StepOutput/FieldOutputRequestState.py
	modified:   src/abaqus/StepOutput/HistoryOutputRequestState.py
	modified:   src/abaqus/StepOutput/TimePoint.py
	modified:   src/abaqus/UtilityAndView/View.py
	modified:   src/abaqus/XY/AxisData.py
	modified:   src/abaqus/XY/Chart.py
	modified:   src/abaqus/XY/XYPlotBase.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   src/abaqus/EngineeringFeature/DataImperfection.py
	both modified:   src/abaqus/EngineeringFeature/EngineeringFeature.py
	deleted by us:   src/abaqus/EngineeringFeature/FileImperfection.py
	both modified:   src/abaqus/Job/Coexecution.py
	deleted by us:   src/abaqus/Material/Plastic/CrushStress/CrushStress.py
	deleted by us:   src/abaqus/Material/Plastic/CrushStress/CrushStressVelocityFactor.py
	deleted by us:   src/abaqus/Material/Plastic/PlasticityCorrection.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@keywordlabeler keywordlabeler bot added the typing Typing label Aug 28, 2024
Copy link
Contributor

Hi @mergify[bot], I have deleted the conflicted deleted files in this pull request. Please check it again. Thanks!

@haiiliin haiiliin removed the conflicts Conflict with its base branch label Aug 28, 2024
@mergify mergify bot merged commit ae56ad3 into 2020 Aug 28, 2024
2 checks passed
@mergify mergify bot deleted the mergify/bp/2020/pr-5732 branch August 28, 2024 10:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2020 backport Backport pull request created by Mergify typing Typing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant