Skip to content

CI: pytest, xdist versions #27845

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 2 commits into from
Aug 12, 2019
Merged

Conversation

TomAugspurger
Copy link
Contributor

No description provided.

@gfyoung gfyoung added the Dependencies Required and optional dependencies label Aug 9, 2019
@@ -13,8 +13,8 @@ dependencies:
- pyarrow
- pytz
# universal
- pytest>=4.0.2
- pytest-xdist
- pytest>=5.0.0
Copy link
Member

Choose a reason for hiding this comment

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

why 5.0.0 in some places and 5.0.1 in others?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just sloppiness on my part.

@TomAugspurger
Copy link
Contributor Author

Merging, to get CI passing again.

@TomAugspurger TomAugspurger added this to the 0.25.1 milestone Aug 12, 2019
@TomAugspurger TomAugspurger merged commit e26fa2b into pandas-dev:master Aug 12, 2019
@TomAugspurger TomAugspurger deleted the pytest-final branch August 12, 2019 02:29
@lumberbot-app
Copy link

lumberbot-app bot commented Aug 12, 2019

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 0.25.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 e26fa2b9b7c44ba7a1865c9206ae213e1e908b99
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #27845: CI: pytest, xdist versions'
  1. Push to a named branch :
git push YOURFORK 0.25.x:auto-backport-of-pr-27845-on-0.25.x
  1. Create a PR against branch 0.25.x, I would have named this PR:

"Backport PR #27845 on branch 0.25.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.

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.

3 participants