From 1b1c624e42c6f152c5f308e973b75117b879ed42 Mon Sep 17 00:00:00 2001 From: ChengzhuZhang Date: Thu, 13 Jun 2019 15:13:15 -0700 Subject: [PATCH] Changes before release. --- Dockerfile | 2 +- acme_diags/__init__.py | 2 +- conda/e3sm_diags_env.yml | 2 +- conda/meta.yaml | 4 ++-- setup.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index fa0ca6f60..f860f4917 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ FROM continuumio/miniconda3:4.6.14 LABEL maintainer="zhang40@llnl.gov" -LABEL version="1.7.0" +LABEL version="1.7.1" # 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 be36d340b..3fc890d13 100644 --- a/acme_diags/__init__.py +++ b/acme_diags/__init__.py @@ -1,5 +1,5 @@ import os import sys -__version__ = 'v1.7.0' +__version__ = 'v1.7.1' INSTALL_PATH = os.path.join(sys.prefix, 'share/e3sm_diags/') diff --git a/conda/e3sm_diags_env.yml b/conda/e3sm_diags_env.yml index 83a0f5acb..4e83bf1d3 100644 --- a/conda/e3sm_diags_env.yml +++ b/conda/e3sm_diags_env.yml @@ -155,7 +155,7 @@ dependencies: - yaml=0.1.7 - zict=0.1.4 - zlib=1.2.11 - - e3sm_diags=1.7.0 + - e3sm_diags=1.7.1 - pip: - cdms2==3.0.0 - regrid2==3.0.0 diff --git a/conda/meta.yaml b/conda/meta.yaml index 953be4f41..5a5dbd10b 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,11 +1,11 @@ package: name: e3sm_diags - version: 1.7.0 + version: 1.7.1 source: #path: .. git_url: https://github.com/E3SM-Project/e3sm_diags - git_rev: v1.7.0 + git_rev: v1.7.1 build: number: 0 diff --git a/setup.py b/setup.py index 2ec9da28e..77b0fd517 100644 --- a/setup.py +++ b/setup.py @@ -75,7 +75,7 @@ def get_all_files_in_dir(directory, pattern): setup( name="e3sm_diags", - version="1.7.0", + version="1.7.1", author="Chengzhu (Jill) Zhang, Zeshawn Shaheen", author_email="zhang40@llnl.gov, shaheen2@llnl.gov", description="E3SM Diagnostics",