From ea026aac2d7c5bdb2922efd234abcc9891d86a16 Mon Sep 17 00:00:00 2001 From: Jesse Nusbaumer Date: Wed, 18 Oct 2023 11:53:25 -0600 Subject: [PATCH] Replace CIME branch with official tag, and now require python 3.8 or greater. --- .github/workflows/python_unit_tests.yml | 2 +- Externals.cfg | 5 ++--- cime_config/cam_config.py | 7 +++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/python_unit_tests.yml b/.github/workflows/python_unit_tests.yml index c6671cc4..316e146c 100644 --- a/.github/workflows/python_unit_tests.yml +++ b/.github/workflows/python_unit_tests.yml @@ -21,7 +21,7 @@ jobs: strategy: matrix: #All of these python versions will be used to run tests: - python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] fail-fast: false steps: # Acquire github action routines: diff --git a/Externals.cfg b/Externals.cfg index cb6237c9..5a9544c6 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -64,10 +64,9 @@ local_path = libraries/parallelio required = True [cime] -#tag = cime6.0.156 -branch = paramgen_py12 +tag = cime6.0.175 protocol = git -repo_url = https://github.com/nusbaume/cime +repo_url = https://github.com/ESMCI/cime local_path = cime required = True diff --git a/cime_config/cam_config.py b/cime_config/cam_config.py index b5b1afd7..8b35faa8 100644 --- a/cime_config/cam_config.py +++ b/cime_config/cam_config.py @@ -165,10 +165,9 @@ def __init__(self, case, case_log): and associated dictionary. """ - # Check if using python 3.7 or later. If not, - # then end build here: - if sys.version_info[0] < 3 or (sys.version_info[0] == 3 and sys.version_info[1] < 7): - emsg = "CAM requires python 3.7 or later, currently using python version" + # Check if using python 3.8 or later. If not, then end build here: + if sys.version_info[0] < 3 or (sys.version_info[0] == 3 and sys.version_info[1] < 8): + emsg = "SIMA requires python 3.8 or later, currently using python version" emsg += f" {sys.version_info[0]}.{sys.version_info[1]}" raise SystemError(emsg) #End if