Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE/release_procedure.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -44,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
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,20 @@ 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:

- 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
Expand All @@ -67,8 +67,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/<version>
Expand Down
8 changes: 4 additions & 4 deletions docs/usage/guides/fre_pp_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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]
Expand All @@ -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]
Expand All @@ -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]
2 changes: 1 addition & 1 deletion fre/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down
2 changes: 1 addition & 1 deletion fre/gfdl_msd_schemas
2 changes: 1 addition & 1 deletion fre/mkmf
11 changes: 2 additions & 9 deletions fre/tests/test_fre_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading