From 33f3b25d7439c2a25d1c3934fb6b810de9a3c1ac Mon Sep 17 00:00:00 2001 From: Jimmy Date: Sat, 28 May 2022 15:05:41 +1200 Subject: run pylint with both PyQt 5 and 6 We have differences in names between 5 and 6. Mostly we use the wrapper machinery with conditional in a few special places which need to know the details. So we could probably get away with just having Qt6 installed (since we are preferring Qt6 locations for things already). But webkit isn't in Qt6 so we need Qt5 if we are keeping that anyway. --- .pylintrc | 2 +- tox.ini | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pylintrc b/.pylintrc index 3b2461399..60006b92c 100644 --- a/.pylintrc +++ b/.pylintrc @@ -2,7 +2,7 @@ [MASTER] ignore=resources.py -extension-pkg-whitelist=PyQt5,sip +extension-pkg-whitelist=PyQt6,PyQt5,sip load-plugins=qute_pylint.config, qute_pylint.modeline, pylint.extensions.docstyle, diff --git a/tox.ini b/tox.ini index 2655e16f4..75ce58b4f 100644 --- a/tox.ini +++ b/tox.ini @@ -90,6 +90,7 @@ deps = -r{toxinidir}/misc/requirements/requirements-tests.txt -r{toxinidir}/misc/requirements/requirements-pylint.txt -r{toxinidir}/misc/requirements/requirements-pyqt.txt + -r{toxinidir}/misc/requirements/requirements-pyqt-6.txt commands = {envpython} -m pylint scripts qutebrowser --output-format=colorized --reports=no {posargs} {envpython} scripts/dev/run_pylint_on_tests.py {toxinidir} --output-format=colorized --reports=no {posargs} -- cgit v1.2.3-54-g00ecf