diff options
| -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 |