Skip to content
/ matplotlib Public

  • Sponsor matplotlib/matplotlib

  • Notifications You must be signed in to change notification settings
  • Fork 7.9k
  • Star 21.2k

Pin pytest-timeout to fix the build. #11444

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jun 18, 2018
Merged

Pin pytest-timeout to fix the build. #11444

merged 1 commit into from
Jun 18, 2018
+6 −2

Conversation

anntzer
Copy link
Contributor

@anntzer anntzer commented Jun 15, 2018

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
PHP-Proxy

PHP-Proxy

Error accessing resource: 404 - Not Found

@anntzer anntzer added the Build label Jun 15, 2018
jklymak
jklymak previously approved these changes Jun 15, 2018
View reviewed changes
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. Is there a reason we pin pytest?

@QuLogic
Copy link
Member

QuLogic commented Jun 15, 2018

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
Copy link
Contributor Author

anntzer commented Jun 18, 2018

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
Member

@meeseeksdev backport to v2.2.x

@tacaswell
Copy link
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
Copy link

lumberbot-app bot commented Jun 19, 2018

There seem to be a conflict, please backport manually

@jklymak jklymak mentioned this pull request Jun 21, 2018
Closed
QuLogic added a commit to QuLogic/matplotlib that referenced this pull request Jun 22, 2018
@QuLogic
Backport PR matplotlib#11444 on branch v2.2.2-doc.
0ff05ac
QuLogic pushed a commit to QuLogic/matplotlib that referenced this pull request Jun 22, 2018
@phobson @QuLogic
Backport of matplotlib#11444 to v2.2.2-doc.
2030241 
Pin pytest-timeout to fix the build.
@QuLogic
Copy link
Member

QuLogic commented Jun 22, 2018

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
@jklymak
Merge pull request #11478 from QuLogic/backport-11444
6ee7940 
Backport of #11444 to v2.2.2-doc.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@phobson phobson

@jklymak jklymak

Assignees
No one assigned
Labels
Build
Projects
None yet
Milestone
v2.2-doc
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@anntzer @QuLogic @tacaswell @phobson @jklymak