From 47bf26199473ac7f6f0175920e2aad20fc649295 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 14 Apr 2017 20:49:10 +0200 Subject: [PATCH] build_release: Different PyInstaller workaround --- scripts/dev/build_release.py | 10 ---------- tox.ini | 2 ++ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/scripts/dev/build_release.py b/scripts/dev/build_release.py index d9cc0679d..2888ed596 100755 --- a/scripts/dev/build_release.py +++ b/scripts/dev/build_release.py @@ -163,14 +163,6 @@ def patch_windows(out_dir): shutil.copy(os.path.join(dll_dir, dll), out_dir) -def remove_tox_pyinstaller_src(): - """Remove leftover pieces of .tox. - - WORKAROUND for https://github.com/tox-dev/tox/issues/503 - """ - shutil.rmtree(os.path.join('.tox', 'pyinstaller', 'src', 'pyinstaller')) - - def build_windows(): """Build windows executables/setups.""" utils.print_title("Updating 3rdparty content") @@ -190,13 +182,11 @@ def build_windows(): artifacts = [] utils.print_title("Running pyinstaller 32bit") - remove_tox_pyinstaller_src() call_tox('pyinstaller', '-r', python=python_x86) shutil.move(out_pyinstaller, out_32) patch_windows(out_32) utils.print_title("Running pyinstaller 64bit") - remove_tox_pyinstaller_src() call_tox('pyinstaller', '-r', python=python_x64) shutil.move(out_pyinstaller, out_64) patch_windows(out_64) diff --git a/tox.ini b/tox.ini index 80da40375..fb292e853 100644 --- a/tox.ini +++ b/tox.ini @@ -264,6 +264,8 @@ commands = {envpython} scripts/dev/freeze.py {posargs} [testenv:pyinstaller] +# WORKAROUND for https://github.com/tox-dev/tox/issues/503 +install_command = pip install --exists-action w {opts} {packages} basepython = {env:PYTHON:python3} deps = -r{toxinidir}/requirements.txt