diff options
| author | Cristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2020-03-30 10:07:56 +0200 |
|---|---|---|
| committer | Cristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2020-03-30 10:07:56 +0200 |
| commit | d2be09eef06241cd4c9eb7a0ca1a993dc2355f02 (patch) | |
| tree | 4cd15a74c0629e76a41b30d2e02d22e998fb509d /coin_build_instructions.py | |
| parent | ad73193e99fef8f5d1bcf095075596dca88949c1 (diff) | |
| parent | d47fb98e443e3ac5cb18850b2551143c713917f0 (diff) | |
Merge branch '5.14' into 5.14.2v5.14.2
Change-Id: I3f76bc2b1d401d901d6ac5bc74874b0894bf3df9
Diffstat (limited to 'coin_build_instructions.py')
| -rw-r--r-- | coin_build_instructions.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py index 8df12ee4c..95bd4eba2 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -110,7 +110,11 @@ def call_setup(python_ver, phase): if phase in ["BUILD"]: rmtree(_env, True) run_instruction(["virtualenv", "-p", _pExe, _env], "Failed to create virtualenv") - install_pip_dependencies(env_pip, ["pip", "numpy", "setuptools", "sphinx", "six", "wheel"]) + # 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", + "setuptools" if python_ver else "setuptools==44.0.0", + "sphinx", "six", "wheel"]) cmd = [env_python, "-u", "setup.py"] if phase in ["BUILD"]: |