From 46ebef56445f739a91ca67ec9d4c3edc63158eb0 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 16 Sep 2022 14:13:50 +0200 Subject: mypy: Use tox.ini to install PyQt6 conditionally The changes in requirements-mypy.txt would get overwritten on the next dependency update. Also, it looks like we don't actually need PyQt6 (or the PyQt6 stubs) available for checking PyQt 5 code if all Qt 6 imports are appropriately gated by conditionals mypy knows about. Follow-up to c1738ca55006966e7c0ad9eacbfb58625aa88c44. --- misc/requirements/requirements-mypy.txt | 2 -- tox.ini | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/misc/requirements/requirements-mypy.txt b/misc/requirements/requirements-mypy.txt index a515e91cc..d40954835 100644 --- a/misc/requirements/requirements-mypy.txt +++ b/misc/requirements/requirements-mypy.txt @@ -12,8 +12,6 @@ mypy-extensions==0.4.3 pluggy==1.0.0 Pygments==2.13.0 PyQt5-stubs==5.15.6.0 -PyQt6==6.3.1 -PyQt6-WebEngine==6.3.1 tomli==2.0.1 types-PyYAML==6.0.11 typing_extensions==4.3.0 diff --git a/tox.ini b/tox.ini index 0a970064f..0efa7e10a 100644 --- a/tox.ini +++ b/tox.ini @@ -191,6 +191,7 @@ deps = -r{toxinidir}/misc/requirements/requirements-dev.txt -r{toxinidir}/misc/requirements/requirements-tests.txt -r{toxinidir}/misc/requirements/requirements-mypy.txt + pyqt6: -r{toxinidir}/misc/requirements/requirements-pyqt-6.txt commands = {envpython} -m mypy {env:CONSTANTS_ARGS} qutebrowser {posargs} -- cgit v1.2.3-54-g00ecf