diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea9e23e5a..77ec85f4e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -198,21 +198,25 @@ jobs: - testenv: py314-pyqt69 os: ubuntu-24.04 python: "3.14" + ### PyQt 6.10 (Python 3.14) + - testenv: py314-pyqt610 + os: ubuntu-24.04 + python: "3.14" ### macOS Ventura - - testenv: py314-pyqt69 + - testenv: py314-pyqt610 os: macos-13 python: "3.14" args: "tests/unit" # Only run unit tests on macOS ### macOS Sonoma (M1 runner) - - testenv: py314-pyqt69 + - testenv: py314-pyqt610 os: macos-14 python: "3.14" args: "tests/unit" # Only run unit tests on macOS ### Windows - - testenv: py314-pyqt69 + - testenv: py314-pyqt610 os: windows-2022 python: "3.14" - - testenv: py314-pyqt69 + - testenv: py314-pyqt610 os: windows-2025 python: "3.14" runs-on: "${{ matrix.os }}" diff --git a/misc/requirements/requirements-pyqt-6.txt b/misc/requirements/requirements-pyqt-6.txt index cdd38c426..cf32f5046 100644 --- a/misc/requirements/requirements-pyqt-6.txt +++ b/misc/requirements/requirements-pyqt-6.txt @@ -1,7 +1,8 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -PyQt6==6.9.1 -PyQt6-Qt6==6.9.2 -PyQt6-WebEngine==6.9.0 -PyQt6-WebEngine-Qt6==6.9.2 +PyQt6==6.10.0 +PyQt6-Qt6==6.10.0 +PyQt6-WebEngine==6.10.0 +PyQt6-WebEngine-Qt6==6.10.0 PyQt6_sip==13.10.2 +--extra-index-url https://www.riverbankcomputing.com/pypi/simple/ diff --git a/misc/requirements/requirements-pyqt-6.txt-raw b/misc/requirements/requirements-pyqt-6.txt-raw index 68a5db685..6b48354d2 100644 --- a/misc/requirements/requirements-pyqt-6.txt-raw +++ b/misc/requirements/requirements-pyqt-6.txt-raw @@ -2,3 +2,7 @@ PyQt6 PyQt6-Qt6 PyQt6-WebEngine PyQt6-WebEngine-Qt6 + +# WORKAROUND for https://www.riverbankcomputing.com/pipermail/pyqt/2025-October/046347.html +#@ add: --extra-index-url https://www.riverbankcomputing.com/pypi/simple/ +--extra-index-url https://www.riverbankcomputing.com/pypi/simple/ diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt index cdd38c426..cf32f5046 100644 --- a/misc/requirements/requirements-pyqt.txt +++ b/misc/requirements/requirements-pyqt.txt @@ -1,7 +1,8 @@ # This file is automatically generated by scripts/dev/recompile_requirements.py -PyQt6==6.9.1 -PyQt6-Qt6==6.9.2 -PyQt6-WebEngine==6.9.0 -PyQt6-WebEngine-Qt6==6.9.2 +PyQt6==6.10.0 +PyQt6-Qt6==6.10.0 +PyQt6-WebEngine==6.10.0 +PyQt6-WebEngine-Qt6==6.10.0 PyQt6_sip==13.10.2 +--extra-index-url https://www.riverbankcomputing.com/pypi/simple/ diff --git a/misc/requirements/requirements-pyqt.txt-raw b/misc/requirements/requirements-pyqt.txt-raw index 68a5db685..6b48354d2 100644 --- a/misc/requirements/requirements-pyqt.txt-raw +++ b/misc/requirements/requirements-pyqt.txt-raw @@ -2,3 +2,7 @@ PyQt6 PyQt6-Qt6 PyQt6-WebEngine PyQt6-WebEngine-Qt6 + +# WORKAROUND for https://www.riverbankcomputing.com/pipermail/pyqt/2025-October/046347.html +#@ add: --extra-index-url https://www.riverbankcomputing.com/pypi/simple/ +--extra-index-url https://www.riverbankcomputing.com/pypi/simple/ diff --git a/tox.ini b/tox.ini index a1b505958..af558bb6d 100644 --- a/tox.ini +++ b/tox.ini @@ -57,8 +57,9 @@ deps = pyqt67: -r{toxinidir}/misc/requirements/requirements-pyqt-6.7.txt pyqt68: -r{toxinidir}/misc/requirements/requirements-pyqt-6.8.txt pyqt69: -r{toxinidir}/misc/requirements/requirements-pyqt-6.9.txt + pyqt610: -r{toxinidir}/misc/requirements/requirements-pyqt-6.10.txt commands = - !pyqt-!pyqt515-!pyqt5152-!pyqt62-!pyqt63-!pyqt64-!pyqt65-!pyqt66-!pyqt67-!pyqt68-!pyqt69: {envpython} scripts/link_pyqt.py --tox {envdir} + !pyqt-!pyqt515-!pyqt5152-!pyqt62-!pyqt63-!pyqt64-!pyqt65-!pyqt66-!pyqt67-!pyqt68-!pyqt69-!pyqt610: {envpython} scripts/link_pyqt.py --tox {envdir} {envpython} -bb -m pytest {posargs:tests} cov: {envpython} scripts/dev/check_coverage.py {posargs}