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

Pin pytest<4.1 to unbreak CI tests #13122

Merged
merged 1 commit into from Jan 6, 2019

Conversation

timhoffm
Copy link
Member

@timhoffm timhoffm commented Jan 6, 2019

PR Summary

Temporary fix for #13121.

This can be undone once a new pytest-cov release is out.

@jklymak
Copy link
Member

jklymak commented Jan 6, 2019

Though should it just be !=4.1 ?

@hugovk
Copy link
Contributor

hugovk commented Jan 6, 2019

Pytest > 4.1 will still have the same feature removed, so I think < 4.1 makes more sense until there's a new pytest-cov release.

@tacaswell tacaswell added this to the v3.0.2-doc milestone Jan 6, 2019
@tacaswell tacaswell merged commit e673374 into matplotlib:master Jan 6, 2019
@lumberbot-app
Copy link

lumberbot-app bot commented Jan 6, 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 v3.0.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 e6733748a5fd5b8081ff518aa64d50aac70ff1d4
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #13122: Pin pytest<4.1 to unbreak CI tests'
  1. Push to a named branch :
git push YOURFORK v3.0.x:auto-backport-of-pr-13122-on-v3.0.x
  1. Create a PR against branch v3.0.x, I would have named this PR:

"Backport PR #13122 on branch v3.0.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 Jan 6, 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 v3.0.2-doc
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 e6733748a5fd5b8081ff518aa64d50aac70ff1d4
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #13122: Pin pytest<4.1 to unbreak CI tests'
  1. Push to a named branch :
git push YOURFORK v3.0.2-doc:auto-backport-of-pr-13122-on-v3.0.2-doc
  1. Create a PR against branch v3.0.2-doc, I would have named this PR:

"Backport PR #13122 on branch v3.0.2-doc"

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.

@tacaswell
Copy link
Member

ouch, does not backport to either branch cleanly :(

@timhoffm
Copy link
Member Author

timhoffm commented Jan 6, 2019

I hope that there will be a pytest-cov release soon since it's affecting all pojects using pytest-cov. This question is raised here pytest-dev/pytest-cov#253.

Therefore, I would wait for an answer of the pytest-cov developers before pinning and later unpinning the other branches manually.

@timhoffm timhoffm deleted the pin-pytest-4 branch January 6, 2019 22:47
@tacaswell
Copy link
Member

@timhoffm fair enough.

@timhoffm
Copy link
Member Author

timhoffm commented Jan 7, 2019

pytest-cov 2.6.1 has just been released. So no need to backport anymore.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants