Skip to content

Revert "CI temporarily pin numpy" #50706

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

Merged
merged 3 commits into from
Jan 12, 2023
Merged

Conversation

MarcoGorelli
Copy link
Member

Reverts #50356

@MarcoGorelli MarcoGorelli added the Dependencies Required and optional dependencies label Jan 12, 2023
@MarcoGorelli MarcoGorelli marked this pull request as ready for review January 12, 2023 15:18
@MarcoGorelli MarcoGorelli added this to the 1.5.3 milestone Jan 12, 2023
@@ -9,6 +9,7 @@
np_version_under1p21 = _nlv < Version("1.21")
np_version_under1p22 = _nlv < Version("1.22")
np_version_gte1p22 = _nlv >= Version("1.22")
np_version_gte1p24 = _nlv >= Version("1.24")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this added since this PR is to be backported and it's in the 1.5.x branch?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added it in the second commit (the one after the pure revert, which also catches the SystemError)

TBH I accidentally left it in after I was trying things out, and then figured I'd just leave it here as it'll probably be useful at some point. Reckon it needs removing?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I would opt to only add this until we really need it (and IIRC you may have wanted to remove these in favor of direct version checks in the code?)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that was only for the Python version, because pyupgrade will rewrite them (they don't rewrite based on 3rd party libraries)

OK, sure, I'll remove this line - is the rest alright?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup the rest LGTM

@MarcoGorelli
Copy link
Member Author

thanks - merging then as this was green, and the last commit just reverted adding an unused variable

@MarcoGorelli MarcoGorelli merged commit 754394c into main Jan 12, 2023
meeseeksmachine pushed a commit to meeseeksmachine/pandas that referenced this pull request Jan 12, 2023
@mroeschke mroeschke deleted the revert-50356-temporarily-pin-numpy branch January 12, 2023 18:59
phofl pushed a commit to phofl/pandas that referenced this pull request Jan 12, 2023
* Revert "CI: Temporarily pin numpy (pandas-dev#50356)"

This reverts commit f31da23.

* maybe fixup test collection

* remove np_version_gte1p24

Co-authored-by: MarcoGorelli <>
phofl pushed a commit to phofl/pandas that referenced this pull request Jan 13, 2023
* Revert "CI: Temporarily pin numpy (pandas-dev#50356)"

This reverts commit f31da23.

* maybe fixup test collection

* remove np_version_gte1p24

Co-authored-by: MarcoGorelli <>
phofl pushed a commit that referenced this pull request Jan 13, 2023
#50715)

Backport PR #50706: Revert "CI temporarily pin numpy"

Co-authored-by: Marco Edward Gorelli <[email protected]>
@mroeschke mroeschke mentioned this pull request Jan 13, 2023
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Dependencies Required and optional dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants