Skip to content

Pin pytest-timeout to fix the build. - #11444

Merged
phobson merged 1 commit into
matplotlib:masterfrom
anntzer:pin-pytest-timeout
Jun 18, 2018
Merged

phobson merged 1 commit into
matplotlib:masterfrom
anntzer:pin-pytest-timeout

Conversation

@anntzer

@anntzer anntzer commented Jun 15, 2018

Copy link
Copy Markdown
Contributor

PR Summary

See https://gitter.im/matplotlib/matplotlib?at=5b23860732618e705ebca4ed and below.

PR Checklist

  • Has Pytest style unit tests
  • Code is PEP 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

@anntzer anntzer added the Build label Jun 15, 2018
jklymak
jklymak previously approved these changes Jun 15, 2018

@jklymak jklymak left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM. Is there a reason we pin pytest?

@QuLogic

QuLogic commented Jun 15, 2018

Copy link
Copy Markdown
Member

That test case is running minimum (almost) everything.

@jklymak
jklymak dismissed their stale review June 15, 2018 22:09

Guess it should pass the breaking test first ;-)

@anntzer
anntzer force-pushed the pin-pytest-timeout branch from 8e29b1c to 7b45c37 Compare June 15, 2018 22:13
@anntzer
anntzer force-pushed the pin-pytest-timeout branch from 7b45c37 to 945c016 Compare June 18, 2018 20:13
@anntzer

anntzer commented Jun 18, 2018

Copy link
Copy Markdown
Contributor Author

Now fixed (needed to work around the fact that travis installs a not-up-to-date pytest by default).

@phobson
phobson merged commit 4ea916a into matplotlib:master Jun 18, 2018
@anntzer
anntzer deleted the pin-pytest-timeout branch June 19, 2018 12:01
@tacaswell tacaswell added this to the v2.2.3 milestone Jun 19, 2018
@tacaswell

Copy link
Copy Markdown
Member

@meeseeksdev backport to v2.2.x

@tacaswell

Copy link
Copy Markdown
Member

I assume that backport is going to fail, but I suspect we are going to have the same issues on the 2.2.x branch...

@lumberbot-app

lumberbot-app Bot commented Jun 19, 2018

Copy link
Copy Markdown

There seem to be a conflict, please backport manually

QuLogic added a commit to QuLogic/matplotlib that referenced this pull request Jun 22, 2018
QuLogic pushed a commit to QuLogic/matplotlib that referenced this pull request Jun 22, 2018
Pin pytest-timeout to fix the build.
@QuLogic

QuLogic commented Jun 22, 2018

Copy link
Copy Markdown
Member

Backport at #11478.

@QuLogic QuLogic modified the milestones: v2.2.3, v2.2-doc Jun 22, 2018
jklymak added a commit that referenced this pull request Jun 22, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants