From 24a0d6f0cc0eb860e6dfe0b6a0fc523a439b7f48 Mon Sep 17 00:00:00 2001 From: Althea Denlinger Date: Tue, 10 Sep 2024 08:56:44 -0700 Subject: [PATCH 1/4] Update python versions in docs instructions --- docs/users_guide/quick_start.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/users_guide/quick_start.md b/docs/users_guide/quick_start.md index 04ef3af05..6c01b6284 100644 --- a/docs/users_guide/quick_start.md +++ b/docs/users_guide/quick_start.md @@ -73,7 +73,7 @@ if you don't already have it. Then, create a new conda environment (called `polaris` in this example) as follows: ```bash -conda create -n polaris -c conda-forge -c e3sm/label/polaris python=3.11 \ +conda create -n polaris -c conda-forge -c e3sm/label/polaris python=3.12 \ "polaris=*=mpi_mpich*" ``` @@ -85,7 +85,7 @@ system with its own MPI), use `"polaris=*=nompi*"` To get a specific version of polaris, you can instead run: ```bash -conda create -n polaris -c conda-forge -c e3sm/label/polaris python=3.11 \ +conda create -n polaris -c conda-forge -c e3sm/label/polaris python=3.12 \ "polaris=1.0.0=mpi_mpich*" ``` From 02cf091d971ab5c32e2cc7218e9e48e6f67f39fd Mon Sep 17 00:00:00 2001 From: Althea Denlinger Date: Tue, 10 Sep 2024 08:58:17 -0700 Subject: [PATCH 2/4] Add python 3.12 test to CI --- .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 00773abcb..79661553c 100644 --- a/.github/workflows/build_workflow.yml +++ b/.github/workflows/build_workflow.yml @@ -51,7 +51,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 From a883e93b5773a63f2374142477f686913287358f Mon Sep 17 00:00:00 2001 From: Althea Denlinger Date: Tue, 10 Sep 2024 08:59:10 -0700 Subject: [PATCH 3/4] Update python version in setup --- setup.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index fb2c5d124..3cddead30 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,13 +15,14 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 License :: OSI Approved :: BSD License Operating System :: OS Independent [options] packages = find: include_package_data = True -python_requires = >=3.9,<3.12 +python_requires = >=3.9,<=3.12 install_requires = cartopy cmocean From 7ebd6ee21109874167625507411fe4f87d289bff Mon Sep 17 00:00:00 2001 From: Althea Denlinger Date: Tue, 10 Sep 2024 08:59:42 -0700 Subject: [PATCH 4/4] Update python version in deploy --- deploy/conda-dev-spec.template | 2 +- deploy/default.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/conda-dev-spec.template b/deploy/conda-dev-spec.template index d22439ea8..76f0ff4c3 100644 --- a/deploy/conda-dev-spec.template +++ b/deploy/conda-dev-spec.template @@ -2,7 +2,7 @@ # $ conda create --name --file # Base -python>=3.9,<3.12 +python>=3.9,<=3.12 antimeridian cartopy cartopy_offlinedata diff --git a/deploy/default.cfg b/deploy/default.cfg index 8180be408..9ac940c4f 100644 --- a/deploy/default.cfg +++ b/deploy/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