From 2d0c15aaf1abb2f3fad5ba7f109dae722ebd9eb7 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Tue, 3 Dec 2024 17:01:39 +0100 Subject: [PATCH 1/6] Update to v1.6.0-alpha.2 --- compass/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compass/version.py b/compass/version.py index dc626e3f8..b95a32416 100644 --- a/compass/version.py +++ b/compass/version.py @@ -1 +1 @@ -__version__ = '1.6.0-alpha.1' +__version__ = '1.6.0-alpha.2' From ec0cf79c6d1289709d32025b6242a5742d95c7a9 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Tue, 3 Dec 2024 17:02:00 +0100 Subject: [PATCH 2/6] Update mpas_tools and geometric_features versions --- conda/compass_env/spec-file.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda/compass_env/spec-file.template b/conda/compass_env/spec-file.template index 508cb587c..7104b9cce 100644 --- a/conda/compass_env/spec-file.template +++ b/conda/compass_env/spec-file.template @@ -8,7 +8,7 @@ cartopy_offlinedata cmocean esmf=8.6.1={{ mpi_prefix }}_* ffmpeg -geometric_features=1.5.0 +geometric_features=1.6.0 git gsw h5py @@ -22,7 +22,7 @@ matplotlib-base >=3.9.1 metis moab >=5.5.1 moab=*={{ mpi_prefix }}_tempest_* -mpas_tools=0.35.0 +mpas_tools=0.36.0 nco netcdf4=*=nompi_* numpy >=2.0,<3.0 From 30165c4cea2c9609defc9e9624e0ce07c1fa7151 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Tue, 3 Dec 2024 17:02:20 +0100 Subject: [PATCH 3/6] Remove unused `ci` files --- ci/generate.py | 15 ----------- ci/linux_mpi_mpich_python3.10.yaml | 34 ----------------------- ci/linux_mpi_mpich_python3.11.yaml | 34 ----------------------- ci/linux_mpi_mpich_python3.12.yaml | 34 ----------------------- ci/linux_mpi_mpich_python3.9.yaml | 34 ----------------------- ci/linux_mpi_nompi_python3.10.yaml | 34 ----------------------- ci/linux_mpi_nompi_python3.11.yaml | 34 ----------------------- ci/linux_mpi_nompi_python3.12.yaml | 34 ----------------------- ci/linux_mpi_nompi_python3.9.yaml | 34 ----------------------- ci/linux_mpi_openmpi_python3.10.yaml | 34 ----------------------- ci/linux_mpi_openmpi_python3.11.yaml | 34 ----------------------- ci/linux_mpi_openmpi_python3.12.yaml | 34 ----------------------- ci/linux_mpi_openmpi_python3.9.yaml | 34 ----------------------- ci/osx_mpi_mpich_python3.10.yaml | 40 ---------------------------- ci/osx_mpi_mpich_python3.11.yaml | 40 ---------------------------- ci/osx_mpi_mpich_python3.12.yaml | 40 ---------------------------- ci/osx_mpi_mpich_python3.9.yaml | 40 ---------------------------- ci/osx_mpi_nompi_python3.10.yaml | 40 ---------------------------- ci/osx_mpi_nompi_python3.11.yaml | 40 ---------------------------- ci/osx_mpi_nompi_python3.12.yaml | 40 ---------------------------- ci/osx_mpi_nompi_python3.9.yaml | 40 ---------------------------- ci/osx_mpi_openmpi_python3.10.yaml | 40 ---------------------------- ci/osx_mpi_openmpi_python3.11.yaml | 40 ---------------------------- ci/osx_mpi_openmpi_python3.12.yaml | 40 ---------------------------- ci/osx_mpi_openmpi_python3.9.yaml | 40 ---------------------------- ci/template_linux.yaml | 34 ----------------------- ci/template_osx.yaml | 40 ---------------------------- 27 files changed, 977 deletions(-) delete mode 100755 ci/generate.py delete mode 100644 ci/linux_mpi_mpich_python3.10.yaml delete mode 100644 ci/linux_mpi_mpich_python3.11.yaml delete mode 100644 ci/linux_mpi_mpich_python3.12.yaml delete mode 100644 ci/linux_mpi_mpich_python3.9.yaml delete mode 100644 ci/linux_mpi_nompi_python3.10.yaml delete mode 100644 ci/linux_mpi_nompi_python3.11.yaml delete mode 100644 ci/linux_mpi_nompi_python3.12.yaml delete mode 100644 ci/linux_mpi_nompi_python3.9.yaml delete mode 100644 ci/linux_mpi_openmpi_python3.10.yaml delete mode 100644 ci/linux_mpi_openmpi_python3.11.yaml delete mode 100644 ci/linux_mpi_openmpi_python3.12.yaml delete mode 100644 ci/linux_mpi_openmpi_python3.9.yaml delete mode 100644 ci/osx_mpi_mpich_python3.10.yaml delete mode 100644 ci/osx_mpi_mpich_python3.11.yaml delete mode 100644 ci/osx_mpi_mpich_python3.12.yaml delete mode 100644 ci/osx_mpi_mpich_python3.9.yaml delete mode 100644 ci/osx_mpi_nompi_python3.10.yaml delete mode 100644 ci/osx_mpi_nompi_python3.11.yaml delete mode 100644 ci/osx_mpi_nompi_python3.12.yaml delete mode 100644 ci/osx_mpi_nompi_python3.9.yaml delete mode 100644 ci/osx_mpi_openmpi_python3.10.yaml delete mode 100644 ci/osx_mpi_openmpi_python3.11.yaml delete mode 100644 ci/osx_mpi_openmpi_python3.12.yaml delete mode 100644 ci/osx_mpi_openmpi_python3.9.yaml delete mode 100644 ci/template_linux.yaml delete mode 100644 ci/template_osx.yaml diff --git a/ci/generate.py b/ci/generate.py deleted file mode 100755 index 00911dbe5..000000000 --- a/ci/generate.py +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env python - -from jinja2 import Template - -for os in ['linux', 'osx']: - with open(f'template_{os}.yaml') as f: - template_test = f.read() - - template = Template(template_test) - for python in ['3.9', '3.10', '3.11', '3.12']: - for mpi in ['nompi', 'mpich', 'openmpi']: - script = template.render(python=python, mpi=mpi) - filename = f'{os}_mpi_{mpi}_python{python}.yaml' - with open(filename, 'w') as handle: - handle.write(script) diff --git a/ci/linux_mpi_mpich_python3.10.yaml b/ci/linux_mpi_mpich_python3.10.yaml deleted file mode 100644 index c26d996b0..000000000 --- a/ci/linux_mpi_mpich_python3.10.yaml +++ /dev/null @@ -1,34 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '10' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -mpi: -- mpich -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version \ No newline at end of file diff --git a/ci/linux_mpi_mpich_python3.11.yaml b/ci/linux_mpi_mpich_python3.11.yaml deleted file mode 100644 index a0f144520..000000000 --- a/ci/linux_mpi_mpich_python3.11.yaml +++ /dev/null @@ -1,34 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '10' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -mpi: -- mpich -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version \ No newline at end of file diff --git a/ci/linux_mpi_mpich_python3.12.yaml b/ci/linux_mpi_mpich_python3.12.yaml deleted file mode 100644 index 0c64c1058..000000000 --- a/ci/linux_mpi_mpich_python3.12.yaml +++ /dev/null @@ -1,34 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '10' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -mpi: -- mpich -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version diff --git a/ci/linux_mpi_mpich_python3.9.yaml b/ci/linux_mpi_mpich_python3.9.yaml deleted file mode 100644 index 64d5cfb24..000000000 --- a/ci/linux_mpi_mpich_python3.9.yaml +++ /dev/null @@ -1,34 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '10' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -mpi: -- mpich -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version \ No newline at end of file diff --git a/ci/linux_mpi_nompi_python3.10.yaml b/ci/linux_mpi_nompi_python3.10.yaml deleted file mode 100644 index ebc4e189b..000000000 --- a/ci/linux_mpi_nompi_python3.10.yaml +++ /dev/null @@ -1,34 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '10' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -mpi: -- nompi -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version \ No newline at end of file diff --git a/ci/linux_mpi_nompi_python3.11.yaml b/ci/linux_mpi_nompi_python3.11.yaml deleted file mode 100644 index 4eac26917..000000000 --- a/ci/linux_mpi_nompi_python3.11.yaml +++ /dev/null @@ -1,34 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '10' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -mpi: -- nompi -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version \ No newline at end of file diff --git a/ci/linux_mpi_nompi_python3.12.yaml b/ci/linux_mpi_nompi_python3.12.yaml deleted file mode 100644 index 064cab859..000000000 --- a/ci/linux_mpi_nompi_python3.12.yaml +++ /dev/null @@ -1,34 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '10' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -mpi: -- nompi -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version diff --git a/ci/linux_mpi_nompi_python3.9.yaml b/ci/linux_mpi_nompi_python3.9.yaml deleted file mode 100644 index 06afe943f..000000000 --- a/ci/linux_mpi_nompi_python3.9.yaml +++ /dev/null @@ -1,34 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '10' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -mpi: -- nompi -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version \ No newline at end of file diff --git a/ci/linux_mpi_openmpi_python3.10.yaml b/ci/linux_mpi_openmpi_python3.10.yaml deleted file mode 100644 index ebc01f6c7..000000000 --- a/ci/linux_mpi_openmpi_python3.10.yaml +++ /dev/null @@ -1,34 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '10' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -mpi: -- openmpi -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version \ No newline at end of file diff --git a/ci/linux_mpi_openmpi_python3.11.yaml b/ci/linux_mpi_openmpi_python3.11.yaml deleted file mode 100644 index 4e8ada1ee..000000000 --- a/ci/linux_mpi_openmpi_python3.11.yaml +++ /dev/null @@ -1,34 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '10' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -mpi: -- openmpi -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version \ No newline at end of file diff --git a/ci/linux_mpi_openmpi_python3.12.yaml b/ci/linux_mpi_openmpi_python3.12.yaml deleted file mode 100644 index ff13d1237..000000000 --- a/ci/linux_mpi_openmpi_python3.12.yaml +++ /dev/null @@ -1,34 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '10' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -mpi: -- openmpi -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version diff --git a/ci/linux_mpi_openmpi_python3.9.yaml b/ci/linux_mpi_openmpi_python3.9.yaml deleted file mode 100644 index 078751b61..000000000 --- a/ci/linux_mpi_openmpi_python3.9.yaml +++ /dev/null @@ -1,34 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '10' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -mpi: -- openmpi -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version \ No newline at end of file diff --git a/ci/osx_mpi_mpich_python3.10.yaml b/ci/osx_mpi_mpich_python3.10.yaml deleted file mode 100644 index 40393d319..000000000 --- a/ci/osx_mpi_mpich_python3.10.yaml +++ /dev/null @@ -1,40 +0,0 @@ -c_compiler: -- clang -c_compiler_version: -- '14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '14' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '11' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -macos_machine: -- x86_64-apple-darwin13.4.0 -mpi: -- mpich -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version \ No newline at end of file diff --git a/ci/osx_mpi_mpich_python3.11.yaml b/ci/osx_mpi_mpich_python3.11.yaml deleted file mode 100644 index 32e45d4d5..000000000 --- a/ci/osx_mpi_mpich_python3.11.yaml +++ /dev/null @@ -1,40 +0,0 @@ -c_compiler: -- clang -c_compiler_version: -- '14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '14' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '11' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -macos_machine: -- x86_64-apple-darwin13.4.0 -mpi: -- mpich -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version \ No newline at end of file diff --git a/ci/osx_mpi_mpich_python3.12.yaml b/ci/osx_mpi_mpich_python3.12.yaml deleted file mode 100644 index 6f5713405..000000000 --- a/ci/osx_mpi_mpich_python3.12.yaml +++ /dev/null @@ -1,40 +0,0 @@ -c_compiler: -- clang -c_compiler_version: -- '14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '14' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '11' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -macos_machine: -- x86_64-apple-darwin13.4.0 -mpi: -- mpich -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version diff --git a/ci/osx_mpi_mpich_python3.9.yaml b/ci/osx_mpi_mpich_python3.9.yaml deleted file mode 100644 index 00da90360..000000000 --- a/ci/osx_mpi_mpich_python3.9.yaml +++ /dev/null @@ -1,40 +0,0 @@ -c_compiler: -- clang -c_compiler_version: -- '14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '14' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '11' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -macos_machine: -- x86_64-apple-darwin13.4.0 -mpi: -- mpich -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version \ No newline at end of file diff --git a/ci/osx_mpi_nompi_python3.10.yaml b/ci/osx_mpi_nompi_python3.10.yaml deleted file mode 100644 index c96bdd2da..000000000 --- a/ci/osx_mpi_nompi_python3.10.yaml +++ /dev/null @@ -1,40 +0,0 @@ -c_compiler: -- clang -c_compiler_version: -- '14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '14' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '11' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -macos_machine: -- x86_64-apple-darwin13.4.0 -mpi: -- nompi -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version \ No newline at end of file diff --git a/ci/osx_mpi_nompi_python3.11.yaml b/ci/osx_mpi_nompi_python3.11.yaml deleted file mode 100644 index 3b62ff6cf..000000000 --- a/ci/osx_mpi_nompi_python3.11.yaml +++ /dev/null @@ -1,40 +0,0 @@ -c_compiler: -- clang -c_compiler_version: -- '14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '14' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '11' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -macos_machine: -- x86_64-apple-darwin13.4.0 -mpi: -- nompi -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version \ No newline at end of file diff --git a/ci/osx_mpi_nompi_python3.12.yaml b/ci/osx_mpi_nompi_python3.12.yaml deleted file mode 100644 index d12086158..000000000 --- a/ci/osx_mpi_nompi_python3.12.yaml +++ /dev/null @@ -1,40 +0,0 @@ -c_compiler: -- clang -c_compiler_version: -- '14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '14' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '11' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -macos_machine: -- x86_64-apple-darwin13.4.0 -mpi: -- nompi -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version diff --git a/ci/osx_mpi_nompi_python3.9.yaml b/ci/osx_mpi_nompi_python3.9.yaml deleted file mode 100644 index 96ab0b73c..000000000 --- a/ci/osx_mpi_nompi_python3.9.yaml +++ /dev/null @@ -1,40 +0,0 @@ -c_compiler: -- clang -c_compiler_version: -- '14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '14' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '11' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -macos_machine: -- x86_64-apple-darwin13.4.0 -mpi: -- nompi -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version \ No newline at end of file diff --git a/ci/osx_mpi_openmpi_python3.10.yaml b/ci/osx_mpi_openmpi_python3.10.yaml deleted file mode 100644 index d9a1c0b87..000000000 --- a/ci/osx_mpi_openmpi_python3.10.yaml +++ /dev/null @@ -1,40 +0,0 @@ -c_compiler: -- clang -c_compiler_version: -- '14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '14' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '11' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -macos_machine: -- x86_64-apple-darwin13.4.0 -mpi: -- openmpi -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.10.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version \ No newline at end of file diff --git a/ci/osx_mpi_openmpi_python3.11.yaml b/ci/osx_mpi_openmpi_python3.11.yaml deleted file mode 100644 index 6c5bf4834..000000000 --- a/ci/osx_mpi_openmpi_python3.11.yaml +++ /dev/null @@ -1,40 +0,0 @@ -c_compiler: -- clang -c_compiler_version: -- '14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '14' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '11' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -macos_machine: -- x86_64-apple-darwin13.4.0 -mpi: -- openmpi -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.11.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version \ No newline at end of file diff --git a/ci/osx_mpi_openmpi_python3.12.yaml b/ci/osx_mpi_openmpi_python3.12.yaml deleted file mode 100644 index 76fd793a1..000000000 --- a/ci/osx_mpi_openmpi_python3.12.yaml +++ /dev/null @@ -1,40 +0,0 @@ -c_compiler: -- clang -c_compiler_version: -- '14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '14' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '11' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -macos_machine: -- x86_64-apple-darwin13.4.0 -mpi: -- openmpi -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.12.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version diff --git a/ci/osx_mpi_openmpi_python3.9.yaml b/ci/osx_mpi_openmpi_python3.9.yaml deleted file mode 100644 index ff550f0b1..000000000 --- a/ci/osx_mpi_openmpi_python3.9.yaml +++ /dev/null @@ -1,40 +0,0 @@ -c_compiler: -- clang -c_compiler_version: -- '14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '14' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '11' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -macos_machine: -- x86_64-apple-darwin13.4.0 -mpi: -- openmpi -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.9.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version \ No newline at end of file diff --git a/ci/template_linux.yaml b/ci/template_linux.yaml deleted file mode 100644 index 99af99f4c..000000000 --- a/ci/template_linux.yaml +++ /dev/null @@ -1,34 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '10' -cxx_compiler: -- gxx -cxx_compiler_version: -- '10' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '10' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -mpi: -- {{ mpi }} -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- {{ python }}.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version \ No newline at end of file diff --git a/ci/template_osx.yaml b/ci/template_osx.yaml deleted file mode 100644 index db940ef08..000000000 --- a/ci/template_osx.yaml +++ /dev/null @@ -1,40 +0,0 @@ -c_compiler: -- clang -c_compiler_version: -- '14' -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '14' -fortran_compiler: -- gfortran -fortran_compiler_version: -- '11' -hdf5: -- 1.12.2 -libnetcdf: -- 4.8.1 -macos_machine: -- x86_64-apple-darwin13.4.0 -mpi: -- {{ mpi }} -mpich: -- '4' -netcdf_fortran: -- '4.6' -openmpi: -- '4' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- {{ python }}.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version \ No newline at end of file From 85a7a943719a16ee0d1c76f5d81d85904524b2f8 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Tue, 3 Dec 2024 17:02:34 +0100 Subject: [PATCH 4/6] Add python 3.13 to CI workflow --- .github/workflows/build_workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_workflow.yml b/.github/workflows/build_workflow.yml index 6bea7e4a8..27354005a 100644 --- a/.github/workflows/build_workflow.yml +++ b/.github/workflows/build_workflow.yml @@ -57,7 +57,7 @@ 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"] steps: - id: skip_check uses: fkirc/skip-duplicate-actions@master From e659cb7c4914dd65c2286d9b72008d4268ffe822 Mon Sep 17 00:00:00 2001 From: Althea Denlinger Date: Tue, 3 Dec 2024 08:16:30 -0800 Subject: [PATCH 5/6] Add python 3.13 to setup configuration --- conda/default.cfg | 2 +- setup.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/conda/default.cfg b/conda/default.cfg index ba4c1bfe4..b64072320 100644 --- a/conda/default.cfg +++ b/conda/default.cfg @@ -14,7 +14,7 @@ recreate = False suffix = # the python version -python = 3.12 +python = 3.13 # the MPI version (nompi, mpich or openmpi) mpi = nompi diff --git a/setup.py b/setup.py index ca2904d8e..228e11782 100644 --- a/setup.py +++ b/setup.py @@ -77,6 +77,7 @@ def package_files(directory, prefixes, extensions): '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=['compass', 'compass.*']), From 773ca5f57bb8ad879275403ca7534ccf610e8705 Mon Sep 17 00:00:00 2001 From: Althea Denlinger Date: Tue, 3 Dec 2024 08:17:15 -0800 Subject: [PATCH 6/6] Update docs to recommend latest python version --- docs/developers_guide/quick_start.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developers_guide/quick_start.rst b/docs/developers_guide/quick_start.rst index 2397e84f3..ede95cc8c 100644 --- a/docs/developers_guide/quick_start.rst +++ b/docs/developers_guide/quick_start.rst @@ -217,7 +217,7 @@ Optional flags Check to make sure expected commands are present ``--python`` - Select a particular python version (the default is currently 3.12) + Select a particular python version (the default is currently 3.13) ``--env_name`` Set the name of the environment (and the prefix for the activation script)