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 14fd4860e4)
This commit is contained in:
Florian Bruhin 2020-04-27 16:28:36 +02:00
parent 8fed0ed6ed
commit 6cb0cfc857
2 changed files with 12 additions and 1 deletions

View File

@ -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")

11
tox.ini
View File

@ -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.