diff options
| author | Cristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2020-03-26 11:00:37 +0100 |
|---|---|---|
| committer | Cristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2020-03-26 17:15:16 +0100 |
| commit | d343dc28ec6b9c6f8dca4b9b678b827ab2efb2f7 (patch) | |
| tree | e157d9d713d244a64640ae2c5a609758af386643 | |
| parent | 8e17484c696632bce9901c83fe452c356cf448d8 (diff) | |
Pin setuptools to v44 for Python 2
setuptools v45 removed support for Python 2, so this will
unlock the current 5.15 CI status.
Change-Id: I87fce4d80ca656412aa5682c07f8b453bac430d1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -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"]: |