Skip to content

Try to unbreak CI by xfailing OSX Tk tests #23095

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
May 24, 2022

Conversation

timhoffm
Copy link
Member

@timhoffm timhoffm commented May 22, 2022

Stopgap solution for #23094.

Mid-term we should get the CI environment sorted out to have a working Tk setup. But until then, it's better to xfail than to have all PRs cluttered with these failures.

This is a blind attempt. - CI will decide whether I did everything correctly.

@oscargus
Copy link
Member

I believe that my second commit was the actual thing that corrected it. (Using pytest.mark.xfail rather than pytest.xfail, so one could get rid of my first commit. Or keep it as it still works.)

@timhoffm
Copy link
Member Author

@oscargus thanks for fixing this! Yes, your fix is is correct and the first commit is also good.

@ALL I suggest to squash-merge this.

@jklymak jklymak merged commit d6ee414 into matplotlib:main May 24, 2022
@timhoffm timhoffm deleted the osx-tk-xfail branch May 24, 2022 10:14
@QuLogic QuLogic added this to the v3.6.0 milestone May 24, 2022
@tacaswell
Copy link
Member

@meeseeksdev backport to v3.5.x

@lumberbot-app
Copy link

lumberbot-app bot commented Jun 2, 2022

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.5.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 d6ee414ec175870b9fe8c65297e6c56114fe19a3
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #23095: Try to unbreak CI by xfailing OSX Tk tests'
  1. Push to a named branch:
git push YOURFORK v3.5.x:auto-backport-of-pr-23095-on-v3.5.x
  1. Create a PR against branch v3.5.x, I would have named this PR:

"Backport PR #23095 on branch v3.5.x (Try to unbreak CI by xfailing OSX Tk tests)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

tacaswell pushed a commit to tacaswell/matplotlib that referenced this pull request Jun 2, 2022
Try to unbreak CI by xfailing OSX Tk tests (matplotlib#23095)

* Try to unbreak CI by xfailing OSX Tk tests

Stopgap solution for matplotlib#23094

* Update lib/matplotlib/tests/test_backend_tk.py

* Update lib/matplotlib/tests/test_backend_tk.py

Co-authored-by: Oscar Gustafsson <oscar.gustafsson@gmail.com>
(cherry picked from commit d6ee414)
@tacaswell tacaswell modified the milestones: v3.6.0, v3.5.3 Jun 2, 2022
oscargus added a commit that referenced this pull request Jun 3, 2022
…-v3.5.x

Backport PR #23095: Try to unbreak CI by xfailing OSX Tk tests
andrew-fennell pushed a commit to andrew-fennell/matplotlib that referenced this pull request Jun 14, 2022
* Try to unbreak CI by xfailing OSX Tk tests

Stopgap solution for matplotlib#23094

* Update lib/matplotlib/tests/test_backend_tk.py

* Update lib/matplotlib/tests/test_backend_tk.py

Co-authored-by: Oscar Gustafsson <oscar.gustafsson@gmail.com>
QuLogic added a commit that referenced this pull request Jun 27, 2022
QuLogic added a commit to QuLogic/matplotlib that referenced this pull request May 30, 2023
This is a re-application of matplotlib#23095, but with some more specific
conditions.

Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com>
Co-authored-by: Oscar Gustafsson <oscar.gustafsson@gmail.com>
@QuLogic QuLogic mentioned this pull request May 30, 2023
2 tasks
devRD pushed a commit to devRD/matplotlib that referenced this pull request Jun 5, 2023
This is a re-application of matplotlib#23095, but with some more specific
conditions.

Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com>
Co-authored-by: Oscar Gustafsson <oscar.gustafsson@gmail.com>
melissawm pushed a commit to melissawm/matplotlib that referenced this pull request Jun 15, 2023
This is a re-application of matplotlib#23095, but with some more specific
conditions.

Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com>
Co-authored-by: Oscar Gustafsson <oscar.gustafsson@gmail.com>
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.

6 participants