diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-26 17:53:49 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-26 17:53:49 +0200 |
| commit | 41b49a16d62f5c759e4f8053cefa10b3f0390b31 (patch) | |
| tree | e0a24fb8f1f96021220eb5fc894fccfac2247189 /coin_build_instructions.py | |
| parent | ff94459c809e2ccd13e6d669b053667d35b3e571 (diff) | |
| parent | 52f29458d7d6cb379d28d84021819516723d9169 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I75984f35bcdeeeb3b6004a00670f1582ab522c1b
Diffstat (limited to 'coin_build_instructions.py')
| -rw-r--r-- | coin_build_instructions.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py index bfb10410c..f3f8d2016 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -47,6 +47,8 @@ from build_scripts.utils import get_ci_qmake_path import os import datetime import calendar +import site +import sys # Values must match COIN thrift CI_HOST_OS = option_value("os") @@ -110,7 +112,7 @@ def call_setup(python_ver, phase): if phase in ["BUILD"]: rmtree(_env, True) # Pinning the virtualenv before creating one - run_instruction(["pip", "install", "--user", "virtualenv==20.0.20"], "Failed to pin virtualenv") + run_instruction(["pip", "install", "--user", "virtualenv==20.0.25"], "Failed to pin virtualenv") run_instruction(["virtualenv", "-p", _pExe, _env], "Failed to create virtualenv") # When the 'python_ver' variable is empty, we are using Python 2 # Pip is always upgraded when CI template is provisioned, upgrading it in later phase may cause perm issue |