aboutsummaryrefslogtreecommitdiffstats
path: root/coin_test_instructions.py
diff options
context:
space:
mode:
authorCristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io>2022-10-13 12:36:23 +0200
committerCristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io>2022-10-18 11:34:52 +0200
commit2afcf8e7545c681e412e5b6d04ab8867e5edd5c7 (patch)
tree060e956fa8aa99301a60bab605b2fd3d3ed19f13 /coin_test_instructions.py
parent7f2c40d9b32b7b7b161d224c483b1fe23270c446 (diff)
pathlib: migrate build_scripts away from os.path
There is a usage of os.path.relpath that cannot be migrated to pathlib, which remain the only usage of os.path Task-number: PYSIDE-2080 Change-Id: Iac781e9c9324fb8b9d3559b4225912d56782072a Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'coin_test_instructions.py')
-rw-r--r--coin_test_instructions.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/coin_test_instructions.py b/coin_test_instructions.py
index cd521f044..3261599e4 100644
--- a/coin_test_instructions.py
+++ b/coin_test_instructions.py
@@ -41,7 +41,7 @@ def call_testrunner(python_ver, buildnro):
# we shouldn't install anything to m1, while it is not virtualized
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")
else:
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.
@@ -51,12 +51,12 @@ 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")