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.

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

WIP: Upgrade PyQt5 to PyQt6. #2279

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

WIP: Upgrade PyQt5 to PyQt6. #2279

wants to merge 6 commits into from

Conversation

carlosperate
Copy link
Member

@carlosperate carlosperate commented Jun 29, 2022

@ntoll
Copy link
Member

ntoll commented Jun 29, 2022

oooOOOOOoooooh. This is very exciting. Really great work @carlosperate 🎉 Something to hit with a big stick during EuroPython sprints. 😁 🇪🇺 🐍

@lgtm-com
Copy link

lgtm-com bot commented Jun 29, 2022

This pull request introduces 1 alert when merging 794e7e7 into 5be0c29 - view on LGTM.com

new alerts:

  • 1 for Unused import

@carlosperate carlosperate force-pushed the pyqt6 branch 2 times, most recently from 858f18d to 87c3b5a Compare July 17, 2022 11:06
@lgtm-com
Copy link

lgtm-com bot commented Jul 17, 2022

This pull request introduces 1 alert when merging 87c3b5a into 9fe47ac - view on LGTM.com

new alerts:

  • 1 for Unused import

@carlosperate carlosperate force-pushed the pyqt6 branch 2 times, most recently from 9efdd96 to dc50e2f Compare July 18, 2022 17:46
Copy link
Contributor

@cclauss cclauss left a comment

Choose a reason for hiding this comment

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

Nice to see!!! 57 checks on every pull request seems like a lot of complexity to manage and a lot of CPU to burn. Of course, we want all these platforms to work in the long run but are there some platforms that are easier so we can get mu on PyQt6 working end-to-end on a few. Awesome effort!

python-version: '3.5'
- os: ubuntu-latest
python-version: '3.6'
python-version: ['3.8', '3.9', '3.10', '3.11']
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
python-version: ['3.8', '3.9', '3.10', '3.11']
python-version: ['3.8', '3.9', '3.10', '3.11', ‘3.12’]

timeout-minutes: 5
- name: Run tests
if: runner.os != 'Linux'
run: python make.py check
timeout-minutes: 5

test-arm:
# Missing Qt6 versions of: python3-pyqt5.qsci python3-pyqt5.qtchart
Copy link
Contributor

Choose a reason for hiding this comment

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

Has this situation improved?

runs-on: ubuntu-latest
name: Test Py 3.7 - arm-debian-buster
name: Test Py 3.10 - arm-debian-bookworm
Copy link
Contributor

Choose a reason for hiding this comment

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

Is bookworm’s default Python 3.10 or 3.11?

runs-on: ubuntu-latest
name: Test Py 3.7 - arm-debian-buster
name: Test Py 3.10 - arm-debian-bookworm
steps:
- uses: actions/checkout@v3
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
- uses: actions/checkout@v3
- uses: actions/checkout@v4

python3 -m virtualenv venv --python=python3 --system-site-packages &&
source venv/bin/activate &&
python -c \"import platform, struct, sys; print(platform.machine(), struct.calcsize('P') * 8, sys.version)\" &&
python -m pip --version &&
python -m pip config set global.extra-index-url https://www.piwheels.org/simple &&
python -m pip config list &&
python -m pip list &&
python -m pip install .[dev] &&
python -m pip install cryptography pyzmq cffi --python-version 3.9 --only-binary \":all:\" --no-deps --target venv/lib/python3.10/site-packages/ &&
Copy link
Contributor

Choose a reason for hiding this comment

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

This line creates a Py3.9 binary and puts into the Py3.10 site packages?

@@ -25,11 +25,11 @@
# The core 'install_requires' should only be things
# which are needed for the main editor to function.
#
"PyQt5==5.13.2"
"PyQt6==6.3.1"
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
"PyQt6==6.3.1"
"PyQt6==6.6.1"

+ ';"arm" not in platform_machine and "aarch" not in platform_machine',
"QScintilla==2.11.3"
"PyQt6-QScintilla==2.13.3"
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
"PyQt6-QScintilla==2.13.3"
"PyQt6-QScintilla==2.14.1"

+ ';"arm" not in platform_machine and "aarch" not in platform_machine',
"PyQtChart==5.13.1"
"PyQt6-Charts==6.3.1"
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
"PyQt6-Charts==6.3.1"
"PyQt6-Charts==6.6.0"

@@ -128,7 +128,7 @@
"mu.modes.api",
"mu.wheels",
],
python_requires=">=3.5,<3.9",
python_requires=">=3.7,<3.12",
Copy link
Contributor

@cclauss cclauss Dec 9, 2023

Choose a reason for hiding this comment

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

Suggested change
python_requires=">=3.7,<3.12",
python_requires=">=3.8,<3.13",

"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",

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.

4 participants