diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2019-07-18 10:18:43 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2019-07-18 10:21:51 +0200 |
| commit | 4646b8660721e5b8d06b06d714b4562e375f8c34 (patch) | |
| tree | d12f0c1af2b6cdf486ff389607844a657a1b67c1 /coin_test_instructions.py | |
| parent | 97718de50e14f69048993df4e87dda1cadcc599a (diff) | |
| parent | 295d9d7fb52505666a6dc9ac7b6fba2323814c48 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ic2c43ef80769e3063dac771518c803861510f72e
Diffstat (limited to 'coin_test_instructions.py')
| -rw-r--r-- | coin_test_instructions.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/coin_test_instructions.py b/coin_test_instructions.py index c560f2175..8ba82c26f 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -66,7 +66,8 @@ def call_testrunner(python_ver, buildnro): _pExe, _env, env_pip, env_python = get_qtci_virtualEnv(python_ver, CI_HOST_OS, CI_HOST_ARCH, CI_TARGET_ARCH) rmtree(_env, True) run_instruction(["virtualenv", "-p", _pExe, _env], "Failed to create virtualenv") - install_pip_dependencies(env_pip, ["pip", "numpy", "PyOpenGL", "setuptools", "six", "pyinstaller", "wheel"]) + # Keeping PyInstaller 3.4, because 3.5 seems to have broken our test + install_pip_dependencies(env_pip, ["pip", "numpy", "PyOpenGL", "setuptools", "six", "pyinstaller==3.4", "wheel"]) cmd = [env_python, "testrunner.py", "test", "--blacklist", "build_history/blacklist.txt", "--buildno=" + buildnro] |