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

Pandas 2.2; remove some deprecated behavior; update black+pyright #860

Merged
merged 5 commits into from
Feb 12, 2024

Conversation

twoertwein
Copy link
Member

@twoertwein twoertwein commented Feb 10, 2024

Also reduced the number of failures on nightly, but it still fails.

I should have put the black changes in a different commit, but I realized that too late.

edit: run black on a new branch, rebased, and force pushed to separate black and the other changes

| MaskType
| tuple[IndexType | MaskType, IndexType | MaskType]
| tuple[slice]
),
Copy link
Member Author

Choose a reason for hiding this comment

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

(Not too keen on the new formatting)

@twoertwein twoertwein marked this pull request as ready for review February 10, 2024 18:10
fix black issue do to merging with main
remove blank line due to resolving merge conflict.
Copy link
Collaborator

@Dr-Irv Dr-Irv left a comment

Choose a reason for hiding this comment

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

thanks @twoertwein .

I had to resolve some merge conflicts.

@Dr-Irv Dr-Irv merged commit 40d9636 into pandas-dev:main Feb 12, 2024
13 checks passed
@twoertwein
Copy link
Member Author

Thank you for taking care of the conflicts!

Can probably have a new release - or wait for the open PRs!

@Dr-Irv
Copy link
Collaborator

Dr-Irv commented Feb 12, 2024

Can probably have a new release - or wait for the open PRs!

I'm going to wait for the open PR's.

Will you see if you can get nightly working?

@twoertwein
Copy link
Member Author

I think I can get that done this evening. How do we want to handle breaking changes in 3.0 (that do not warn on 2.2 but fail on 3.0)? Ignore in the CI or proactively remove them from the stubs? I'm fine with either.

@Dr-Irv
Copy link
Collaborator

Dr-Irv commented Feb 12, 2024

I think I can get that done this evening. How do we want to handle breaking changes in 3.0 (that do not warn on 2.2 but fail on 3.0)? Ignore in the CI or proactively remove them from the stubs? I'm fine with either.

Don't change the stubs for nightly. Just change the test modules so that they avoid/change the test if the version is larger than 2.2.99.

In tests/__init__.py, we have this:

PD_LTE_21 = Version(pd.__version__) < Version("2.1.999")

So you'd change that to now be PD_LTE_22 using version 2.2.999 and then if some test is inappropriate for nightly, just surround it with if PD_LTE_22 so that it runs with 2.2., but is skipped on nightly.

@twoertwein twoertwein deleted the pandas22 branch April 21, 2024 13:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants