Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add python 3.13 #593

Merged
merged 5 commits into from
Nov 14, 2024
Merged

Add python 3.13 #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1731023
Update linux and osx build yaml files
xylar Nov 14, 2024
78b39e3
Add python 3.13
xylar Nov 14, 2024
3b35c6f
Make the build environment python 3.12
xylar Nov 14, 2024
d725cf6
Add fail-fast: false
xylar Nov 14, 2024
48b0a53
Fix local install
xylar Nov 14, 2024
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
9 changes: 5 additions & 4 deletions .github/workflows/build_workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ jobs:
shell: bash -l {0}
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12"]
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
fail-fast: false
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@altheaden, I've been seeing CI get cancelled when one job in the matrix fails. I think this (rather than cancel_others: false below) might be the fix.

Could you add this on other repos when you do other updates?

steps:
- id: skip_check
uses: fkirc/skip-duplicate-actions@master
Expand Down Expand Up @@ -57,7 +58,7 @@ jobs:
channels: conda-forge
channel-priority: strict
auto-update-conda: true
python-version: ${{ matrix.python-version }}
python-version: 3.12
Comment on lines -60 to +61
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apparently conda-build isn't available for python 3.13 yet. That's fine, we don't need to build with the full python matrix, we just need the package that gets built to use the full python matrix.


- if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
name: Finalize Build Environment
Expand All @@ -68,8 +69,8 @@ jobs:
- if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
name: Install mpas_tools
run: |
conda create -y -n mpas_tools_dev --use-local mpas_tools \
python=${{ matrix.python-version }} \
conda create -y -n mpas_tools_dev -c ${CONDA_PREFIX}/conda-bld/ \
-c conda-forge mpas_tools python=${{ matrix.python-version }} \
Comment on lines -71 to +73
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why python 3.13 likes this better but I'll take it...

sphinx sphinx-multiversion mock sphinx_rtd_theme

- if: ${{ steps.skip_check.outputs.should_skip != 'true' }}
Expand Down
14 changes: 6 additions & 8 deletions conda_package/ci/linux_64_python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- conda
channel_sources:
- conda-forge
channel_targets:
- conda-forge mpas_tools_dev
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
hdf5:
- 1.14.3
- 1.14.4
libnetcdf:
- 4.9.2
netcdf_fortran:
Expand All @@ -33,7 +33,5 @@ python:
target_platform:
- linux-64
zip_keys:
- - c_stdlib_version
- cdt_name
- - cxx_compiler_version
- fortran_compiler_version
14 changes: 6 additions & 8 deletions conda_package/ci/linux_64_python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- conda
channel_sources:
- conda-forge
channel_targets:
- conda-forge mpas_tools_dev
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
hdf5:
- 1.14.3
- 1.14.4
libnetcdf:
- 4.9.2
netcdf_fortran:
Expand All @@ -33,7 +33,5 @@ python:
target_platform:
- linux-64
zip_keys:
- - c_stdlib_version
- cdt_name
- - cxx_compiler_version
- fortran_compiler_version
14 changes: 6 additions & 8 deletions conda_package/ci/linux_64_python3.12.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- conda
channel_sources:
- conda-forge
channel_targets:
- conda-forge mpas_tools_dev
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
hdf5:
- 1.14.3
- 1.14.4
libnetcdf:
- 4.9.2
netcdf_fortran:
Expand All @@ -33,7 +33,5 @@ python:
target_platform:
- linux-64
zip_keys:
- - c_stdlib_version
- cdt_name
- - cxx_compiler_version
- fortran_compiler_version
37 changes: 37 additions & 0 deletions conda_package/ci/linux_64_python3.13.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- conda
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fortran_compiler:
- gfortran
fortran_compiler_version:
- '13'
hdf5:
- 1.14.4
libnetcdf:
- 4.9.2
netcdf_fortran:
- '4.6'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.13.* *_cp313
target_platform:
- linux-64
zip_keys:
- - cxx_compiler_version
- fortran_compiler_version
14 changes: 6 additions & 8 deletions conda_package/ci/linux_64_python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- conda
channel_sources:
- conda-forge
channel_targets:
- conda-forge mpas_tools_dev
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
hdf5:
- 1.14.3
- 1.14.4
libnetcdf:
- 4.9.2
netcdf_fortran:
Expand All @@ -33,7 +33,5 @@ python:
target_platform:
- linux-64
zip_keys:
- - c_stdlib_version
- cdt_name
- - cxx_compiler_version
- fortran_compiler_version
10 changes: 5 additions & 5 deletions conda_package/ci/osx_64_python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ c_stdlib_version:
channel_sources:
- conda-forge
channel_targets:
- conda-forge mpas_tools_dev
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '18'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
hdf5:
- 1.14.3
- 1.14.4
libnetcdf:
- 4.9.2
llvm_openmp:
- '16'
- '18'
macos_machine:
- x86_64-apple-darwin13.4.0
netcdf_fortran:
Expand Down
10 changes: 5 additions & 5 deletions conda_package/ci/osx_64_python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ c_stdlib_version:
channel_sources:
- conda-forge
channel_targets:
- conda-forge mpas_tools_dev
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '18'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
hdf5:
- 1.14.3
- 1.14.4
libnetcdf:
- 4.9.2
llvm_openmp:
- '16'
- '18'
macos_machine:
- x86_64-apple-darwin13.4.0
netcdf_fortran:
Expand Down
10 changes: 5 additions & 5 deletions conda_package/ci/osx_64_python3.12.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ c_stdlib_version:
channel_sources:
- conda-forge
channel_targets:
- conda-forge mpas_tools_dev
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '18'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
hdf5:
- 1.14.3
- 1.14.4
libnetcdf:
- 4.9.2
llvm_openmp:
- '16'
- '18'
macos_machine:
- x86_64-apple-darwin13.4.0
netcdf_fortran:
Expand Down
41 changes: 41 additions & 0 deletions conda_package/ci/osx_64_python3.13.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '18'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '13'
hdf5:
- 1.14.4
libnetcdf:
- 4.9.2
llvm_openmp:
- '18'
macos_machine:
- x86_64-apple-darwin13.4.0
netcdf_fortran:
- '4.6'
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.13.* *_cp313
target_platform:
- osx-64
zip_keys:
- - cxx_compiler_version
- fortran_compiler_version
10 changes: 5 additions & 5 deletions conda_package/ci/osx_64_python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ c_stdlib_version:
channel_sources:
- conda-forge
channel_targets:
- conda-forge mpas_tools_dev
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
- '18'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
- '13'
hdf5:
- 1.14.3
- 1.14.4
libnetcdf:
- 4.9.2
llvm_openmp:
- '16'
- '18'
macos_machine:
- x86_64-apple-darwin13.4.0
netcdf_fortran:
Expand Down
1 change: 1 addition & 0 deletions conda_package/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Programming Language :: Python :: 3.13',
'Topic :: Scientific/Engineering',
],
packages=find_packages(include=['mpas_tools', 'mpas_tools.*']),
Expand Down
Loading