Skip to content

Qt6 compatibility + some cleanup - #439

Closed
wpfff wants to merge 19 commits into
toolsforexperiments:masterfrom
wpfff:pyside6_and_cleanup
Closed

Qt6 compatibility + some cleanup#439
wpfff wants to merge 19 commits into
toolsforexperiments:masterfrom
wpfff:pyside6_and_cleanup

Conversation

@wpfff

@wpfff wpfff commented Jan 2, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor
  • 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

wpfff commented Jan 2, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

@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
Comment thread test_requirements.txt
@@ -2,6 +2,6 @@ qcodes
pytest
pytest-qt
mypy==1.13.0

@jenshnielsen jenshnielsen Jan 4, 2026

Copy link
Copy Markdown
Collaborator

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

jenshnielsen commented Jan 4, 2026

Copy link
Copy Markdown
Collaborator

@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
Comment thread .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

@marcosfrenkel marcosfrenkel Jan 26, 2026

Copy link
Copy Markdown
Collaborator

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?

@astafan8 astafan8 mentioned this pull request Jun 30, 2026
Merged
@astafan8

astafan8 commented Jun 30, 2026

Copy link
Copy Markdown
Collaborator

@wpfff @marcosfrenkel due to merge conflicts and such, let's close this PR in favor of #461

@astafan8 astafan8 closed this in #461 Jul 1, 2026
astafan8 added a commit that referenced this pull request Jul 1, 2026
@astafan8
Merge pull request #461 from toolsforexperiments/pyside6-and-cleanup-…
42cd393 
…reapply

Qt6/PySide6 compatibility + cleanup (re-apply of #439)
Aayam-Bista pushed a commit to Aayam-Bista/plottr that referenced this pull request Jul 13, 2026
Mikhail Astafev
Qt6/PySide6 compatibility + cleanup (re-apply of toolsforexperiments#439
3813d97 
 onto master)

Re-implements PR toolsforexperiments#439 (pyside6_and_cleanup) on top of current master, which had
diverged enough to make the original branch unmergeable.

- Default type checking and pytest qt_api switched to PySide6; runtime keeps
  qtpy backend abstraction (PyQt5/PyQt6/PySide2/PySide6 all supported).
- plottr/__init__.py exports QAction/QActionGroup (moved to QtGui in Qt6) and
  PYSIDE6/PYQT6/API_NAME flags; QAbstractItemModel exec_()->exec().
- Per-file PySide6 fixes across apps/plot/data/gui/node modules.
- Removed old Sphinx docs, readthedocs config, and legacy prototyping/gui test
  scripts.
- CI: install .[pyside6]; use tlambert03/setup-qt-libs for headless Qt libs.

Kept newer master tooling (mypy 2.1.0, checkout@v7, setup-python@v6.3.0) and
skipped changes already on master (numpy mypy plugin removal).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
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.

4 participants

@wpfff @jenshnielsen @astafan8 @marcosfrenkel