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

upgrade pytest #421

Merged
merged 2 commits into from Feb 15, 2019

Conversation

@minrk
Copy link
Member

minrk commented Feb 14, 2019

pip has changed its default upgrade strategy, even when --upgrade is specified to leave known-incompatible old versions installed. Switch to --upgrade-strategy=eager to ensure that things are correctly installed.

maybe this is what's pinning pytest to 3.3
@minrk minrk added this to the 5.2.5 milestone Feb 14, 2019
otherwise, pip incorrectly determines that pytest has been satisfied even though it hasn't
@minrk minrk changed the title remove pytest-warnings upgrade pytest Feb 14, 2019
@minrk minrk force-pushed the minrk:pytest-up branch from 573dd57 to cd9532c Feb 14, 2019
@minrk minrk merged commit 3fbd4c6 into jupyter:master Feb 15, 2019
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@meeseeksdev

This comment has been minimized.

Copy link

meeseeksdev bot commented Feb 15, 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 5.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 3fbd4c6b5e36ba6717a71870a47084fc6aa41c8f
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #421: upgrade pytest'
  1. Push to a named branch :
git push YOURFORK 5.x:auto-backport-of-pr-421-on-5.x
  1. Create a PR against branch 5.x, I would have named this PR:

"Backport PR #421 on branch 5.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.

minrk added a commit to minrk/jupyter_client that referenced this pull request Mar 5, 2019
set pip upgrade strategy to eager
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
1 participant
You can’t perform that action at this time.