Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions .github/workflows/XmsGrid-CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install flake8 flake8-docstrings flake8-bugbear flake8-import-order pep8-naming
pip install --upgrade "xmsconan>=2.18.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
pip install --upgrade "xmsconan>=2.21.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
# Generate .flake8 so CI lints with the same config developers use locally.
# Do not inline the flake8 settings here: that duplicates .flake8.jinja and
# the two copies drift apart silently.
Expand All @@ -63,11 +63,11 @@ jobs:
fail-fast: false
matrix:
platform: [macos-15]
python-version: ['3.13']
python-version: ["3.13", "3.14"]
build_type: [Release, Debug]

env:
MATRIX_NAME: ${{ matrix.platform }}-Clang${{ matrix.compiler-version }}-${{ matrix.build_type }}
MATRIX_NAME: ${{ matrix.platform }}-Clang${{ matrix.compiler-version }}-${{ matrix.build_type }}-py${{ matrix.python-version }}
# Library Variables
LIBRARY_NAME: xmsgrid
XMS_VERSION: '0.0.0'
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
# package_id computation and silently detach builds from the binaries
# already published to the remote. Bump this deliberately.
pip install "conan~=2.31.0" devpi-client wheel
python -m pip install --upgrade "xmsconan>=2.18.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
python -m pip install --upgrade "xmsconan>=2.21.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
# Setup Conan
- name: Setup Conan
run: xmsconan_conan_setup --remote-url ${{ env.CONAN_REMOTE_URL }} --login --remove-conancenter
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
- name: Upload wheel artifact
uses: actions/upload-artifact@v4
with:
name: wheel-${{ runner.os }}
name: wheel-${{ runner.os }}-py${{ matrix.python-version }}
path: wheelhouse/*.whl
if: matrix.build_type == 'Release'
# Upload wheel to Aquapi
Expand Down Expand Up @@ -205,19 +205,20 @@ jobs:
# LINUX
# ----------------------------------------------------------------------------------------------
linux:
name: GCC-13 (${{ matrix.build_type }}, Linux)
name: GCC-13 (${{ matrix.build_type }}, ${{ matrix.python-version }}, Linux)
runs-on: ubuntu-latest

container:
image: ghcr.io/aquaveo/conan-gcc13-py3.13:latest
image: ghcr.io/aquaveo/conan-gcc13-py${{ matrix.python-version }}:latest

strategy:
fail-fast: false
matrix:
build_type: [Release, Debug]
python-version: ["3.13", "3.14"]

env:
MATRIX_NAME: linux-GCC13-${{ matrix.build_type }}
MATRIX_NAME: linux-GCC13-${{ matrix.build_type }}-py${{ matrix.python-version }}
# Library Variables
LIBRARY_NAME: xmsgrid
XMS_VERSION: '0.0.0'
Expand All @@ -235,7 +236,7 @@ jobs:
AQUAPI_PASSWORD: ${{ secrets.AQUAPI_PASSWORD_SECRET }}
AQUAPI_URL: ${{ secrets.AQUAPI_URL_DEV }}
# Python Variables
PYTHON_TARGET_VERSION: '3.13'
PYTHON_TARGET_VERSION: ${{ matrix.python-version }}
RELEASE_PYTHON: 'False'
CTEST_PARALLEL_LEVEL: '8'

Expand All @@ -250,7 +251,7 @@ jobs:
# package_id computation and silently detach builds from the binaries
# already published to the remote. Bump this deliberately.
pip install "conan~=2.31.0" devpi-client wheel
pip install --upgrade "xmsconan>=2.18.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
pip install --upgrade "xmsconan>=2.21.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
# Setup Conan
- name: Setup Conan
run: xmsconan_conan_setup --remote-url ${{ env.CONAN_REMOTE_URL }} --login
Expand Down Expand Up @@ -301,7 +302,7 @@ jobs:
- name: Upload wheel artifact
uses: actions/upload-artifact@v4
with:
name: wheel-${{ runner.os }}
name: wheel-${{ runner.os }}-py${{ matrix.python-version }}
path: wheelhouse/*.whl
if: matrix.build_type == 'Release'
# Upload wheel to Aquapi
Expand Down Expand Up @@ -349,7 +350,7 @@ jobs:
fail-fast: false
matrix:
platform: [windows-2022]
python-version: ["3.10", "3.13"]
python-version: ["3.10", "3.13", "3.14"]
compiler-version: [17]
build_type: [Release, Debug]

Expand Down Expand Up @@ -398,7 +399,7 @@ jobs:
# package_id computation and silently detach builds from the binaries
# already published to the remote. Bump this deliberately.
pip install "conan~=2.31.0" devpi-client wheel
python -m pip install --upgrade "xmsconan>=2.18.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
python -m pip install --upgrade "xmsconan>=2.21.0" -i https://public.aquapi.aquaveo.com/aquaveo/dev/+simple
# Setup Visual Studio
- name: Setup Visual Studio
uses: microsoft/setup-msbuild@v2
Expand Down
6 changes: 4 additions & 2 deletions build.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if (NOT MSVC)
endif()
"""

xms_dependencies = [{ name = "xmscore", version = "7.0.12" }]
xms_dependencies = [{ name = "xmscore", version = "7.0.13" }]

python_namespaced_dir = "grid"

Expand Down Expand Up @@ -109,4 +109,6 @@ pybind_headers = [
]

[ci]
python_versions = ["3.10", "3.13"]
python_versions = ["3.10", "3.13", "3.14"]
mac_python_versions = ["3.13", "3.14"]
linux_python_versions = ["3.13", "3.14"]
Loading