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

Unpin pytest (pytest-cov's latest release is compatible with it). #13141

Merged
merged 1 commit into from
Jan 10, 2019

Conversation

anntzer
Copy link
Contributor

@anntzer anntzer commented Jan 10, 2019

PR Summary

PR Checklist

  • Has Pytest style unit tests
  • Code is Flake 8 compliant
  • New features are documented, with examples if plot related
  • Documentation is sphinx and numpydoc compliant
  • Added an entry to doc/users/next_whats_new/ if major new feature (follow instructions in README.rst there)
  • Documented in doc/api/api_changes.rst if API changed in a backward-incompatible way

Copy link
Member

@jklymak jklymak left a comment

Choose a reason for hiding this comment

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

LGTM if passes

@jklymak
Copy link
Member

jklymak commented Jan 10, 2019

I'm going to merge as not a substantive change, just rolling back something that was put in place to deal w/ a prob w/ pytest

@jklymak jklymak merged commit 4cdc2ba into matplotlib:master Jan 10, 2019
@QuLogic QuLogic added this to the v3.1 milestone Jan 10, 2019
@anntzer anntzer deleted the pytest41 branch January 10, 2019 09:33
@dstansby
Copy link
Member

@meeseeksmachine backport to v3.0.x

@dstansby
Copy link
Member

@meeseeksdev backport to v3.0.x

@lumberbot-app
Copy link

lumberbot-app bot commented Jan 11, 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 4cdc2baa6d0bba96db4b4495ec89d9e05e8c53c3
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am "Backport PR #13141: Unpin pytest (pytest-cov's latest release is compatible with it)."
  1. Push to a named branch :
git push YOURFORK v3.0.x:auto-backport-of-pr-13141-on-v3.0.x
  1. Create a PR against branch v3.0.x, I would have named this PR:

"Backport PR #13141 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.

@timhoffm
Copy link
Member

This reverts #13122, which was not backported #13122 (comment). So this needs no backport as well.

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