From 5552e344e9bf993e00875dda2f2816e3a9e76ed7 Mon Sep 17 00:00:00 2001 From: Ryan Forsyth Date: Wed, 2 Jun 2021 16:10:33 -0700 Subject: [PATCH] v2.5.0rc2 update --- Dockerfile | 2 +- acme_diags/__init__.py | 2 +- conda/e3sm_diags_env.yml | 2 +- conda/meta.yaml | 2 +- setup.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index f2d90bc2d..e65156f9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ FROM continuumio/miniconda3:4.6.14 LABEL maintainer="zhang40@llnl.gov" -LABEL version="2.5.0rc1" +LABEL version="2.5.0rc2" # Copy the entire project dir because we'll install from source. COPY . . diff --git a/acme_diags/__init__.py b/acme_diags/__init__.py index e1de372d6..c59eb5fb0 100644 --- a/acme_diags/__init__.py +++ b/acme_diags/__init__.py @@ -1,7 +1,7 @@ import os import sys -__version__ = "v2.5.0rc1" +__version__ = "v2.5.0rc2" 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/conda/e3sm_diags_env.yml b/conda/e3sm_diags_env.yml index b3da26c07..0213e2d6b 100644 --- a/conda/e3sm_diags_env.yml +++ b/conda/e3sm_diags_env.yml @@ -20,5 +20,5 @@ dependencies: - netcdf4=1.5.6 # Additional # ============== - - e3sm_diags=2.5.0rc1 + - e3sm_diags=2.5.0rc2 prefix: /opt/miniconda3/envs/e3sm_diags_env diff --git a/conda/meta.yaml b/conda/meta.yaml index f02c43773..c5b9fd9f9 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,5 +1,5 @@ {% set name = "e3sm_diags" %} -{% set version = "2.5.0rc1" %} +{% set version = "2.5.0rc2" %} package: name: {{ name|lower }} diff --git a/setup.py b/setup.py index d480ffb56..84813bf24 100644 --- a/setup.py +++ b/setup.py @@ -110,7 +110,7 @@ def get_all_files_in_dir(directory, pattern): setup( name="e3sm_diags", - version="2.5.0rc1", + version="2.5.0rc2", author="Chengzhu (Jill) Zhang, Tom Vo, Ryan Forsyth, Chris Golaz and Zeshawn Shaheen", author_email="zhang40@llnl.gov", description="E3SM Diagnostics",