Skip to content

Commit 32c7070

Browse files
committed
Merge branch 'tim/python_multi_ver' into 'master'
Allow Python 3.9 to 3.12, and run checks via matrix on CI See merge request TankerHQ/sdk-python!315
2 parents be3fa72 + ce6c7a1 commit 32c7070

File tree

3 files changed

+461
-359
lines changed

3 files changed

+461
-359
lines changed

.gitlab-ci.yml

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ workflow:
2323
- when: always
2424
variables:
2525
CONAN_REMOTE: "artifactory"
26-
PYENV_VERSION: "3.12"
2726

2827
###########
2928
# Default #
@@ -35,7 +34,7 @@ default:
3534
- poetry run python -m pip install --upgrade pip
3635
- poetry install --no-root
3736
- poetry run python --version
38-
image: registry.gitlab.com/tankerhq/docker/native:latest
37+
image: registry.gitlab.com/tankerhq/docker/sdk-python:latest
3938

4039
##########
4140
# Stages #
@@ -95,6 +94,9 @@ check/deployed-native/linux:
9594
script:
9695
- poetry run python run-ci.py --isolate-conan-user-home prepare --use-tanker=deployed --profile linux-x86_64 --remote $CONAN_REMOTE --tanker-ref=$SDK_NATIVE_CONAN_REFERENCE
9796
- poetry run python run-ci.py build --test
97+
parallel:
98+
matrix:
99+
- PYENV_VERSION: [ '3.9', '3.10', '3.11', '3.12' ]
98100
tags: !reference [.tags/linux, tags]
99101

100102
check/deployed-native/macos/x86_64:
@@ -105,6 +107,9 @@ check/deployed-native/macos/x86_64:
105107
script:
106108
- poetry run python run-ci.py --isolate-conan-user-home prepare --use-tanker=deployed --profile macos-x86_64 --remote $CONAN_REMOTE --tanker-ref=$SDK_NATIVE_CONAN_REFERENCE
107109
- poetry run python run-ci.py build --test
110+
parallel:
111+
matrix:
112+
- PYENV_VERSION: [ '3.9', '3.10', '3.11', '3.12' ]
108113
tags: !reference [.tags/macos/x86_64, tags]
109114

110115
check/deployed-native/macos/arm:
@@ -115,6 +120,9 @@ check/deployed-native/macos/arm:
115120
script:
116121
- poetry run python run-ci.py --isolate-conan-user-home prepare --use-tanker=deployed --profile macos-armv8 --remote $CONAN_REMOTE --tanker-ref=$SDK_NATIVE_CONAN_REFERENCE
117122
- poetry run python run-ci.py build --test
123+
parallel:
124+
matrix:
125+
- PYENV_VERSION: [ '3.9', '3.10', '3.11', '3.12' ]
118126
tags: !reference [.tags/macos/arm, tags]
119127

120128
## native from sources
@@ -127,6 +135,9 @@ check/native-from-sources/linux:
127135
script:
128136
- poetry run python run-ci.py --isolate-conan-user-home prepare --remote $CONAN_REMOTE --use-tanker=same-as-branch --profile linux-x86_64
129137
- poetry run python run-ci.py build --test
138+
parallel:
139+
matrix:
140+
- PYENV_VERSION: [ '3.9', '3.10', '3.11', '3.12' ]
130141
tags: !reference [.tags/compilation-linux, tags]
131142

132143
check/native-from-sources/macos/x86_64:
@@ -137,6 +148,9 @@ check/native-from-sources/macos/x86_64:
137148
script:
138149
- poetry run python run-ci.py --isolate-conan-user-home prepare --remote $CONAN_REMOTE --use-tanker=same-as-branch --profile macos-x86_64
139150
- poetry run python run-ci.py build --test
151+
parallel:
152+
matrix:
153+
- PYENV_VERSION: [ '3.9', '3.10', '3.11', '3.12' ]
140154
tags: !reference [.tags/macos/x86_64, tags]
141155

142156
check/native-from-sources/macos/arm:
@@ -147,6 +161,9 @@ check/native-from-sources/macos/arm:
147161
script:
148162
- poetry run python run-ci.py --isolate-conan-user-home prepare --remote $CONAN_REMOTE --use-tanker=same-as-branch --profile macos-armv8
149163
- poetry run python run-ci.py build --test
164+
parallel:
165+
matrix:
166+
- PYENV_VERSION: [ '3.9', '3.10', '3.11', '3.12' ]
150167
tags: !reference [.tags/macos/arm, tags]
151168

152169
## downstream
@@ -159,6 +176,9 @@ check/downstream/linux:
159176
script:
160177
- poetry run python run-ci.py --isolate-conan-user-home prepare --remote $CONAN_REMOTE --use-tanker=upstream --profile linux-x86_64
161178
- poetry run python run-ci.py build --test
179+
parallel:
180+
matrix:
181+
- PYENV_VERSION: [ '3.9', '3.10', '3.11', '3.12' ]
162182
tags: !reference [.tags/linux, tags]
163183

164184
check/downstream/macos/x86_64:
@@ -170,6 +190,9 @@ check/downstream/macos/x86_64:
170190
script:
171191
- poetry run python run-ci.py --isolate-conan-user-home prepare --remote $CONAN_REMOTE --use-tanker=upstream --profile macos-x86_64
172192
- poetry run python run-ci.py build --test
193+
parallel:
194+
matrix:
195+
- PYENV_VERSION: [ '3.9', '3.10', '3.11', '3.12' ]
173196
tags: !reference [.tags/macos/x86_64, tags]
174197

175198
check/downstream/macos/arm:
@@ -181,6 +204,9 @@ check/downstream/macos/arm:
181204
script:
182205
- poetry run python run-ci.py --isolate-conan-user-home prepare --remote $CONAN_REMOTE --use-tanker=upstream --profile macos-armv8
183206
- poetry run python run-ci.py build --test
207+
parallel:
208+
matrix:
209+
- PYENV_VERSION: [ '3.9', '3.10', '3.11', '3.12' ]
184210
tags: !reference [.tags/macos/arm, tags]
185211

186212
.safety:

0 commit comments

Comments
 (0)