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

Fix typing errors about part features (backport #5807) #5815

Merged
merged 6 commits into from
Sep 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 29, 2024

Description

  • Use "|" instead of Union for consistency
  • Fix type hint for CutExtrude and SolidExtrude
  • Fix type hint for Round to suppress type check error since edgeList and Sequence are two mutally exclusive parameters.
  • Change the type of member id to suppress __getitem__'s error
  • Add NDArray support for all functions in Material.py
  • Add timePoint parameter for FeatureOutputRequest

This is an automatic backport of pull request #5807 done by Mergify.

Cherry-pick of 2e02a2e has failed:

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

You are currently cherry-picking commit 2e02a2eb.
  (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/Feature/Feature.py
	modified:   src/abaqus/Part/PartFeature.py
	modified:   src/abaqus/Property/PropertyPart.py
	modified:   src/abaqus/StepOutput/FieldOutputRequest.py
	modified:   src/abaqus/StepOutput/OutputModel.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/abaqus/Material/Material.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

Co-authored-by: huibosa_macmini <huibosa@email.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Hailin Wang <hailin.wang@connect.polyu.hk>
(cherry picked from commit 2e02a2e)

# Conflicts:
#	src/abaqus/Material/Material.py
@mergify mergify bot added 2016 backport Backport pull request created by Mergify conflicts Conflict with its base branch labels Sep 29, 2024
Copy link
Contributor Author

mergify bot commented Sep 29, 2024

Cherry-pick of 2e02a2e has failed:

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

You are currently cherry-picking commit 2e02a2eb.
  (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/Feature/Feature.py
	modified:   src/abaqus/Part/PartFeature.py
	modified:   src/abaqus/Property/PropertyPart.py
	modified:   src/abaqus/StepOutput/FieldOutputRequest.py
	modified:   src/abaqus/StepOutput/OutputModel.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/abaqus/Material/Material.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

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 Sep 29, 2024
@mergify mergify bot merged commit b869320 into 2016 Sep 29, 2024
2 of 3 checks passed
@mergify mergify bot deleted the mergify/bp/2016/pr-5807 branch September 29, 2024 04:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2016 backport Backport pull request created by Mergify
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants