From 36ec326d6386d7c61b18220e3c39c88d5d3c9947 Mon Sep 17 00:00:00 2001 From: Althea Denlinger Date: Wed, 4 Sep 2024 09:40:25 -0700 Subject: [PATCH 1/3] Remove 3.8 CI files --- ci/linux_mpi_mpich_python3.8.yaml | 34 ------------------------ ci/linux_mpi_nompi_python3.8.yaml | 34 ------------------------ ci/linux_mpi_openmpi_python3.8.yaml | 34 ------------------------ ci/osx_mpi_mpich_python3.8.yaml | 40 ----------------------------- ci/osx_mpi_nompi_python3.8.yaml | 40 ----------------------------- ci/osx_mpi_openmpi_python3.8.yaml | 40 ----------------------------- 6 files changed, 222 deletions(-) delete mode 100644 ci/linux_mpi_mpich_python3.8.yaml delete mode 100644 ci/linux_mpi_nompi_python3.8.yaml delete mode 100644 ci/linux_mpi_openmpi_python3.8.yaml delete mode 100644 ci/osx_mpi_mpich_python3.8.yaml delete mode 100644 ci/osx_mpi_nompi_python3.8.yaml delete mode 100644 ci/osx_mpi_openmpi_python3.8.yaml diff --git a/ci/linux_mpi_mpich_python3.8.yaml b/ci/linux_mpi_mpich_python3.8.yaml deleted file mode 100644 index 1738075354..0000000000 --- a/ci/linux_mpi_mpich_python3.8.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.8.* *_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.8.yaml b/ci/linux_mpi_nompi_python3.8.yaml deleted file mode 100644 index 65a451313d..0000000000 --- a/ci/linux_mpi_nompi_python3.8.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.8.* *_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.8.yaml b/ci/linux_mpi_openmpi_python3.8.yaml deleted file mode 100644 index 11712f8693..0000000000 --- a/ci/linux_mpi_openmpi_python3.8.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.8.* *_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.8.yaml b/ci/osx_mpi_mpich_python3.8.yaml deleted file mode 100644 index 01f85fd84b..0000000000 --- a/ci/osx_mpi_mpich_python3.8.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.8.* *_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.8.yaml b/ci/osx_mpi_nompi_python3.8.yaml deleted file mode 100644 index 67cc3dc396..0000000000 --- a/ci/osx_mpi_nompi_python3.8.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.8.* *_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.8.yaml b/ci/osx_mpi_openmpi_python3.8.yaml deleted file mode 100644 index 6ed250d5d2..0000000000 --- a/ci/osx_mpi_openmpi_python3.8.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.8.* *_cpython -zip_keys: -- - c_compiler_version - - cxx_compiler_version - - fortran_compiler_version \ No newline at end of file From 1ed765f50f165a62259680271ed3ec1549679b51 Mon Sep 17 00:00:00 2001 From: Althea Denlinger Date: Wed, 4 Sep 2024 09:46:05 -0700 Subject: [PATCH 2/3] Add 3.12 CI files --- ci/linux_mpi_mpich_python3.12.yaml | 34 +++++++++++++++++++++++ ci/linux_mpi_nompi_python3.12.yaml | 34 +++++++++++++++++++++++ ci/linux_mpi_openmpi_python3.12.yaml | 34 +++++++++++++++++++++++ ci/osx_mpi_mpich_python3.12.yaml | 40 ++++++++++++++++++++++++++++ ci/osx_mpi_nompi_python3.12.yaml | 40 ++++++++++++++++++++++++++++ ci/osx_mpi_openmpi_python3.12.yaml | 40 ++++++++++++++++++++++++++++ 6 files changed, 222 insertions(+) create mode 100644 ci/linux_mpi_mpich_python3.12.yaml create mode 100644 ci/linux_mpi_nompi_python3.12.yaml create mode 100644 ci/linux_mpi_openmpi_python3.12.yaml create mode 100644 ci/osx_mpi_mpich_python3.12.yaml create mode 100644 ci/osx_mpi_nompi_python3.12.yaml create mode 100644 ci/osx_mpi_openmpi_python3.12.yaml diff --git a/ci/linux_mpi_mpich_python3.12.yaml b/ci/linux_mpi_mpich_python3.12.yaml new file mode 100644 index 0000000000..0c64c1058f --- /dev/null +++ b/ci/linux_mpi_mpich_python3.12.yaml @@ -0,0 +1,34 @@ +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_nompi_python3.12.yaml b/ci/linux_mpi_nompi_python3.12.yaml new file mode 100644 index 0000000000..064cab859a --- /dev/null +++ b/ci/linux_mpi_nompi_python3.12.yaml @@ -0,0 +1,34 @@ +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_openmpi_python3.12.yaml b/ci/linux_mpi_openmpi_python3.12.yaml new file mode 100644 index 0000000000..ff13d1237f --- /dev/null +++ b/ci/linux_mpi_openmpi_python3.12.yaml @@ -0,0 +1,34 @@ +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/osx_mpi_mpich_python3.12.yaml b/ci/osx_mpi_mpich_python3.12.yaml new file mode 100644 index 0000000000..6f5713405e --- /dev/null +++ b/ci/osx_mpi_mpich_python3.12.yaml @@ -0,0 +1,40 @@ +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_nompi_python3.12.yaml b/ci/osx_mpi_nompi_python3.12.yaml new file mode 100644 index 0000000000..d12086158b --- /dev/null +++ b/ci/osx_mpi_nompi_python3.12.yaml @@ -0,0 +1,40 @@ +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_openmpi_python3.12.yaml b/ci/osx_mpi_openmpi_python3.12.yaml new file mode 100644 index 0000000000..76fd793a14 --- /dev/null +++ b/ci/osx_mpi_openmpi_python3.12.yaml @@ -0,0 +1,40 @@ +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 From 6aa959c3179bc0c720edc0ba182e76ad8e640e0b Mon Sep 17 00:00:00 2001 From: Althea Denlinger Date: Wed, 4 Sep 2024 09:56:55 -0700 Subject: [PATCH 3/3] Update supported python versions --- .github/workflows/build_workflow.yml | 2 +- ci/generate.py | 3 +-- conda/compass_env/spec-file.template | 2 +- conda/default.cfg | 2 +- docs/developers_guide/quick_start.rst | 2 +- setup.py | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_workflow.yml b/.github/workflows/build_workflow.yml index d98dec6392..b9a25dc259 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"] + python-version: ["3.9", "3.10", "3.11", "3.12"] steps: - id: skip_check uses: fkirc/skip-duplicate-actions@master diff --git a/ci/generate.py b/ci/generate.py index f3c9fa1966..00911dbe58 100755 --- a/ci/generate.py +++ b/ci/generate.py @@ -2,13 +2,12 @@ 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.8', '3.9', '3.10', '3.11']: + 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' diff --git a/conda/compass_env/spec-file.template b/conda/compass_env/spec-file.template index cac8fe4151..e7ae69b96d 100644 --- a/conda/compass_env/spec-file.template +++ b/conda/compass_env/spec-file.template @@ -2,7 +2,7 @@ # $ conda create --name --file # Base -python>=3.8 +python>=3.9 cartopy cartopy_offlinedata cmocean diff --git a/conda/default.cfg b/conda/default.cfg index ee044dc8aa..83e13ee115 100644 --- a/conda/default.cfg +++ b/conda/default.cfg @@ -14,7 +14,7 @@ recreate = False suffix = # the python version -python = 3.11 +python = 3.12 # the MPI version (nompi, mpich or openmpi) mpi = nompi diff --git a/docs/developers_guide/quick_start.rst b/docs/developers_guide/quick_start.rst index 26d960143d..d48ad1cec2 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.8) + Select a particular python version (the default is currently 3.12) ``--env_name`` Set the name of the environment (and the prefix for the activation script) diff --git a/setup.py b/setup.py index 3d908a91cd..ca2904d8e5 100644 --- a/setup.py +++ b/setup.py @@ -73,10 +73,10 @@ def package_files(directory, prefixes, extensions): 'Intended Audience :: Science/Research', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', 'Topic :: Scientific/Engineering', ], packages=find_packages(include=['compass', 'compass.*']),