diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-10 08:37:47 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-10 08:38:19 +0200 |
| commit | c134129bd55ebf91d3a74c720b8bd659f13bd93d (patch) | |
| tree | ed0c18db18078221924d721ec429cad66f01a042 | |
| parent | de375e60a5807a82b39be10c3682e45a94f24783 (diff) | |
Revert "Temporarily disable wheel testing for Qt > 5.13"
Testing infrastructure is now in place.
This reverts commit c214fa38feb7d1d35bee125c79aa28c74269f777.
Change-Id: Ibaacc69294781c7cbda1c1d4fe19f31cb3b3247e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Tismer <tismer@stackless.com>
| -rw-r--r-- | coin_test_instructions.py | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/coin_test_instructions.py b/coin_test_instructions.py index e08c257c9..2a42ec677 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -38,7 +38,6 @@ ############################################################################# from build_scripts.options import has_option from build_scripts.options import option_value -from build_scripts.utils import get_python_dict 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 @@ -65,14 +64,6 @@ if _ci_features is not None: CI_RELEASE_CONF = has_option("packaging") -def get_package_version(): - """ Returns the version string for the PySide2 package. """ - pyside_version_py = os.path.join(os.path.dirname(__file__), - "sources", "pyside2", "pyside_version.py") - dict = get_python_dict(pyside_version_py) - return (int(dict['major_version']), int(dict['minor_version']), - int(dict['patch_version'])) - 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) @@ -87,9 +78,7 @@ 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. - # Fixme: Skip wheel testing for Qt >= 5.14 until - # qt5/09f28e9e1d989a70c876138a4cf24e35c67e0fbb has landed in dev - if CI_RELEASE_CONF and get_package_version()[1] < 14: + 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") |