Merge branch 'feat/pyqt67_enablement'
This commit is contained in:
Florian Bruhin
commit
a2983553bb
|
|
@ -14,7 +14,7 @@ jobs:
|
|||
linters:
|
||||
if: "!contains(github.event.head_commit.message, '[ci skip]')"
|
||||
timeout-minutes: 10
|
||||
runs-on: ubuntu-20.04
|
||||
runs-on: ubuntu-22.04
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
|
|
@ -86,7 +86,7 @@ jobs:
|
|||
tests-docker:
|
||||
if: "!contains(github.event.head_commit.message, '[ci skip]')"
|
||||
timeout-minutes: 45
|
||||
runs-on: ubuntu-20.04
|
||||
runs-on: ubuntu-22.04
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
|
|
@ -129,7 +129,7 @@ jobs:
|
|||
matrix:
|
||||
include:
|
||||
### PyQt 5.15.2 (Python 3.8)
|
||||
- testenv: py37-pyqt5152
|
||||
- testenv: py38-pyqt5152
|
||||
os: ubuntu-20.04
|
||||
python: "3.8"
|
||||
### PyQt 5.15 (Python 3.10, with coverage)
|
||||
|
|
@ -142,7 +142,7 @@ jobs:
|
|||
os: ubuntu-20.04
|
||||
python: "3.11"
|
||||
### PyQt 6.2 (Python 3.8)
|
||||
- testenv: py37-pyqt62
|
||||
- testenv: py38-pyqt62
|
||||
os: ubuntu-20.04
|
||||
python: "3.8"
|
||||
### PyQt 6.3 (Python 3.8)
|
||||
|
|
@ -165,18 +165,26 @@ jobs:
|
|||
- testenv: py312-pyqt66
|
||||
os: ubuntu-22.04
|
||||
python: "3.12"
|
||||
### PyQt 6.7 (Python 3.11)
|
||||
- testenv: py311-pyqt67
|
||||
os: ubuntu-22.04
|
||||
python: "3.11"
|
||||
### PyQt 6.7 (Python 3.12)
|
||||
- testenv: py312-pyqt67
|
||||
os: ubuntu-22.04
|
||||
python: "3.12"
|
||||
### macOS Big Sur
|
||||
- testenv: py312-pyqt66
|
||||
- testenv: py312-pyqt67
|
||||
os: macos-11
|
||||
python: "3.12"
|
||||
args: "tests/unit" # Only run unit tests on macOS
|
||||
### macOS Monterey
|
||||
- testenv: py312-pyqt66
|
||||
- testenv: py312-pyqt67
|
||||
os: macos-12
|
||||
python: "3.12"
|
||||
args: "tests/unit" # Only run unit tests on macOS
|
||||
### Windows
|
||||
- testenv: py312-pyqt66
|
||||
- testenv: py312-pyqt67
|
||||
os: windows-2019
|
||||
python: "3.12"
|
||||
runs-on: "${{ matrix.os }}"
|
||||
|
|
@ -226,7 +234,7 @@ jobs:
|
|||
permissions:
|
||||
security-events: write
|
||||
timeout-minutes: 15
|
||||
runs-on: ubuntu-20.04
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
|
|
@ -243,7 +251,7 @@ jobs:
|
|||
irc:
|
||||
timeout-minutes: 2
|
||||
continue-on-error: true
|
||||
runs-on: ubuntu-20.04
|
||||
runs-on: ubuntu-22.04
|
||||
needs: [linters, tests, tests-docker, codeql]
|
||||
if: "always() && github.repository_owner == 'qutebrowser'"
|
||||
steps:
|
||||
|
|
|
|||
|
|
@ -6,4 +6,4 @@ importlib_metadata==7.1.0
|
|||
packaging==24.0
|
||||
pyproject_hooks==1.1.0
|
||||
tomli==2.0.1
|
||||
zipp==3.18.1
|
||||
zipp==3.18.2
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ bump2version==1.0.1
|
|||
certifi==2024.2.2
|
||||
cffi==1.16.0
|
||||
charset-normalizer==3.3.2
|
||||
cryptography==42.0.6
|
||||
cryptography==42.0.7
|
||||
docutils==0.20.1
|
||||
github3.py==4.0.1
|
||||
hunter==3.7.0
|
||||
|
|
@ -17,7 +17,7 @@ jaraco.classes==3.4.0
|
|||
jaraco.context==5.3.0
|
||||
jaraco.functools==4.0.1
|
||||
jeepney==0.8.0
|
||||
keyring==25.2.0
|
||||
keyring==25.2.1
|
||||
manhole==1.8.0
|
||||
markdown-it-py==3.0.0
|
||||
mdurl==0.1.2
|
||||
|
|
@ -41,8 +41,8 @@ SecretStorage==3.3.3
|
|||
sip==6.8.3
|
||||
six==1.16.0
|
||||
tomli==2.0.1
|
||||
twine==5.0.0
|
||||
twine==5.1.0
|
||||
typing_extensions==4.11.0
|
||||
uritemplate==4.1.1
|
||||
# urllib3==2.2.1
|
||||
zipp==3.18.1
|
||||
zipp==3.18.2
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ flake8-string-format==0.3.0
|
|||
flake8-tidy-imports==4.10.0
|
||||
flake8-tuple==0.4.1
|
||||
mccabe==0.7.0
|
||||
pep8-naming==0.13.3
|
||||
pep8-naming==0.14.1
|
||||
pycodestyle==2.11.1
|
||||
pydocstyle==6.3.0
|
||||
pyflakes==3.2.0
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ chardet==5.2.0
|
|||
diff_cover==9.0.0
|
||||
importlib_resources==6.4.0
|
||||
Jinja2==3.1.4
|
||||
lxml==5.2.1
|
||||
lxml==5.2.2
|
||||
MarkupSafe==2.1.5
|
||||
mypy==1.10.0
|
||||
mypy-extensions==1.0.0
|
||||
|
|
@ -16,6 +16,6 @@ types-colorama==0.4.15.20240311
|
|||
types-docutils==0.21.0.20240423
|
||||
types-Pygments==2.18.0.20240506
|
||||
types-PyYAML==6.0.12.20240311
|
||||
types-setuptools==69.5.0.20240423
|
||||
types-setuptools==69.5.0.20240519
|
||||
typing_extensions==4.11.0
|
||||
zipp==3.18.1
|
||||
zipp==3.18.2
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ altgraph==0.17.4
|
|||
importlib_metadata==7.1.0
|
||||
packaging==24.0
|
||||
pyinstaller==6.6.0
|
||||
pyinstaller-hooks-contrib==2024.5
|
||||
zipp==3.18.1
|
||||
pyinstaller-hooks-contrib==2024.6
|
||||
zipp==3.18.2
|
||||
|
|
|
|||
|
|
@ -1,26 +1,26 @@
|
|||
# This file is automatically generated by scripts/dev/recompile_requirements.py
|
||||
|
||||
astroid==3.1.0
|
||||
astroid==3.2.2
|
||||
certifi==2024.2.2
|
||||
cffi==1.16.0
|
||||
charset-normalizer==3.3.2
|
||||
cryptography==42.0.6
|
||||
cryptography==42.0.7
|
||||
dill==0.3.8
|
||||
github3.py==4.0.1
|
||||
idna==3.7
|
||||
isort==5.13.2
|
||||
mccabe==0.7.0
|
||||
pefile==2023.2.7
|
||||
platformdirs==4.2.1
|
||||
platformdirs==4.2.2
|
||||
pycparser==2.22
|
||||
PyJWT==2.8.0
|
||||
pylint==3.1.0
|
||||
pylint==3.2.1
|
||||
python-dateutil==2.9.0.post0
|
||||
./scripts/dev/pylint_checkers
|
||||
requests==2.31.0
|
||||
six==1.16.0
|
||||
tomli==2.0.1
|
||||
tomlkit==0.12.4
|
||||
tomlkit==0.12.5
|
||||
typing_extensions==4.11.0
|
||||
uritemplate==4.1.1
|
||||
# urllib3==2.2.1
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
# This file is automatically generated by scripts/dev/recompile_requirements.py
|
||||
|
||||
PyQt6==6.7.0
|
||||
PyQt6-Qt6==6.7.0
|
||||
PyQt6-sip==13.6.0
|
||||
PyQt6-WebEngine==6.7.0
|
||||
PyQt6-WebEngine-Qt6==6.7.0
|
||||
--extra-index-url https://www.riverbankcomputing.com/pypi/simple/
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
PyQt6 >= 6.7, < 6.8
|
||||
PyQt6-Qt6 >= 6.7, < 6.8
|
||||
PyQt6-WebEngine >= 6.7, < 6.8
|
||||
PyQt6-WebEngine-Qt6 >= 6.7, < 6.8
|
||||
|
||||
# WORKAROUND for https://www.riverbankcomputing.com/pipermail/pyqt/2024-April/045832.html
|
||||
#@ add: --extra-index-url https://www.riverbankcomputing.com/pypi/simple/
|
||||
|
|
@ -5,3 +5,4 @@ PyQt6-Qt6==6.7.0
|
|||
PyQt6-sip==13.6.0
|
||||
PyQt6-WebEngine==6.7.0
|
||||
PyQt6-WebEngine-Qt6==6.7.0
|
||||
--extra-index-url https://www.riverbankcomputing.com/pypi/simple/
|
||||
|
|
|
|||
|
|
@ -2,3 +2,6 @@ PyQt6
|
|||
PyQt6-Qt6
|
||||
PyQt6-WebEngine
|
||||
PyQt6-WebEngine-Qt6
|
||||
|
||||
# WORKAROUND for https://www.riverbankcomputing.com/pipermail/pyqt/2024-April/045832.html
|
||||
#@ add: --extra-index-url https://www.riverbankcomputing.com/pypi/simple/
|
||||
|
|
|
|||
|
|
@ -5,3 +5,4 @@ PyQt6-Qt6==6.7.0
|
|||
PyQt6-sip==13.6.0
|
||||
PyQt6-WebEngine==6.7.0
|
||||
PyQt6-WebEngine-Qt6==6.7.0
|
||||
--extra-index-url https://www.riverbankcomputing.com/pypi/simple/
|
||||
|
|
|
|||
|
|
@ -2,3 +2,6 @@ PyQt6
|
|||
PyQt6-Qt6
|
||||
PyQt6-WebEngine
|
||||
PyQt6-WebEngine-Qt6
|
||||
|
||||
# WORKAROUND for https://www.riverbankcomputing.com/pipermail/pyqt/2024-April/045832.html
|
||||
#@ add: --extra-index-url https://www.riverbankcomputing.com/pypi/simple/
|
||||
|
|
|
|||
|
|
@ -12,6 +12,6 @@ pyproject_hooks==1.1.0
|
|||
pyroma==4.2
|
||||
requests==2.31.0
|
||||
tomli==2.0.1
|
||||
trove-classifiers==2024.4.10
|
||||
trove-classifiers==2024.5.17
|
||||
urllib3==2.2.1
|
||||
zipp==3.18.1
|
||||
zipp==3.18.2
|
||||
|
|
|
|||
|
|
@ -23,4 +23,4 @@ sphinxcontrib-jsmath==1.0.1
|
|||
sphinxcontrib-qthelp==1.0.3
|
||||
sphinxcontrib-serializinghtml==1.1.5
|
||||
urllib3==2.2.1
|
||||
zipp==3.18.1
|
||||
zipp==3.18.2
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
attrs==23.2.0
|
||||
beautifulsoup4==4.12.3
|
||||
blinker==1.8.1
|
||||
blinker==1.8.2
|
||||
certifi==2024.2.2
|
||||
charset-normalizer==3.3.2
|
||||
cheroot==10.0.1
|
||||
|
|
@ -13,14 +13,14 @@ execnet==2.1.1
|
|||
filelock==3.14.0
|
||||
Flask==3.0.3
|
||||
hunter==3.7.0
|
||||
hypothesis==6.100.4
|
||||
hypothesis==6.102.4
|
||||
idna==3.7
|
||||
importlib_metadata==7.1.0
|
||||
iniconfig==2.0.0
|
||||
itsdangerous==2.2.0
|
||||
jaraco.functools==4.0.1
|
||||
# Jinja2==3.1.4
|
||||
Mako==1.3.3
|
||||
Mako==1.3.5
|
||||
manhole==1.8.0
|
||||
# MarkupSafe==2.1.5
|
||||
more-itertools==10.2.0
|
||||
|
|
@ -30,7 +30,7 @@ parse-type==0.6.2
|
|||
pluggy==1.5.0
|
||||
py-cpuinfo==9.0.0
|
||||
Pygments==2.18.0
|
||||
pytest==8.2.0
|
||||
pytest==8.2.1
|
||||
pytest-bdd==7.1.2
|
||||
pytest-benchmark==4.0.0
|
||||
pytest-cov==5.0.0
|
||||
|
|
@ -53,4 +53,4 @@ typing_extensions==4.11.0
|
|||
urllib3==2.2.1
|
||||
vulture==2.11
|
||||
Werkzeug==3.0.3
|
||||
zipp==3.18.1
|
||||
zipp==3.18.2
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@ distlib==0.3.8
|
|||
filelock==3.14.0
|
||||
packaging==24.0
|
||||
pip==24.0
|
||||
platformdirs==4.2.1
|
||||
platformdirs==4.2.2
|
||||
pluggy==1.5.0
|
||||
pyproject-api==1.6.1
|
||||
setuptools==69.5.1
|
||||
tomli==2.0.1
|
||||
tox==4.15.0
|
||||
virtualenv==20.26.1
|
||||
virtualenv==20.26.2
|
||||
wheel==0.43.0
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ Jinja2==3.1.4
|
|||
MarkupSafe==2.1.5
|
||||
Pygments==2.18.0
|
||||
PyYAML==6.0.1
|
||||
zipp==3.18.1
|
||||
zipp==3.18.2
|
||||
# Unpinned due to recompile_requirements.py limitations
|
||||
pyobjc-core ; sys_platform=="darwin"
|
||||
pyobjc-framework-Cocoa ; sys_platform=="darwin"
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ def check_changelog_urls(_args: argparse.Namespace = None) -> bool:
|
|||
with open(outfile, 'r', encoding='utf-8') as f:
|
||||
for line in f:
|
||||
line = line.strip()
|
||||
if line.startswith('#') or not line:
|
||||
if line.startswith(('#', '--')) or not line:
|
||||
continue
|
||||
req, _version = recompile_requirements.parse_versioned_line(line)
|
||||
if req.startswith('./'):
|
||||
|
|
|
|||
3
tox.ini
3
tox.ini
|
|
@ -51,10 +51,11 @@ deps =
|
|||
pyqt64: -r{toxinidir}/misc/requirements/requirements-pyqt-6.4.txt
|
||||
pyqt65: -r{toxinidir}/misc/requirements/requirements-pyqt-6.5.txt
|
||||
pyqt66: -r{toxinidir}/misc/requirements/requirements-pyqt-6.6.txt
|
||||
pyqt67: -r{toxinidir}/misc/requirements/requirements-pyqt-6.7.txt
|
||||
commands_pre =
|
||||
py313: pip install -U --pre typing-extensions==4.12.0rc1 # FIXME remove once released
|
||||
commands =
|
||||
!pyqt-!pyqt515-!pyqt5152-!pyqt62-!pyqt63-!pyqt64-!pyqt65-!pyqt66: {envpython} scripts/link_pyqt.py --tox {envdir}
|
||||
!pyqt-!pyqt515-!pyqt5152-!pyqt62-!pyqt63-!pyqt64-!pyqt65-!pyqt66-!pyqt67: {envpython} scripts/link_pyqt.py --tox {envdir}
|
||||
{envpython} -bb -m pytest {posargs:tests}
|
||||
cov: {envpython} scripts/dev/check_coverage.py {posargs}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue