Skip to content

Commit

Permalink
Merge branch 'tim/python_multi_ver' into 'master'
Browse files Browse the repository at this point in the history
Allow Python 3.9 to 3.12, and run checks via matrix on CI

See merge request TankerHQ/sdk-python!315
  • Loading branch information
tux3 committed Aug 27, 2024
2 parents be3fa72 + ce6c7a1 commit 32c7070
Show file tree
Hide file tree
Showing 3 changed files with 461 additions and 359 deletions.
30 changes: 28 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ workflow:
- when: always
variables:
CONAN_REMOTE: "artifactory"
PYENV_VERSION: "3.12"

###########
# Default #
Expand All @@ -35,7 +34,7 @@ default:
- poetry run python -m pip install --upgrade pip
- poetry install --no-root
- poetry run python --version
image: registry.gitlab.com/tankerhq/docker/native:latest
image: registry.gitlab.com/tankerhq/docker/sdk-python:latest

##########
# Stages #
Expand Down Expand Up @@ -95,6 +94,9 @@ check/deployed-native/linux:
script:
- 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
- poetry run python run-ci.py build --test
parallel:
matrix:
- PYENV_VERSION: [ '3.9', '3.10', '3.11', '3.12' ]
tags: !reference [.tags/linux, tags]

check/deployed-native/macos/x86_64:
Expand All @@ -105,6 +107,9 @@ check/deployed-native/macos/x86_64:
script:
- 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
- poetry run python run-ci.py build --test
parallel:
matrix:
- PYENV_VERSION: [ '3.9', '3.10', '3.11', '3.12' ]
tags: !reference [.tags/macos/x86_64, tags]

check/deployed-native/macos/arm:
Expand All @@ -115,6 +120,9 @@ check/deployed-native/macos/arm:
script:
- 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
- poetry run python run-ci.py build --test
parallel:
matrix:
- PYENV_VERSION: [ '3.9', '3.10', '3.11', '3.12' ]
tags: !reference [.tags/macos/arm, tags]

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

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

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

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

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

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

.safety:
Expand Down
Loading

0 comments on commit 32c7070

Please sign in to comment.