FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Unbreak CI by xfailing wxAgg test on macOS by timhoffm · Pull Request #16870 · matplotlib/matplotlib · GitHub

Repository navigation

Unbreak CI by xfailing wxAgg test on macOS - #16870

Merged
tacaswell merged 1 commit into
matplotlib:masterfrom
timhoffm:xfail
Mar 23, 2020
Merged

tacaswell merged 1 commit into
matplotlib:masterfrom
timhoffm:xfail

Conversation

Copy link
Copy Markdown
Member

PR Summary

This is a stopgap for #16849, which does not yet have a solution. We just xfail the test for now so that other PRs pass CI.

timhoffm changed the title Unbreak CI by xfailing Unbreak CI by xfailing wxAgg test on macOS Mar 22, 2020
tacaswell added this to the v3.2.2 milestone Mar 23, 2020

Copy link
Copy Markdown
Member

The travis failure is a known file system race (test_loglog_nonpos[png-True]) that I think we have PR in flight to prevent.

tacaswell merged commit 7352a13 into matplotlib:master Mar 23, 2020

lumberbot-app Bot commented Mar 23, 2020

Copy link
Copy Markdown

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.2.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 7352a13612a7bf6c3463edeec3e14c0490341a1b
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #16870: Unbreak CI by xfailing wxAgg test on macOS'
  1. Push to a named branch :
git push YOURFORK v3.2.x:auto-backport-of-pr-16870-on-v3.2.x
  1. Create a PR against branch v3.2.x, I would have named this PR:

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

tacaswell added a commit to tacaswell/matplotlib that referenced this pull request Mar 23, 2020
Merge pull request matplotlib#16870 from timhoffm/xfail

CI: Unbreak CI by xfailing wxAgg test on macOS

Conflicts:
  lib/matplotlib/tests/test_backends_interactive.py
    - Other improvements to messages when skipping tests from
      bc155f0 near by.  Did not
      implicitly backport other changes.
timhoffm deleted the xfail branch March 23, 2020 15:24
tacaswell added a commit that referenced this pull request Mar 23, 2020
…-v3.2.x

Backport PR #16870: Unbreak CI by xfailing wxAgg test on macOS
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants


Back | FazBrowse Home | New Git URL