diff options
| author | toofar <toofar@spalge.com> | 2022-09-11 15:12:32 +1200 |
|---|---|---|
| committer | toofar <toofar@spalge.com> | 2022-09-11 17:31:52 +1200 |
| commit | 4b3ec40eb0435950d1278f3477d74027e4b287ce (patch) | |
| tree | f193e0c419bbd6c4a20df0ee88bf2600bd735778 | |
| parent | 377bdf736f96605b998ca6f2ea2b062e190653b0 (diff) | |
| download | qutebrowser-4b3ec40eb0435950d1278f3477d74027e4b287ce.tar.gz qutebrowser-4b3ec40eb0435950d1278f3477d74027e4b287ce.zip | |
mypy: re-enable CI jobs for pyqt5
We'll be going forward with type checking on PyQt5 for now while
figuring out what to do with PyQt6 type checking.
See https://github.com/qutebrowser/qutebrowser/discussions/7372#discussioncomment-3502200
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| -rw-r--r-- | tox.ini | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9fd0fb449..d38b995c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,8 +22,8 @@ jobs: - testenv: pylint - testenv: flake8 # FIXME:qt6 (lint) - # - testenv: mypy-pyqt5 # - testenv: mypy-pyqt6 + - testenv: mypy-pyqt5 - testenv: docs - testenv: vulture - testenv: misc @@ -180,12 +180,12 @@ deps = whitelist_externals = bash commands = bash scripts/dev/run_shellcheck.sh {posargs} -[testenv:mypy-{qt5,qt6}] +[testenv:mypy-{pyqt5,pyqt6}] basepython = {env:PYTHON:python3} passenv = TERM MYPY_FORCE_TERMINAL_WIDTH setenv = - qt6: CONSTANTS_ARGS=--always-true=USE_PYQT6 --always-false=USE_PYQT5 --always-false=USE_PYSIDE2 --always-false=USE_PYSIDE6 --always-false=IS_QT5 --always-true=IS_QT6 - qt5: CONSTANTS_ARGS=--always-false=USE_PYQT6 --always-true=USE_PYQT5 --always-false=USE_PYSIDE2 --always-false=USE_PYSIDE6 --always-true=IS_QT5 --always-false=IS_QT6 + pyqt6: CONSTANTS_ARGS=--always-true=USE_PYQT6 --always-false=USE_PYQT5 --always-false=USE_PYSIDE2 --always-false=USE_PYSIDE6 --always-false=IS_QT5 --always-true=IS_QT6 + pyqt5: CONSTANTS_ARGS=--always-false=USE_PYQT6 --always-true=USE_PYQT5 --always-false=USE_PYSIDE2 --always-false=USE_PYSIDE6 --always-true=IS_QT5 --always-false=IS_QT6 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/misc/requirements/requirements-dev.txt @@ -207,13 +207,13 @@ whitelist_externals = actionlint commands = actionlint -[testenv:mypy-{qt5,qt6}-diff] +[testenv:mypy-{pyqt5,pyqt6}-diff] basepython = {env:PYTHON:python3} -passenv = {[testenv:mypy-qt6]passenv} -deps = {[testenv:mypy-qt6]deps} +passenv = {[testenv:mypy-pyqt6]passenv} +deps = {[testenv:mypy-pyqt6]deps} setenv = - qt6: CONSTANTS_ARGS=--always-true=USE_PYQT6 --always-false=USE_PYQT5 --always-false=USE_PYSIDE2 --always-false=USE_PYSIDE6 --always-false=IS_QT5 --always-true=IS_QT6 - qt5: CONSTANTS_ARGS=--always-false=USE_PYQT6 --always-true=USE_PYQT5 --always-false=USE_PYSIDE2 --always-false=USE_PYSIDE6 --always-true=IS_QT5 --always-false=IS_QT6 + pyqt6: CONSTANTS_ARGS=--always-true=USE_PYQT6 --always-false=USE_PYQT5 --always-false=USE_PYSIDE2 --always-false=USE_PYSIDE6 --always-false=IS_QT5 --always-true=IS_QT6 + pyqt5: CONSTANTS_ARGS=--always-false=USE_PYQT6 --always-true=USE_PYQT5 --always-false=USE_PYSIDE2 --always-false=USE_PYSIDE6 --always-true=IS_QT5 --always-false=IS_QT6 commands = {envpython} -m mypy --cobertura-xml-report {envtmpdir} {env:CONSTANTS_ARGS} qutebrowser tests {posargs} {envdir}/bin/diff-cover --fail-under=100 --compare-branch={env:DIFF_BRANCH:origin/{env:GITHUB_BASE_REF:master}} {envtmpdir}/cobertura.xml |