diff options
| author | Simo Fält <simo.falt@qt.io> | 2022-01-05 15:26:23 +0200 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2022-01-07 13:07:42 +0000 |
| commit | 9282e03de471bb3772c8d3997159e49c113d7678 (patch) | |
| tree | 7c79cfcab8714d49c8564e21d05f53a50aea86eb | |
| parent | a6c0fab89ef9382c85f05329983128877dad50bf (diff) | |
Update qt5 dependency
Disable not needed platform configurations
Update virtualenv version
Update wheel names
Disable test asserting patch level version being int
Change-Id: I4215deb96c69f43bc4bfc458ed20f1254f4383e2
Reviewed-by: Simo Fält <simo.falt@qt.io>
| -rw-r--r-- | coin/module_config.yaml | 2 | ||||
| -rw-r--r-- | coin_build_instructions.py | 2 | ||||
| -rw-r--r-- | coin_test_instructions.py | 2 | ||||
| -rw-r--r-- | product_dependencies.yaml | 2 | ||||
| -rw-r--r-- | sources/pyside2/pyside_version.py | 2 | ||||
| -rw-r--r-- | sources/pyside2/tests/QtCore/versioninfo_test.py | 2 | ||||
| -rw-r--r-- | sources/shiboken2/shiboken_version.py | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index fd80acf9e..c77961ff2 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -18,7 +18,7 @@ accept_configuration: not_contains_value: -no-gui - condition: property # Following configs are not supported property: target.osVersion - not_in_values: [OPENSUSE_13_01, QEMU, WebAssembly, Ubuntu_18_04, SLES_12, SLES_15] + not_in_values: [OPENSUSE_13_01, openSUSE_15_1, MacOS_10_14, MacOS_11_00, MacOS_10_15, Windows_11_21H2,QEMU, WebAssembly, Ubuntu_18_04, SLES_12, SLES_15] - condition: property # MibnGW and msvc2015 are not supported property: target.compiler not_in_values: [Mingw, MSVC2015] diff --git a/coin_build_instructions.py b/coin_build_instructions.py index 95d800b56..bb7bca011 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -112,7 +112,7 @@ def call_setup(python_ver, phase): if phase in ["BUILD"]: rmtree(_env, True) # Pinning the virtualenv before creating one - run_instruction(["pip", "install", "--user", "virtualenv==20.0.25"], "Failed to pin virtualenv") + run_instruction(["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") diff --git a/coin_test_instructions.py b/coin_test_instructions.py index 467f58d19..6f3306bcd 100644 --- a/coin_test_instructions.py +++ b/coin_test_instructions.py @@ -67,7 +67,7 @@ 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) # Pinning the virtualenv before creating one - run_instruction(["pip", "install", "--user", "virtualenv==20.0.25"], "Failed to pin virtualenv") + run_instruction(["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") diff --git a/product_dependencies.yaml b/product_dependencies.yaml index 29c4fb5d6..178faa374 100644 --- a/product_dependencies.yaml +++ b/product_dependencies.yaml @@ -1,3 +1,3 @@ dependencies: ../../qt/qt5.git: - ref: "5.15.2" + ref: "e9eac7f4f76906ebfe33ed55ec3d8c5904e52c3d" diff --git a/sources/pyside2/pyside_version.py b/sources/pyside2/pyside_version.py index 009db0bfa..2ccf3be69 100644 --- a/sources/pyside2/pyside_version.py +++ b/sources/pyside2/pyside_version.py @@ -39,7 +39,7 @@ major_version = "5" minor_version = "15" -patch_version = "2" +patch_version = "2.1" # For example: "a", "b", "rc" # (which means "alpha", "beta", "release candidate"). diff --git a/sources/pyside2/tests/QtCore/versioninfo_test.py b/sources/pyside2/tests/QtCore/versioninfo_test.py index c682dbbdc..dd6c83bb1 100644 --- a/sources/pyside2/tests/QtCore/versioninfo_test.py +++ b/sources/pyside2/tests/QtCore/versioninfo_test.py @@ -44,7 +44,7 @@ class TestVersionInfo(unittest.TestCase): self.assertEqual(len(v), 5) self.assertEqual(type(v[0]), int) self.assertEqual(type(v[1]), int) - self.assertEqual(type(v[2]), int) + #self.assertEqual(type(v[2]), int) 5.15.2.1 self.assertEqual(type(v[3]), str) self.assertEqual(type(v[4]), str) diff --git a/sources/shiboken2/shiboken_version.py b/sources/shiboken2/shiboken_version.py index 009db0bfa..2ccf3be69 100644 --- a/sources/shiboken2/shiboken_version.py +++ b/sources/shiboken2/shiboken_version.py @@ -39,7 +39,7 @@ major_version = "5" minor_version = "15" -patch_version = "2" +patch_version = "2.1" # For example: "a", "b", "rc" # (which means "alpha", "beta", "release candidate"). |