diff options
| author | Florian Bruhin <me@the-compiler.org> | 2021-01-26 20:02:27 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2021-01-26 20:43:52 +0100 |
| commit | 922dca039b8d88bbca6ad45c53b6aceac858784e (patch) | |
| tree | b758bafa96a3c48c66ae91f47682a1933e387991 | |
| parent | ab01b3970f9a60d9788094872d573a447a74503e (diff) | |
| download | qutebrowser-922dca039b8d88bbca6ad45c53b6aceac858784e.tar.gz qutebrowser-922dca039b8d88bbca6ad45c53b6aceac858784e.zip | |
scripts/ci: upgrade packaging stack
Make sure we have the newest versions of pip/setuptools/wheel as well in
requirements-tox.txt.
See #6068, needed to support the "cp310" tag when building wheels for
hunter/PyQt5-sip.
| -rw-r--r-- | misc/requirements/requirements-tox.txt | 3 | ||||
| -rw-r--r-- | misc/requirements/requirements-tox.txt-raw | 1 | ||||
| -rw-r--r-- | scripts/dev/recompile_requirements.py | 6 |
3 files changed, 9 insertions, 1 deletions
diff --git a/misc/requirements/requirements-tox.txt b/misc/requirements/requirements-tox.txt index 88f034c78..08288f060 100644 --- a/misc/requirements/requirements-tox.txt +++ b/misc/requirements/requirements-tox.txt @@ -4,10 +4,13 @@ appdirs==1.4.4 distlib==0.3.1 filelock==3.0.12 packaging==20.8 +pip==21.0 pluggy==0.13.1 py==1.10.0 pyparsing==2.4.7 +setuptools==52.0.0 six==1.15.0 toml==0.10.2 tox==3.21.2 virtualenv==20.4.0 +wheel==0.36.2 diff --git a/misc/requirements/requirements-tox.txt-raw b/misc/requirements/requirements-tox.txt-raw index 053148f84..27d58e1f4 100644 --- a/misc/requirements/requirements-tox.txt-raw +++ b/misc/requirements/requirements-tox.txt-raw @@ -1 +1,2 @@ tox +wheel diff --git a/scripts/dev/recompile_requirements.py b/scripts/dev/recompile_requirements.py index d227ac28e..239a0fa75 100644 --- a/scripts/dev/recompile_requirements.py +++ b/scripts/dev/recompile_requirements.py @@ -176,6 +176,9 @@ CHANGELOG_URLS = { 'adblock': 'https://github.com/ArniDagur/python-adblock/blob/master/CHANGELOG.md', 'importlib-resources': 'https://importlib-resources.readthedocs.io/en/latest/history.html', 'dataclasses': 'https://github.com/ericvsmith/dataclasses#release-history', + 'pip': 'https://pip.pypa.io/en/stable/news/', + 'wheel': 'https://wheel.readthedocs.io/en/stable/news.html', + 'setuptools': 'https://setuptools.readthedocs.io/en/latest/history.html', } @@ -466,7 +469,8 @@ def build_requirements(name): requirements=filename, pre=comments['pre']) with utils.gha_group('Freezing requirements'): - proc = run_pip(tmpdir, 'freeze', stdout=subprocess.PIPE) + args = ['--all'] if name == 'tox' else [] + proc = run_pip(tmpdir, 'freeze', *args, stdout=subprocess.PIPE) reqs = proc.stdout.decode('utf-8') if utils.ON_CI: print(reqs.strip()) |