diff options
| author | Simo Fält <simo.falt@qt.io> | 2018-07-02 14:55:41 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2019-05-08 07:15:06 +0000 |
| commit | cb582d68ebf4ec7a32e8685fa2dc5950aa7175fb (patch) | |
| tree | 22a3e40c115c5d0f7e7f859b984a174656746c1a | |
| parent | 06f97eca45ddadf4f04229cf14d5dc0bbd867316 (diff) | |
Make sure used pip is up to date
Change-Id: I2ba91f259d3f6db9f2d4a169ac103b4b8f2333b6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | coin_build_instructions.py | 2 | ||||
| -rw-r--r-- | coin_test_instructions.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py index d094d5b2a..1f84ac065 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -101,7 +101,7 @@ def call_setup(python_ver): rmtree(_env, True) run_instruction(["virtualenv", "-p", _pExe, _env], "Failed to create virtualenv") - install_pip_dependencies(env_pip, ["numpy", "setuptools", "sphinx", "six"]) + install_pip_dependencies(env_pip, ["pip", "numpy", "setuptools", "sphinx", "six"]) install_pip_wheel_package(env_pip) cmd = [env_python, "-u", "setup.py"] diff --git a/coin_test_instructions.py b/coin_test_instructions.py index f31c35e59..2a42ec677 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -68,7 +68,7 @@ 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, ["numpy", "PyOpenGL", "setuptools", "six", "pyinstaller"]) + install_pip_dependencies(env_pip, ["pip", "numpy", "PyOpenGL", "setuptools", "six", "pyinstaller"]) install_pip_wheel_package(env_pip) cmd = [env_python, "testrunner.py", "test", "--blacklist", "build_history/blacklist.txt", |