Skip to content

Qt6 compatibility + some cleanup #439

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
Open
wpfff wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Qt6 compatibility + some cleanup #439

wpfff wants to merge 19 commits into from

Conversation

@wpfff
Copy link
Contributor

@wpfff wpfff commented Jan 2, 2026 •
edited
Loading

  • removed old/unused doc files (will replace Sphinx with mkdocs)
  • removed old prototyping files -- those should not be in the main branch anyway (except as docs)
  • all tests working with PySide6 and PyQt5 (also verified locally)
  • by default, testing and checks (pytest, mypy) now with PySide6; seems more likely to be the default now.

@wpfff
Copy link
Contributor Author

wpfff commented Jan 2, 2026 •
edited
Loading

@astafan8 @jenshnielsen @marcosfrenkel -- i'm working on cleaning up a bit and bringing a few things up to date.
i'm thinking of replacing PyQt5 with PySide6 as the default, incl in tests, CI, etc.
Do you think there's a good reason to not do that?

[EDIT]
i got it all the checks work with Pyside6; and runtime seems fine with both Pyside6 and Pyqt5.
Let me know what you think...

wpfff added 13 commits January 2, 2026 14:57
@wpfff wpfff changed the title [WIP] This is a cleanup PR -- removing clutter, make sure things are up to date Qt6 compatibility + some cleanup Jan 3, 2026
jenshnielsen
jenshnielsen reviewed Jan 4, 2026
View reviewed changes
test_requirements.txt
@@ -2,6 +2,6 @@ qcodes
pytest
pytest-qt
mypy==1.13.0
Copy link
Collaborator

@jenshnielsen jenshnielsen Jan 4, 2026

Choose a reason for hiding this comment

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

The version of mypy is rather out of date so we might want to update that too eventually. That may fix some of the typing issues here.

@jenshnielsen
Copy link
Collaborator

jenshnielsen commented Jan 4, 2026

@wpfff I agree its about time to swich to qt6. I have tried pyqt6 in the past but if pyside6 works well that seems like a good choice. I don't have any experience with mkdocs. Curious to see what you come up with for that

marcosfrenkel
marcosfrenkel reviewed Jan 26, 2026
View reviewed changes
.github/workflows/python-app.yml
Comment on lines +21 to +27
# - name: setup ubuntu-latest xvfb
# run: |
# sudo apt install libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 x11-utils libgl1 libegl1 libdbus-1-3 libegl1-mesa-dev
# /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1920x1200x24 -ac +extension GLX
# Source - https://stackoverflow.com/questions/75497408/github-action-pytest-exit-code-134
# Posted by Justin Buiel
# Retrieved 2026-01-03, License - CC BY-SA 4.0
Copy link
Collaborator

@marcosfrenkel marcosfrenkel Jan 26, 2026

Choose a reason for hiding this comment

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

Since we are doing a cleanup should we just deleted the commented code?

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

Reviewers

@jenshnielsen jenshnielsen jenshnielsen approved these changes

@marcosfrenkel marcosfrenkel marcosfrenkel approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@wpfff @jenshnielsen @marcosfrenkel