diff --git a/conda-env/prod.yml b/conda-env/prod.yml index f8c0f32f8..888dbca01 100644 --- a/conda-env/prod.yml +++ b/conda-env/prod.yml @@ -8,5 +8,5 @@ dependencies: # ================= - python=3.9.10 - pip=22.0.3 - - e3sm_diags=2.7.0rc2 + - e3sm_diags=2.7.0 prefix: /opt/miniconda3/envs/e3sm_diags_prod diff --git a/docs/source/dev_guide/releasing-e3sm-diags.rst b/docs/source/dev_guide/releasing-e3sm-diags.rst index 7b799cbb5..58c018c65 100644 --- a/docs/source/dev_guide/releasing-e3sm-diags.rst +++ b/docs/source/dev_guide/releasing-e3sm-diags.rst @@ -20,8 +20,8 @@ Bumping the Version # Prepend "v" to # For release candidates, append "rc" to - git checkout -b v - git push --set-upstream origin v + git checkout -b bump/v + git push --set-upstream origin bump/v 3. Bump version using tbump. @@ -44,7 +44,7 @@ Bumping the Version => Would run these git commands $ git add --update $ git commit --message Bump to 2.6.0 - $ git push origin v2.6.0 + $ git push origin bump/v2.6.0 :: Looking good? (y/N) > diff --git a/e3sm_diags/__init__.py b/e3sm_diags/__init__.py index aa8738cc9..ca0d659a6 100644 --- a/e3sm_diags/__init__.py +++ b/e3sm_diags/__init__.py @@ -1,7 +1,7 @@ import os import sys -__version__ = "v2.7.0rc2" +__version__ = "v2.7.0" INSTALL_PATH = os.path.join(sys.prefix, "share/e3sm_diags/") # Disable MPI in cdms2, which is not currently supported by E3SM-unified diff --git a/setup.py b/setup.py index da7afb778..9f9cac5d5 100644 --- a/setup.py +++ b/setup.py @@ -146,7 +146,7 @@ def get_all_files_in_dir(directory, pattern): "Programming Language :: Python :: 3.10", ], name="e3sm_diags", - version="2.7.0rc2", + version="2.7.0", author="Chengzhu (Jill) Zhang, Tom Vo, Ryan Forsyth, Chris Golaz and Zeshawn Shaheen", author_email="zhang40@llnl.gov", description="E3SM Diagnostics", diff --git a/tbump.toml b/tbump.toml index a3c5070c7..79890353b 100644 --- a/tbump.toml +++ b/tbump.toml @@ -2,7 +2,7 @@ github_url = "https://github.com/E3SM-Project/e3sm_diags" [version] -current = "2.7.0rc2" +current = "2.7.0" # Example of a semver regexp. # Make sure this matches current_version before