From 19204f441ebc65dc910c1ee3df86f36dea5b14d3 Mon Sep 17 00:00:00 2001 From: toofar Date: Tue, 26 Dec 2023 14:07:24 +1300 Subject: Update qute-pylint requirements regex for new setuptools. In `pylint_checkers/setup.py` we define the package name as `qute_pylint`. When setuptools was creating the egg (or wheel?) it was sanitizing the package name replacing all problematic chars, including underscore, with a hyphen (-). So the output of `pip freeze`, among other things, have the name with a hyphen: `qute-pylint`. This was fixed in setuptools so underscores are no longer sanitized: https://github.com/pypa/setuptools/issues/2522 Change the regex to include both just in case someone is running it with the old setuptools or something. Also because I'm not able to reproduce the hyphen version of the name locally, not sure why. Maybe it depends on your python or importlib version too? --- misc/requirements/requirements-pylint.txt | 2 +- misc/requirements/requirements-pylint.txt-raw | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/requirements/requirements-pylint.txt b/misc/requirements/requirements-pylint.txt index 8d3c128bf..b3a5198b4 100644 --- a/misc/requirements/requirements-pylint.txt +++ b/misc/requirements/requirements-pylint.txt @@ -16,7 +16,7 @@ pycparser==2.21 PyJWT==2.8.0 pylint==3.0.3 python-dateutil==2.8.2 -qute_pylint @ file:///home/runner/work/qutebrowser/qutebrowser/scripts/dev/pylint_checkers +./scripts/dev/pylint_checkers requests==2.31.0 six==1.16.0 tomli==2.0.1 diff --git a/misc/requirements/requirements-pylint.txt-raw b/misc/requirements/requirements-pylint.txt-raw index 0873be8d5..99a2cf02f 100644 --- a/misc/requirements/requirements-pylint.txt-raw +++ b/misc/requirements/requirements-pylint.txt-raw @@ -6,7 +6,7 @@ github3.py pefile # fix qute-pylint location -#@ replace: qute-pylint.* ./scripts/dev/pylint_checkers +#@ replace: qute[_-]pylint.* ./scripts/dev/pylint_checkers #@ markers: typed-ast python_version<"3.8" # Already included via test requirements -- cgit v1.2.3-54-g00ecf