aboutsummaryrefslogtreecommitdiffstats
path: root/coin_test_instructions.py
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@qt.io>2020-04-29 15:19:59 +0300
committerSimo Fält <simo.falt@qt.io>2020-04-29 18:15:18 +0300
commit4ce0bb903c21ff40140295d9ee87b3951c0fd108 (patch)
tree61ca7622182850f75996623797527f6621404a64 /coin_test_instructions.py
parent811a8a0631c6aacb20b68696eb769109af16b519 (diff)
Do not upgrade pip in during build/test
The pip should be quite up to date already after provisioning CI templates. Upgrading it later may cause permission issues. Change-Id: Ia2b80d902eb74dbc24fe6fb00f3245657545e9dd Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'coin_test_instructions.py')
-rw-r--r--coin_test_instructions.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/coin_test_instructions.py b/coin_test_instructions.py
index 65c564df5..cb29acab4 100644
--- a/coin_test_instructions.py
+++ b/coin_test_instructions.py
@@ -65,7 +65,9 @@ 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==3.6", "wheel"])
+ upgrade_pip = True if CI_HOST_OS == "Linux" else False
+ install_pip_dependencies(env_pip, ["pip"], upgrade_pip)
+ install_pip_dependencies(env_pip, ["numpy", "PyOpenGL", "setuptools", "six", "pyinstaller==3.6", "wheel"])
cmd = [env_python, "testrunner.py", "test",
"--blacklist", "build_history/blacklist.txt",
"--buildno=" + buildnro]