Skip to content

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

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 1 commit into from
Apr 18, 2021
Merged

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

merged 1 commit into from
Apr 18, 2021

Conversation

phofl
Copy link
Member

@phofl phofl commented Apr 18, 2021

new numpy wheel is out, bug was fixed during the week

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

phofl commented Apr 18, 2021

greenish, failure unrelated

@jreback
Copy link
Contributor

jreback commented Apr 18, 2021

lgtm go ahead merge and backport

@phofl phofl merged commit 70435eb into pandas-dev:master Apr 18, 2021
@phofl
Copy link
Member Author

phofl commented Apr 18, 2021

@meeseeksdev backport 1.2.x

@phofl phofl deleted the 40874 branch April 18, 2021 15:56
@lumberbot-app
Copy link

lumberbot-app bot commented Apr 18, 2021

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout 1.2.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 70435eba769c6bcf57332306455eb70db9fa1111
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #41015: Revert "Skipt failing tests for numpy dev (#40877)"'
  1. Push to a named branch :
git push YOURFORK 1.2.x:auto-backport-of-pr-41015-on-1.2.x
  1. Create a PR against branch 1.2.x, I would have named this PR:

"Backport PR #41015 on branch 1.2.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

@lumberbot-app
Copy link

lumberbot-app bot commented Apr 18, 2021

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout 1.2.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 70435eba769c6bcf57332306455eb70db9fa1111
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #41015: Revert "Skipt failing tests for numpy dev (#40877)"'
  1. Push to a named branch :
git push YOURFORK 1.2.x:auto-backport-of-pr-41015-on-1.2.x
  1. Create a PR against branch 1.2.x, I would have named this PR:

"Backport PR #41015 on branch 1.2.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

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 phofl mentioned this pull request Apr 18, 2021
Merged
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
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
No reviews
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.5
Development

Successfully merging this pull request may close these issues.

BUG: New numpy dev caused ci to fail
2 participants
@phofl @jreback