summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2023-01-19 09:58:06 +0100
committerFlorian Bruhin <me@the-compiler.org>2023-01-19 09:58:06 +0100
commit391623d5ec983ecfc4512c7305c4b7a293ac3872 (patch)
tree19ab006bd126667140caa03b35839fff353a6d44
parentab258e7aabcbb685bbb7c4a7fae87fea2c44ef93 (diff)
downloadqutebrowser-391623d5ec983ecfc4512c7305c4b7a293ac3872.tar.gz
qutebrowser-391623d5ec983ecfc4512c7305c4b7a293ac3872.zip
tox: Don't use environment names ending in digits
This fails now with 'failed with env name pyinstaller-32 conflicting with base python C:\hostedtoolcache\windows\Python\3.10.9\x86\python.exe' See https://github.com/tox-dev/tox/pull/2824
-rwxr-xr-xscripts/dev/build_release.py9
-rw-r--r--tox.ini2
2 files changed, 8 insertions, 3 deletions
diff --git a/scripts/dev/build_release.py b/scripts/dev/build_release.py
index 20eb19e18..39c730472 100755
--- a/scripts/dev/build_release.py
+++ b/scripts/dev/build_release.py
@@ -322,7 +322,7 @@ def build_mac(
gh_token=gh_token)
utils.print_title("Building .app via pyinstaller")
- call_tox('pyinstaller-64', '-r', debug=debug)
+ call_tox('pyinstaller-64bit', '-r', debug=debug)
utils.print_title("Patching .app")
patch_mac_app()
utils.print_title("Re-signing .app")
@@ -404,7 +404,12 @@ def _build_windows_single(
_maybe_remove(out_path)
python = _get_windows_python_path(x64=x64)
- call_tox(f'pyinstaller-{"64" if x64 else "32"}', '-r', python=python, debug=debug)
+ call_tox(
+ f'pyinstaller-{"64bit" if x64 else "32bit"}',
+ '-r',
+ python=python,
+ debug=debug,
+ )
out_pyinstaller = dist_path / "qutebrowser"
shutil.move(out_pyinstaller, out_path)
diff --git a/tox.ini b/tox.ini
index 560274d7f..2f7b67383 100644
--- a/tox.ini
+++ b/tox.ini
@@ -167,7 +167,7 @@ commands =
{envpython} scripts/dev/check_doc_changes.py {posargs}
{envpython} scripts/asciidoc2html.py {posargs}
-[testenv:pyinstaller-{64,32}]
+[testenv:pyinstaller-{64bit,32bit}]
basepython = {env:PYTHON:python3}
passenv =
APPDATA