From 0ade98a77cdc6c2f3c12cd58b94e5b339c3bf6a9 Mon Sep 17 00:00:00 2001 From: Dana Singh Date: Thu, 11 Jun 2026 15:06:11 -0400 Subject: [PATCH 1/5] Update submodules for 2026.01.beta1 release --- fre/gfdl_msd_schemas | 2 +- fre/mkmf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fre/gfdl_msd_schemas b/fre/gfdl_msd_schemas index ee6a34da8..33a5412b2 160000 --- a/fre/gfdl_msd_schemas +++ b/fre/gfdl_msd_schemas @@ -1 +1 @@ -Subproject commit ee6a34da83d89988c6813b24f87807099a572aee +Subproject commit 33a5412b2354adde4a7832eb81d4b8cbd965ffcb diff --git a/fre/mkmf b/fre/mkmf index a71029740..76aa55847 160000 --- a/fre/mkmf +++ b/fre/mkmf @@ -1 +1 @@ -Subproject commit a71029740c3ed13cdbfc3c89191b376e54971912 +Subproject commit 76aa558474bbbf5ad8fa792b84efbb6ad0145980 From e01113b9bff76f37221497123dd8cb33c869fbba Mon Sep 17 00:00:00 2001 From: Dana Singh Date: Thu, 11 Jun 2026 15:35:31 -0400 Subject: [PATCH 2/5] remove old submodules that are no longer there --- .github/PULL_REQUEST_TEMPLATE/release_procedure.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE/release_procedure.md b/.github/PULL_REQUEST_TEMPLATE/release_procedure.md index ab32d6ae5..fdef2aae9 100644 --- a/.github/PULL_REQUEST_TEMPLATE/release_procedure.md +++ b/.github/PULL_REQUEST_TEMPLATE/release_procedure.md @@ -20,8 +20,6 @@ Note: [fre-cli](https://github.com/NOAA-GFDL/fre-cli) and [fre-workflows](https: - **Submodules**: - `fre/gfdl_msd_schemas` - `fre/mkmf` - - `fre/tests/test_files/cmip6-cmor-tables` - - `fre/tests/test_files/cmip7-cmor-tables` **Note**: The release schedules of these submodules may vary from that of fre-cli From a2c28197f7521ee20d75b7b956eb6d20396b89c8 Mon Sep 17 00:00:00 2001 From: Dana Singh Date: Fri, 12 Jun 2026 10:16:18 -0400 Subject: [PATCH 3/5] Update 2026.01.alpha2 refs --- README.md | 10 +++++----- docs/usage/guides/fre_pp_guide.rst | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index fbcee6c32..b209a183a 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ loading fre-cli into a user's environment. ``` module use -a /ncrc/home2/fms/local/modulefiles -module load fre/2026.01.alpha2 +module load fre/2026.01.beta1 ``` #### Activate a shared conda environment: @@ -48,12 +48,12 @@ module load fre/2026.01.alpha2 - GFDL: ``` module load miniforge -conda activate /nbhome/fms/conda/envs/fre-2026.01.alpha2 +conda activate /nbhome/fms/conda/envs/fre-2026.01.beta1 ``` - Gaea: ``` module use /usw/conda/modulefiles -module load miniforge conda activate /ncrc/home2/fms/.conda/envs/fre-2026.01.alpha2 +module load miniforge conda activate /ncrc/home2/fms/.conda/envs/fre-2026.01.beta1 ``` ## Install via Conda @@ -64,8 +64,8 @@ of how to install fre-cli via conda: ``` conda config --append channels noaa-gfdl conda config --append channels conda-forge -conda create --name fre-2026.01.alpha2 --channel noaa-gfdl --channel conda-forge fre-cli::2026.01.alpha2 -conda activate fre-2026.01.alpha2 +conda create --name fre-2026.01.beta1 --channel noaa-gfdl --channel conda-forge fre-cli::2026.01.beta1 +conda activate fre-2026.01.beta1 # optional: install or load fre-nctools to gain access to regridding and certain time-averaging routines # add to your path like: export PATH=/path/to/your/fre-nctools/build/bin:$PATH # or if you have lmod/modules: module load fre-nctools/ diff --git a/docs/usage/guides/fre_pp_guide.rst b/docs/usage/guides/fre_pp_guide.rst index f3da863f5..494444d3f 100644 --- a/docs/usage/guides/fre_pp_guide.rst +++ b/docs/usage/guides/fre_pp_guide.rst @@ -6,7 +6,7 @@ Guide # Load cylc and FRE module load cylc - module load fre/2026.01.alpha2 + module load fre/2026.01.beta1 # Clone fre-workflows repository into ~/cylc-src/[experiment name]__[platform name]__[target name] fre pp checkout -e [experiment name] -p [platform] -t [target] @@ -29,7 +29,7 @@ Users can also run all fre pp subtools in one command: # Load cylc and FRE module load cylc - module load fre/2026.01.alpha2 + module load fre/2026.01.beta1 # Run all of fre pp fre pp all -e [experiment name] -p [platform] -t [target] -y [model yaml file] @@ -40,7 +40,7 @@ Users can also run all fre pp subtools in one command: # Load cylc and FRE module load cylc - module load fre/2026.01.alpha2 + module load fre/2026.01.beta1 # Clone fre-workflows repository into ~/cylc-src/[experiment name]__[platform name]__[target name] fre pp checkout -e [experiment name] -p [platform] -t [target] -b [branch or tag name] @@ -63,7 +63,7 @@ To run all fre pp subtools in one command: # Load cylc and FRE module load cylc - module load fre/2026.01.alpha2 + module load fre/2026.01.beta1 # Run all of fre pp fre pp all -e [experiment name] -p [platform] -t [target] -y [model yaml file] -b [branch or tag name] From 90730967f27b03b1a07ff13320bee4c889365d0b Mon Sep 17 00:00:00 2001 From: Chris Blanton Date: Fri, 12 Jun 2026 10:21:46 -0400 Subject: [PATCH 4/5] Update 2026.01.beta1 refs --- fre/__init__.py | 2 +- fre/tests/test_fre_cli.py | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/fre/__init__.py b/fre/__init__.py index 3a3702c89..dea5d7bc3 100644 --- a/fre/__init__.py +++ b/fre/__init__.py @@ -4,7 +4,7 @@ import logging import os -version = os.getenv("GIT_DESCRIBE_TAG", "2026.01.alpha2") +version = os.getenv("GIT_DESCRIBE_TAG", "2026.01.beta1") __version__ = version fre_logger = logging.getLogger(__name__) diff --git a/fre/tests/test_fre_cli.py b/fre/tests/test_fre_cli.py index f7fa283e8..f91e32950 100644 --- a/fre/tests/test_fre_cli.py +++ b/fre/tests/test_fre_cli.py @@ -35,18 +35,11 @@ def test_cli_fre_option_dne(): def test_fre_version(): ''' module import flavor of below cli test ''' - assert '2026.01.alpha2' == fre.version + assert '2026.01.beta1' == fre.version def test_cli_fre_version(): ''' fre --version ''' result = runner.invoke(fre.fre, args='--version') - expected_out = 'fre, version 2026.01.alpha2' + expected_out = 'fre, version 2026.01.beta1' assert all( [ result.exit_code == 0, expected_out in result.output ] ) - -#def test_fre_version_testing_tag(): -# ''' module import flavor of below cli test ''' -# result = subprocess.run(["git", "tag", "--list", "--sort=-creatordate"], text=True, check=True, capture_output=True) -# latest_testing_tag = result.stdout.split('\n')[0] -# -# assert '2026.01.alpha2' == latest_testing_tag From 2f5c81a509ec5a9864801a2123e9efce252e6b89 Mon Sep 17 00:00:00 2001 From: Dana Singh Date: Fri, 12 Jun 2026 10:34:59 -0400 Subject: [PATCH 5/5] Add note to update refs --- .github/PULL_REQUEST_TEMPLATE/release_procedure.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/PULL_REQUEST_TEMPLATE/release_procedure.md b/.github/PULL_REQUEST_TEMPLATE/release_procedure.md index fdef2aae9..9bb35b89a 100644 --- a/.github/PULL_REQUEST_TEMPLATE/release_procedure.md +++ b/.github/PULL_REQUEST_TEMPLATE/release_procedure.md @@ -42,6 +42,8 @@ Note: [fre-cli](https://github.com/NOAA-GFDL/fre-cli) and [fre-workflows](https: After the tag is pushed, CI will trigger the creation of a PR changing any reference to the previous tag with the new tag. Verify the tagged release is present [here](https://github.com/NOAA-GFDL/fre-cli/releases>) + **NOTE**: At the moment, it does not seem like the PR creation is working correctly. After tagging the fre-cli, please update version references throughout the documentation and fre-cli tests manually. + * [ ] 5. For a full release (only), create a the github release associated with the correct tag and generate the release notes. - In the release notes, be sure to link any alpha and beta tags that were tested for the release