diff options
| author | Simo Fält <simo.falt@qt.io> | 2019-06-18 13:43:40 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2020-02-27 18:27:47 +0200 |
| commit | aa69626532f8887257f6f0b3d127a5236215c961 (patch) | |
| tree | 8033b21d519f4066fee1b070bfc93b0fe2c69b93 | |
| parent | cd1ffcb3ab9408b3595baa4f2939a65a44a2c052 (diff) | |
Unpin wheel package
The fix we were waiting for has landed to released wheel package.
Change-Id: I4b4a825ee370af79ade54b6b7eb5c6ae082793a7
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
(cherry picked from commit 28b1e4a8ee80750454ae9a5e3e4394ebd6d20f58)
| -rw-r--r-- | build_scripts/utils.py | 7 | ||||
| -rw-r--r-- | coin_build_instructions.py | 5 | ||||
| -rw-r--r-- | coin_test_instructions.py | 4 |
3 files changed, 2 insertions, 14 deletions
diff --git a/build_scripts/utils.py b/build_scripts/utils.py index fa4981988..85a2f9e36 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -1089,13 +1089,6 @@ def get_python_dict(python_script_path): "file: {}.".format(python_script_path)) raise -def install_pip_wheel_package(env_pip): - # Need to install an unreleased wheel version, due to a bug that - # will generate a wheel which will not be installable. - # See https://github.com/pypa/wheel/issues/263 - wheel_url = "git+https://github.com/pypa/wheel.git@fbf3e3ada64d36ca7bb9c1422f5a1ccdba7e4dcf" - install_pip_package_from_url_specifier(env_pip, wheel_url) - def install_pip_package_from_url_specifier(env_pip, url, upgrade=True): args = [env_pip, "install", url] if upgrade: diff --git a/coin_build_instructions.py b/coin_build_instructions.py index 9a7d6272c..c97a35f53 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -39,7 +39,6 @@ from build_scripts.options import has_option from build_scripts.options import option_value from build_scripts.utils import install_pip_dependencies -from build_scripts.utils import install_pip_wheel_package from build_scripts.utils import get_qtci_virtualEnv from build_scripts.utils import run_instruction from build_scripts.utils import rmtree @@ -101,9 +100,7 @@ def call_setup(python_ver): rmtree(_env, True) run_instruction(["virtualenv", "-p", _pExe, _env], "Failed to create virtualenv") - install_pip_dependencies(env_pip, ["pip", "numpy", "setuptools", "sphinx", "six"]) - install_pip_wheel_package(env_pip) - + install_pip_dependencies(env_pip, ["pip", "numpy", "setuptools", "sphinx", "six", "wheel"]) cmd = [env_python, "-u", "setup.py"] if CI_RELEASE_CONF: cmd += ["bdist_wheel", "--standalone"] diff --git a/coin_test_instructions.py b/coin_test_instructions.py index aeedd03e7..8ba82c26f 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -39,7 +39,6 @@ from build_scripts.options import has_option from build_scripts.options import option_value from build_scripts.utils import install_pip_dependencies -from build_scripts.utils import install_pip_wheel_package from build_scripts.utils import get_qtci_virtualEnv from build_scripts.utils import run_instruction from build_scripts.utils import rmtree @@ -68,8 +67,7 @@ def call_testrunner(python_ver, buildnro): rmtree(_env, True) run_instruction(["virtualenv", "-p", _pExe, _env], "Failed to create virtualenv") # Keeping PyInstaller 3.4, because 3.5 seems to have broken our test - install_pip_dependencies(env_pip, ["pip", "numpy", "PyOpenGL", "setuptools", "six", "pyinstaller==3.4"]) - install_pip_wheel_package(env_pip) + install_pip_dependencies(env_pip, ["pip", "numpy", "PyOpenGL", "setuptools", "six", "pyinstaller==3.4", "wheel"]) cmd = [env_python, "testrunner.py", "test", "--blacklist", "build_history/blacklist.txt", "--buildno=" + buildnro] |