diff options
| author | Christian Tismer <tismer@stackless.com> | 2019-04-28 13:03:41 +0000 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-04-30 09:37:22 +0000 |
| commit | d79bb0f4877bd35af99f8ec97aa91ca56207bc23 (patch) | |
| tree | 753e184e0b5117002287151ddc1472ad422b2279 | |
| parent | 9f2fe286b648ee08806874883860f28637a4169f (diff) | |
Revert "Temporarily disable wheel testing on macOS / Python 2"
This reverts commit 6c472e4d8dc2f80de3bb8db27683957564129570.
After the COIN problems have been fixed, this change will be reverted.
This is only half of the work. The patch
"Fix PyInstaller after removal of COIN glitches" is also needed.
It will have its full effect when PySide 5.13 is used with Python 2.7.16 .
Change-Id: I9898eba04c0cbc7a21e4a5369bfcf0fed8aee087
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | coin_test_instructions.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/coin_test_instructions.py b/coin_test_instructions.py index 5b08c773e..f31c35e59 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -46,7 +46,6 @@ from build_scripts.utils import rmtree from build_scripts.utils import acceptCITestConfiguration from build_scripts.utils import get_ci_qmake_path import os -import sys # Values must match COIN thrift CI_HOST_OS = option_value("os") @@ -78,8 +77,8 @@ def call_testrunner(python_ver, buildnro): qmake_path = get_ci_qmake_path(CI_ENV_INSTALL_DIR, CI_HOST_OS) - # Try to install built wheels, and build some buildable examples (except macOS/Python 2.16) - if CI_RELEASE_CONF and CI_HOST_OS != 'MacOS' or sys.version_info[0] == 3: + # Try to install built wheels, and build some buildable examples. + if CI_RELEASE_CONF: wheel_tester_path = os.path.join("testing", "wheel_tester.py") cmd = [env_python, wheel_tester_path, qmake_path] run_instruction(cmd, "Error while running wheel_tester.py") |