diff options
| author | Simo Fält <simo.falt@qt.io> | 2020-11-03 18:07:47 +0200 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2020-11-04 11:52:38 +0200 |
| commit | 3411bfc4a08e12df7ffa0d5604a62f5ea8f4693a (patch) | |
| tree | 471599317d31217108861b675dadd1eda424b912 | |
| parent | 4123b31ad443692a718c4aefafae640e398c944d (diff) | |
Pin windows numpy package to 1.19.3
Numpy-1.19.4 doesn't work with 'Windows Update 2004'
Change-Id: I7fa388a4fa1d790eacd6da7b9fb34f37d1d455e8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
| -rw-r--r-- | coin_build_instructions.py | 4 | ||||
| -rw-r--r-- | coin_test_instructions.py | 5 | ||||
| -rw-r--r-- | requirements.txt | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py index 4f006612f..95d800b56 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -127,6 +127,10 @@ def call_setup(python_ver, phase): # 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 run_instruction([env_pip, "install", "-r", "requirements.txt"], "Failed to install dependencies") + if sys.platform == "win32": + run_instruction([env_pip, "install", "numpy==1.19.3"], "Failed to install numpy 1.19.3") + else: + run_instruction([env_pip, "install", "numpy"], "Failed to install numpy") cmd = [env_python, "-u", "setup.py"] if phase in ["BUILD"]: diff --git a/coin_test_instructions.py b/coin_test_instructions.py index 30d808e25..467f58d19 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -83,6 +83,11 @@ def call_testrunner(python_ver, buildnro): # 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 run_instruction([env_pip, "install", "-r", "requirements.txt"], "Failed to install dependencies") + if sys.platform == "win32": + run_instruction([env_pip, "install", "numpy==1.19.3"], "Failed to install numpy 1.19.3") + else: + run_instruction([env_pip, "install", "numpy"], "Failed to install numpy") + cmd = [env_python, "testrunner.py", "test", "--blacklist", "build_history/blacklist.txt", "--buildno=" + buildnro] diff --git a/requirements.txt b/requirements.txt index 8a7888117..9c25886ec 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ numpy==1.16.6; python_version < '3' -numpy; python_version >= '3' +# numpy; python_version >= '3', installed in coin_*_instructions.py atm +# see https://tinyurl.com/y3dm3h86 for details # setuptools from v45+ removed the support for Python 2, so we pin an old release setuptools==44.0.0; python_version < '3' setuptools; python_version >= '3' |