diff options
| author | Simo Fält <simo.falt@qt.io> | 2022-06-07 07:03:52 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2022-06-17 18:48:15 +0000 |
| commit | 2e3a7f720017d2d6fb303217bf00642e8284666a (patch) | |
| tree | 1ea4d3f7b78b47e923269bf9046ee2b115687173 /coin_build_instructions.py | |
| parent | b111cde848e3d8938be6214a4d377867753f4913 (diff) | |
Fix Python 3.7 and 3.10 usage in CI
Pick-to: 6.3
Change-Id: I0676713438b0b9e7b627c80cb400568edb2333d1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'coin_build_instructions.py')
| -rw-r--r-- | coin_build_instructions.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py index 35a651455..e52bec45c 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -99,10 +99,6 @@ def call_setup(python_ver, phase): # 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") - if sys.platform == "win32": - run_instruction([env_pip, "install", "numpy==1.19.3"], "Failed to install numpy 1.19.3") - else: - run_instruction([env_pip, "install", "numpy"], "Failed to install numpy") cmd = [env_python, "-u", "setup.py"] if phase in ["BUILD"]: @@ -155,17 +151,19 @@ if __name__ == "__main__": python_ver = "3" if CI_TARGET_OS in ["Linux"]: python_ver = "3.8" - + wheel_package_dir = "qfpa-p3.6" if CI_TARGET_OS in ["Windows"]: if os.environ.get('HOST_OSVERSION_COIN') == 'windows_10_21h2': - python_ver = "3.10" + python_ver = "3.10.0" + wheel_package_dir = "qfpa-p3.10" else: - python_ver = "3.7" + python_ver = "3.7.9" + wheel_package_dir = "qfpa-p3.7" if CI_TEST_PHASE in ["ALL", "BUILD"]: call_setup(python_ver, "BUILD") # Until CI has a feature to set more dynamic signing dir, make sure it actually exist if os.environ.get("QTEST_ENVIRONMENT") == "ci" and sys.platform == "win32": - signing_dir = os.path.join(os.getcwd(), "build", "qfpa-p3.6", "package_for_wheels") + signing_dir = os.path.join(os.getcwd(), "build", wheel_package_dir, "package_for_wheels") print("Check for signing dir " + signing_dir) assert(os.path.isdir(signing_dir)) |