summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2020-11-25 12:36:23 +0100
committerFlorian Bruhin <me@the-compiler.org>2020-11-25 14:23:48 +0100
commitab2b01d2c097eb6bc2340d332f8e86e6e8e80372 (patch)
treeb923c315e7d5ef5fbef731b2e930a80b0640a8e0
parenta4746c112187b2c87835e7473266dbb2bce3febe (diff)
downloadqutebrowser-ab2b01d2c097eb6bc2340d332f8e86e6e8e80372.tar.gz
qutebrowser-ab2b01d2c097eb6bc2340d332f8e86e6e8e80372.zip
scripts: Fix lint
-rw-r--r--.pylintrc2
-rw-r--r--scripts/mkvenv.py14
-rw-r--r--tests/end2end/test_mkvenv.py2
3 files changed, 10 insertions, 8 deletions
diff --git a/.pylintrc b/.pylintrc
index 2d7cbc430..eb77aa2d5 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -74,7 +74,7 @@ valid-metaclass-classmethod-first-arg=cls
[TYPECHECK]
ignored-modules=PyQt5,PyQt5.QtWebKit
-ignored-classes=DummyBox
+ignored-classes=DummyBox,__cause__
[IMPORTS]
known-third-party=sip
diff --git a/scripts/mkvenv.py b/scripts/mkvenv.py
index 40539bf00..391d75f00 100644
--- a/scripts/mkvenv.py
+++ b/scripts/mkvenv.py
@@ -24,13 +24,13 @@
import argparse
import pathlib
import sys
-import os
import re
+import os
import os.path
import shutil
import venv
import subprocess
-from typing import List, Optional, Tuple, Dict, cast
+from typing import List, Optional, Tuple, Dict
sys.path.insert(0, os.path.join(os.path.dirname(__file__), os.pardir))
from scripts import utils, link_pyqt
@@ -48,7 +48,7 @@ class Error(Exception):
self.code = code
-def parse_args(argv=None) -> argparse.Namespace:
+def parse_args(argv: List[str] = None) -> argparse.Namespace:
"""Parse commandline arguments."""
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('--keep',
@@ -325,7 +325,7 @@ def run_qt_smoke_test(venv_dir: pathlib.Path) -> None:
'print(f"QT_VERSION_STR: {QT_VERSION_STR}")',
'print(f"PYQT_VERSION_STR: {PYQT_VERSION_STR}")',
'QApplication([])',
- 'print("QApplication created successfully!")',
+ 'print("Qt seems to work properly!")',
'print()',
]
try:
@@ -336,7 +336,8 @@ def run_qt_smoke_test(venv_dir: pathlib.Path) -> None:
capture_error=True
)
except Error as e:
- proc_e = cast(subprocess.CalledProcessError, e.__cause__)
+ proc_e = e.__cause__
+ assert isinstance(proc_e, subprocess.CalledProcessError), proc_e
print(proc_e.stderr)
raise Error(
f"Smoke test failed with status {proc_e.returncode}. "
@@ -389,7 +390,8 @@ def run(args) -> None:
args.pyqt_type not in ['binary', 'source']):
raise Error('The --pyqt-version option is only available when installing PyQt '
'from binary or source')
- elif args.pyqt_wheels_dir != 'wheels' and args.pyqt_type != 'wheels':
+
+ if args.pyqt_wheels_dir != 'wheels' and args.pyqt_type != 'wheels':
raise Error('The --pyqt-wheels-dir option is only available when installing '
'PyQt from wheels')
diff --git a/tests/end2end/test_mkvenv.py b/tests/end2end/test_mkvenv.py
index 0e42583eb..430be0279 100644
--- a/tests/end2end/test_mkvenv.py
+++ b/tests/end2end/test_mkvenv.py
@@ -23,6 +23,6 @@ from scripts import mkvenv
def test_smoke(tmp_path):
- """Simple smoke test of mkvenv.py"""
+ """Simple smoke test of mkvenv.py."""
args = mkvenv.parse_args(['--venv-dir', str(tmp_path / 'venv'), '--skip-docs'])
mkvenv.run(args)