Skip to content

Backport PR #40877 on branch 1.2.x (Skipt failing tests for numpy dev) #40882

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 4 commits into from
Apr 12, 2021
Merged

Backport PR #40877 on branch 1.2.x (Skipt failing tests for numpy dev) #40882

merged 4 commits into from
Apr 12, 2021

Conversation

phofl
Copy link
Member

@phofl phofl commented Apr 11, 2021 •
edited by simonjayhawkins
Loading

Backport PR #40877

Had to add the is_numpy_dev import, we could otherwise import from other directory if this would be preferrable

phofl and others added 2 commits April 11, 2021 18:37
@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)
@phofl
Fix duplicate test and add is numpy dev
78ddf85
@phofl phofl added CI Continuous Integration Dependencies Required and optional dependencies Upstream issue Issue related to pandas dependency labels Apr 11, 2021
@phofl phofl added this to the 1.2.4 milestone Apr 11, 2021
This was referenced Apr 11, 2021
Merged
Closed
@simonjayhawkins
Copy link
Member

@phofl have added Backport PR #40877 to OP. the ref in the title donsn't create a link to the original PR.

@simonjayhawkins
Copy link
Member

Had to add the is_numpy_dev import, we could otherwise import from other directory if this would be preferrable

maybe since we likely are doing a release between now and the revert, let's not change the code only the tests.

@phofl
Copy link
Member Author

phofl commented Apr 11, 2021

Seems reasonable,

Done

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

@simonjayhawkins simonjayhawkins merged commit 7b1803c into pandas-dev:1.2.x Apr 12, 2021
@phofl phofl deleted the backport_40874 branch April 18, 2021 16:00
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