diff options
| author | Florian Bruhin <me@the-compiler.org> | 2020-04-27 16:28:36 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2020-04-27 16:29:25 +0200 |
| commit | 6cb0cfc857a7e9f4a4336b03c0752b2f0226c2c9 (patch) | |
| tree | 953da8b44862955d97f7046bd694b2563b0a9d44 | |
| parent | 8fed0ed6ed5fb54f7e9f933715f5cdd8855efe80 (diff) | |
| download | qutebrowser-6cb0cfc857a7e9f4a4336b03c0752b2f0226c2c9.tar.gz qutebrowser-6cb0cfc857a7e9f4a4336b03c0752b2f0226c2c9.zip | |
build_release: Separate 32/64-bit pyinstaller envs on Windows
For some reason, pip fails now when trying to "update" the existing source
clone...
(cherry picked from commit 14fd4860e4b706cb6af9769e35bdf36f1a9fbce4)
| -rwxr-xr-x | scripts/dev/build_release.py | 2 | ||||
| -rw-r--r-- | tox.ini | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/scripts/dev/build_release.py b/scripts/dev/build_release.py index 68befff65..b6f49a5a6 100755 --- a/scripts/dev/build_release.py +++ b/scripts/dev/build_release.py @@ -275,7 +275,7 @@ def build_windows(): utils.print_title("Running pyinstaller 32bit") _maybe_remove(out_32) - call_tox('pyinstaller', '-r', python=python_x86) + call_tox('pyinstaller32', '-r', python=python_x86) shutil.move(out_pyinstaller, out_32) utils.print_title("Running pyinstaller 64bit") @@ -187,6 +187,17 @@ deps = commands = {envbindir}/pyinstaller --noconfirm misc/qutebrowser.spec +[testenv:pyinstaller32] +# A copy of the pyinstaller environment above, to be used for 32-bit on Windows +# to make sure the both installations are separated. +# This doesn't actually do anything 32-bit specific, that part happens by +# setting the PYTHON environment variable accordingly. +basepython = {[testenv:pyinstaller]basepython} +pip_version = {[testenv:pyinstaller]pip_version} +passenv = {[testenv:pyinstaller]passenv} +deps = {[testenv:pyinstaller]deps} +commands = {[testenv:pyinstaller]commands} + [testenv:eslint] # This is duplicated in travis_run.sh for Travis CI because we can't get tox in # the JavaScript environment easily. |