diff options
author | Simo Fält <simo.falt@qt.io> | 2020-04-29 15:19:59 +0300 |
---|---|---|
committer | Simo Fält <simo.falt@qt.io> | 2020-04-29 18:15:18 +0300 |
commit | 4ce0bb903c21ff40140295d9ee87b3951c0fd108 (patch) | |
tree | 61ca7622182850f75996623797527f6621404a64 /coin_build_instructions.py | |
parent | 811a8a0631c6aacb20b68696eb769109af16b519 (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_build_instructions.py')
-rw-r--r-- | coin_build_instructions.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py index 325b02dec..6453cfad5 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -112,8 +112,10 @@ def call_setup(python_ver, phase): run_instruction(["virtualenv", "-p", _pExe, _env], "Failed to create virtualenv") # When the 'python_ver' variable is empty, we are using Python 2 # setuptools from v45+ removed the support for Python 2, so we pin an old release - install_pip_dependencies(env_pip, ["pip", - "numpy" if python_ver else "numpy==1.16.6", + # Pip is always upgraded when CI template is provisioned, upgrading it in later phase may cause perm issue + upgrade_pip = True if CI_HOST_OS == "Linux" else False + install_pip_dependencies(env_pip, ["pip"], upgrade_pip) + install_pip_dependencies(env_pip, ["numpy" if python_ver else "numpy==1.16.6", "setuptools" if python_ver else "setuptools==44.0.0", "sphinx", "six", "wheel"]) |