diff options
Diffstat (limited to 'coin_test_instructions.py')
| -rw-r--r-- | coin_test_instructions.py | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/coin_test_instructions.py b/coin_test_instructions.py index e90c9e8af..b0e71fba7 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -1,14 +1,16 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only import os +import logging import site import sys -from build_scripts.options import has_option, log, option_value +from build_scripts.log import log +from build_scripts.options import has_option, option_value from build_scripts.utils import (expand_clang_variables, get_ci_qmake_path, get_qtci_virtualEnv, remove_tree, run_instruction) -log.set_verbosity(log.INFO) +log.setLevel(logging.INFO) # Values must match COIN thrift CI_HOST_OS = option_value("os") @@ -28,7 +30,8 @@ CI_RELEASE_CONF = has_option("packaging") 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) + _pExe, _env, env_pip, env_python = get_qtci_virtualEnv(python_ver, CI_HOST_OS, CI_HOST_ARCH, + CI_TARGET_ARCH) remove_tree(_env, True) # Pinning the virtualenv before creating one # Use pip3 if possible while pip seems to install the virtualenv to wrong dir in some OS @@ -36,12 +39,15 @@ def call_testrunner(python_ver, buildnro): if sys.platform == "win32": python3 = os.path.join(os.getenv("PYTHON3_PATH"), "python.exe") - # we shouldn't install anything to m1, while it is not virtualized + # we shouldn't install anything outside of virtualenv, while m1 is not virtualized yet if CI_HOST_OS == "MacOS" and CI_HOST_ARCH == "ARM64": v_env = "virtualenv" - run_instruction([v_env, "-p", _pExe, _env], "Failed to create virtualenv") + run_instruction([str(v_env), "-p", str(_pExe), str(_env)], "Failed to create virtualenv") + run_instruction([env_pip, "install", "-r", "requirements.txt"], + "Failed to install dependencies") else: - run_instruction([python3, "-m", "pip", "install", "--user", "virtualenv==20.7.2"], "Failed to pin virtualenv") + run_instruction([python3, "-m", "pip", "install", "--user", "virtualenv==20.7.2"], + "Failed to pin virtualenv") # installing to user base might not be in PATH by default. env_path = os.path.join(site.USER_BASE, "bin") v_env = os.path.join(env_path, "virtualenv") @@ -49,15 +55,17 @@ def call_testrunner(python_ver, buildnro): env_path = os.path.join(site.USER_BASE, "Scripts") v_env = os.path.join(env_path, "virtualenv.exe") try: - run_instruction([v_env, "--version"], "Using default virtualenv") + run_instruction([str(v_env), "--version"], "Using default virtualenv") except Exception as e: log.info("Failed to use the default virtualenv") log.info(f"{type(e).__name__}: {e}") v_env = "virtualenv" - run_instruction([v_env, "-p", _pExe, _env], "Failed to create virtualenv") + run_instruction([str(v_env), "-p", str(_pExe), str(_env)], "Failed to create virtualenv") # When the 'python_ver' variable is empty, we are using Python 2 - # Pip is always upgraded when CI template is provisioned, upgrading it in later phase may cause perm issue - run_instruction([env_pip, "install", "-r", "requirements.txt"], "Failed to install dependencies") + # Pip is always upgraded when CI template is provisioned, + # upgrading it in later phase may cause perm issue + run_instruction([env_pip, "install", "-r", "requirements.txt"], + "Failed to install dependencies") # Install distro to replace missing platform.linux_distribution() in python3.8 run_instruction([env_pip, "install", "distro"], "Failed to install distro") @@ -70,16 +78,8 @@ def call_testrunner(python_ver, buildnro): # Try to install built wheels, and build some buildable examples. if CI_RELEASE_CONF: wheel_tester_path = os.path.join("testing", "wheel_tester.py") - # Run the test for the old set of wheels - cmd = [env_python, wheel_tester_path, qmake_path] - run_instruction(cmd, "Error while running wheel_tester.py on old wheels") - - # Uninstalling the other wheels - run_instruction([env_pip, "uninstall", "shiboken6", "shiboken6_generator", "pyside6", "-y"], - "Failed to uninstall old wheels") - # Run the test for the new set of wheels - cmd = [env_python, wheel_tester_path, qmake_path, "--wheels-dir=dist_new", "--new"] + cmd = [env_python, wheel_tester_path, qmake_path, "--wheels-dir=dist", "--new"] run_instruction(cmd, "Error while running wheel_tester.py on new wheels") @@ -96,11 +96,9 @@ def run_test_instructions(): # In win machines, there are additional python versions to test with if CI_HOST_OS == "Windows": - call_testrunner("3.6.1", str(testRun)) - call_testrunner("3.8.1", str(testRun)) call_testrunner("3.10.0", str(testRun)) elif CI_HOST_OS == "Linux": - call_testrunner("3.8", str(testRun)) + call_testrunner("3.11", str(testRun)) else: call_testrunner("3", str(testRun)) |