diff options
| author | Cristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2022-10-11 21:35:54 +0200 |
|---|---|---|
| committer | Cristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2022-10-13 15:39:48 +0200 |
| commit | 6c967b9f70a82685afc0f65fe88a97183deb9d46 (patch) | |
| tree | 3dfb4068a159132fdc6f8e26c28365c4d67cdd14 | |
| parent | f1e26fd5589ae1a6ce0973b13882b7359b8003e4 (diff) | |
build: bump setuptools required version
Adding the update process to the testing step as well
because by default, the setuptools version is too old.
Task-number: PYSIDE-2079
Change-Id: I93033cba4a81144fc6d8903b1cf448bd7f425289
Reviewed-by: Christian Tismer <tismer@stackless.com>
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | coin/instructions/execute_test_instructions.yaml | 10 | ||||
| -rw-r--r-- | requirements.txt | 5 |
2 files changed, 11 insertions, 4 deletions
diff --git a/coin/instructions/execute_test_instructions.yaml b/coin/instructions/execute_test_instructions.yaml index fd6573e80..fec4b279d 100644 --- a/coin/instructions/execute_test_instructions.yaml +++ b/coin/instructions/execute_test_instructions.yaml @@ -5,6 +5,16 @@ enable_if: not_contains_value: LicenseCheck instructions: - type: ExecuteCommand + command: "python3 -m pip install -U setuptools" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 1200 + enable_if: + condition: property + property: host.os + equals_value: MacOS + userMessageOnFailure: > + Failed to install setuptools on macOS + - type: ExecuteCommand command: "python3 -u coin_test_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=/Users/qt/work/install --targetOs={{.Env.CI_OS}} --hostArch=ARM64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}}" maxTimeInSeconds: 14400 maxTimeBetweenOutput: 1200 diff --git a/requirements.txt b/requirements.txt index 86a5055c3..78fc79e67 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,4 @@ -# > 60 introduces ImportError: cannot import name 'build_py' from 'setuptools._distutils.command' -# FIXME: Check if fixed in later versions? -setuptools>=59.5,<60; python_version < '3.10' -setuptools>=62.3; python_version >= '3.10' +setuptools>=65 packaging build==0.7 sphinx |