Skip to content

Skipt failing tests for numpy dev #40877

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
Apr 11, 2021
Merged

Skipt failing tests for numpy dev #40877

merged 3 commits into from
Apr 11, 2021

Conversation

phofl
Copy link
Member

@phofl phofl commented Apr 11, 2021

Skipping for now.

@phofl phofl added CI Continuous Integration Dependencies Required and optional dependencies Upstream issue Issue related to pandas dependency labels Apr 11, 2021
@phofl
Copy link
Member Author

phofl commented Apr 11, 2021

@simonjayhawkins if an issue with 1.2.4 release we can backport here

@simonjayhawkins simonjayhawkins added this to the 1.2.4 milestone Apr 11, 2021
@simonjayhawkins
Copy link
Member

I've milestoned 1.2.4 but may need manual backport (the number of tests failing is different)

@phofl
Copy link
Member Author

phofl commented Apr 11, 2021

The test not failing on 1.2.4 is skipped there, will probably cause a merge conflict anyway

simonjayhawkins
simonjayhawkins reviewed Apr 11, 2021
View reviewed changes
pandas/tests/arrays/masked/test_arithmetic.py Outdated
@@ -52,6 +54,11 @@ def test_array_scalar_like_equivalence(data, all_arithmetic_operators):
def test_array_NA(data, all_arithmetic_operators):
if "truediv" in all_arithmetic_operators:
pytest.skip("division with pd.NA raises")
if (
"floordiv" in all_arithmetic_operators
Copy link
Member

Choose a reason for hiding this comment

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

all_arithmetic_operators is a scalar, despite the name. maybe should be == and add the dunders for clarity?

and then maybe simplify further...

if all_arithmetic_operators in ("__floordiv__", "__rfloordiv__"):

Copy link
Member Author

Choose a reason for hiding this comment

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

See below

simonjayhawkins
simonjayhawkins reviewed Apr 11, 2021
View reviewed changes
pandas/tests/arrays/masked/test_arithmetic.py Outdated
@@ -52,6 +54,11 @@ def test_array_scalar_like_equivalence(data, all_arithmetic_operators):
def test_array_NA(data, all_arithmetic_operators):
if "truediv" in all_arithmetic_operators:
pytest.skip("division with pd.NA raises")
if (
"floordiv" in all_arithmetic_operators
or "rfloordiv" in all_arithmetic_operators
Copy link
Member

Choose a reason for hiding this comment

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

since this is already true if "floordiv" in all_arithmetic_operators since "floordiv" in "rfloordiv" is True

Copy link
Member Author

Choose a reason for hiding this comment

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

Thats a good point, would go with this then?

simonjayhawkins
simonjayhawkins approved these changes Apr 11, 2021
View reviewed changes
Copy link
Member

@simonjayhawkins simonjayhawkins left a comment

Choose a reason for hiding this comment

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

thanks @phofl lgtm. let's merge on green to get ci passing.

@phofl phofl merged commit 895f0b4 into pandas-dev:master Apr 11, 2021
@phofl
Copy link
Member Author

phofl commented Apr 11, 2021

@meeseeksdev backport 1.2.x

meeseeksmachine pushed a commit to meeseeksmachine/pandas that referenced this pull request Apr 11, 2021
@phofl @meeseeksmachine
Backport PR pandas-dev#40877: Skipt failing tests for numpy dev
b375445
@meeseeksmachine meeseeksmachine mentioned this pull request Apr 11, 2021
Closed
@lumberbot-app
Copy link

lumberbot-app bot commented Apr 11, 2021

Something went wrong ... Please have a look at my logs.

@phofl
Copy link
Member Author

phofl commented Apr 11, 2021

Merged, looks like numpy identified the source already, can probably revert next sunday

@phofl phofl deleted the 40874 branch April 11, 2021 16:38
phofl added a commit to phofl/pandas that referenced this pull request Apr 11, 2021
@phofl
Skipt failing tests for numpy dev (pandas-dev#40877)
06467d0 
* Skipt failing tests for numpy dev

* Add missed test to skip

* Change if condition

(cherry picked from commit 895f0b4)
@simonjayhawkins
Copy link
Member

Merged, looks like numpy identified the source already, can probably revert next sunday

ok will backport to keep ci green on 1.2.x in the meantime.

@simonjayhawkins
Copy link
Member

@meeseeksdev backport 1.2.x

@meeseeksmachine meeseeksmachine mentioned this pull request Apr 11, 2021
Closed
@phofl
Copy link
Member Author

phofl commented Apr 11, 2021

Í have added #40882 manually

@simonjayhawkins simonjayhawkins mentioned this pull request Apr 11, 2021
Merged
simonjayhawkins pushed a commit that referenced this pull request Apr 12, 2021
@phofl
Backport PR #40877 on branch 1.2.x (Skipt failing tests for numpy dev) (
7b1803c 
#40882)
phofl added a commit to phofl/pandas that referenced this pull request Apr 18, 2021
@phofl
Revert "Skipt failing tests for numpy dev (pandas-dev#40877)"
62a53ea 
This reverts commit 895f0b4
phofl added a commit that referenced this pull request Apr 18, 2021
@phofl
Revert "Skipt failing tests for numpy dev (#40877)" (#41015)
70435eb 
This reverts commit 895f0b4
phofl added a commit to phofl/pandas that referenced this pull request Apr 18, 2021
@phofl
Revert "Skipt failing tests for numpy dev (pandas-dev#40877)" (pandas…
284c315 
…-dev#41015)

This reverts commit 895f0b4

(cherry picked from commit 70435eb)
phofl added a commit that referenced this pull request Apr 18, 2021
@phofl
Backport PR #41015 on branch 1.2.x (Revert "Skipt failing tests for n…
d379627 
…umpy dev (#40877)") (#41019)

* Revert "Skipt failing tests for numpy dev (#40877)" (#41015)

This reverts commit 895f0b4

(cherry picked from commit 70435eb)

* Add accidentially deleted code back in
sthagen added a commit to sthagen/pandas-dev-pandas that referenced this pull request Apr 18, 2021
@sthagen
Merge pull request #183 from pandas-dev/master
a4e1651 
Revert "Skipt failing tests for numpy dev (pandas-dev#40877)" (pandas-dev#41015)
yeshsurya pushed a commit to yeshsurya/pandas that referenced this pull request Apr 21, 2021
@phofl @yeshsurya
Revert "Skipt failing tests for numpy dev (pandas-dev#40877)" (pandas…
465a8e3 
…-dev#41015)

This reverts commit 895f0b4
JulianWgs pushed a commit to JulianWgs/pandas that referenced this pull request Jul 3, 2021
@phofl @JulianWgs
Skipt failing tests for numpy dev (pandas-dev#40877)
a1e1262 
* Skipt failing tests for numpy dev

* Add missed test to skip

* Change if condition
JulianWgs pushed a commit to JulianWgs/pandas that referenced this pull request Jul 3, 2021
@phofl @JulianWgs
Revert "Skipt failing tests for numpy dev (pandas-dev#40877)" (pandas…
6be4c9c 
…-dev#41015)

This reverts commit 895f0b4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simonjayhawkins simonjayhawkins simonjayhawkins approved these changes

Assignees
No one assigned
Labels
CI Continuous Integration Dependencies Required and optional dependencies Upstream issue Issue related to pandas dependency
Projects
None yet
Milestone
1.2.4
Development

Successfully merging this pull request may close these issues.
2 participants
@phofl @simonjayhawkins