Skip to content
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

Fix backend tests on CI #26005

Merged
merged 2 commits into from May 30, 2023
Merged

Fix backend tests on CI #26005

merged 2 commits into from May 30, 2023

Conversation

QuLogic
Copy link
Member

@QuLogic QuLogic commented May 30, 2023

PR summary

Fixes #25988 by skipping that version of PySide6, and fixes the Azure macOS build by xfailing the tests as in #23095.

PR checklist

QuLogic and others added 2 commits May 30, 2023 00:36
@QuLogic
TST: Skip PySide6 6.5.1 for testing
6e05205 
This version is buggy with respect to signals, and causes tests to fail:
- https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2346
- https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-2348
@QuLogic @timhoffm @oscargus
CI: Mark Tk tests on macOS Azure as xfail
db3477c 
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 added the CI: testing CI configuration and testing label May 30, 2023
@QuLogic QuLogic added this to the v3.7.2 milestone May 30, 2023
@oscargus oscargus merged commit 330969c into matplotlib:main May 30, 2023
39 of 40 checks passed
@lumberbot-app
Copy link

lumberbot-app bot commented May 30, 2023

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.7.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 330969c1704dad0a83a238446d7ae210e4c34fa9
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #26005: Fix backend tests on CI'
  1. Push to a named branch:
git push YOURFORK v3.7.x:auto-backport-of-pr-26005-on-v3.7.x
  1. Create a PR against branch v3.7.x, I would have named this PR:

"Backport PR #26005 on branch v3.7.x (Fix backend tests on CI)"

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.

@QuLogic QuLogic deleted the fix-ci branch May 30, 2023 16:11
QuLogic pushed a commit to QuLogic/matplotlib that referenced this pull request Jun 1, 2023
@oscargus @QuLogic
Backport PR matplotlib#26005: Fix backend tests on CI
a913771 
(cherry picked from commit 330969c)
QuLogic added a commit that referenced this pull request Jun 1, 2023
@QuLogic
Merge pull request #26021 from QuLogic/auto-backport-of-pr-26005-on-v…
648a74a 
…3.7.x

Backport PR #26005 on branch v3.7.x (Fix backend tests on CI)
@QuLogic
Copy link
Member Author

QuLogic commented Jun 16, 2023

Backport is in #26021.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timhoffm timhoffm timhoffm approved these changes

@oscargus oscargus oscargus approved these changes

Assignees
No one assigned
Labels
CI: testing CI configuration and testing
Projects
None yet
Milestone
v3.7.2
Development

Successfully merging this pull request may close these issues.

[TST] Qt/Pyside 6.5.1 dependency test failures
3 participants
@QuLogic @timhoffm @oscargus