Skip to content

Fix several CI issues #19301

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

Merged
merged 3 commits into from
Jan 15, 2021
Merged

Fix several CI issues #19301

merged 3 commits into from
Jan 15, 2021

Conversation

QuLogic
Copy link
Member

@QuLogic QuLogic commented Jan 14, 2021

PR Summary

  • Fix brew installation on Azure pipelines.
  • Don't allow pyzmq 21.0.0 on AppVeyor.
    This version is broken on Windows: fix bundling msvcp on Python 3.9 zeromq/pyzmq#1470.
  • TST: Mark Cairo backends as not threadsafe.
    Cairo backends save the cairo_t object on the graphics context (as
    self.gc.ctx), but this object is not threadsafe.
    This should fix sporadic failures in test_interactive_thread_safety.

PR Checklist

  • [n/a] Has pytest style unit tests (and pytest passes).
  • [n/a] Is Flake 8 compliant (run flake8 on changed files to check).
  • [n/a] New features are documented, with examples if plot related.
  • [n/a] Documentation is sphinx and numpydoc compliant (the docs should build without error).
  • Conforms to Matplotlib style conventions (install flake8-docstrings and run flake8 --docstring-convention=all).
  • [n/a] New features have an entry in doc/users/next_whats_new/ (follow instructions in README.rst there).
  • [n/a] API changes documented in doc/api/next_api_changes/ (follow instructions in README.rst there).

This version is broken on Windows:
zeromq/pyzmq#1470.
@QuLogic QuLogic changed the title Fix brew installation on Azure pipelines. Fix Azure pipelines and AppVeyor CI Jan 14, 2021
@QuLogic QuLogic changed the title Fix Azure pipelines and AppVeyor CI Fix several CI issues Jan 14, 2021
Cairo backends save the `cairo_t` object on the graphics context (as
`self.gc.ctx`), but this object is not threadsafe.
backend,
marks=pytest.mark.xfail(reason='github #16849'))
marks.append(pytest.mark.xfail(reason='github #16849'))
backend = pytest.param(backend, marks=marks)
Copy link
Member Author

Choose a reason for hiding this comment

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

This change ensures we always have a pytest.param, so that the later loop is simpler.

Copy link
Member

@tacaswell tacaswell left a comment

Choose a reason for hiding this comment

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

Anyone can merge on green.

@QuLogic QuLogic merged commit 491e2a7 into matplotlib:master Jan 15, 2021
@QuLogic QuLogic deleted the fix-azure branch January 15, 2021 00:46
@lumberbot-app
Copy link

lumberbot-app bot commented Jan 15, 2021

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.3.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 491e2a7e40c1cc92f6816ab03c9df12bae5ab46e
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #19301: Fix several CI issues'
  1. Push to a named branch :
git push YOURFORK v3.3.x:auto-backport-of-pr-19301-on-v3.3.x
  1. Create a PR against branch v3.3.x, I would have named this PR:

"Backport PR #19301 on branch v3.3.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.

QuLogic added a commit to QuLogic/matplotlib that referenced this pull request Jan 15, 2021
QuLogic added a commit that referenced this pull request Jan 15, 2021
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.

2 participants