From b3cebeb8b43417ded9d3f66a571ac1b704904190 Mon Sep 17 00:00:00 2001 From: chengzhuzhang Date: Tue, 28 May 2019 15:02:41 -0700 Subject: [PATCH] Changes before release. --- Dockerfile | 4 ++-- acme_diags/__init__.py | 2 +- conda/meta.yaml | 4 ++-- setup.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index e0e732ea9..c1af2455a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,8 @@ # that prevented the building process from working properly. FROM continuumio/miniconda:4.5.4 -LABEL maintainer="shaheen2@llnl.gov" -LABEL version="1.6.1" +LABEL maintainer="zhang40@llnl.gov" +LABEL version="1.7.0" # 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 f5c927caa..be36d340b 100644 --- a/acme_diags/__init__.py +++ b/acme_diags/__init__.py @@ -1,5 +1,5 @@ import os import sys -__version__ = 'v1.6.1' +__version__ = 'v1.7.0' INSTALL_PATH = os.path.join(sys.prefix, 'share/e3sm_diags/') diff --git a/conda/meta.yaml b/conda/meta.yaml index 5507039af..953be4f41 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -1,11 +1,11 @@ package: name: e3sm_diags - version: 1.6.1 + version: 1.7.0 source: #path: .. git_url: https://github.com/E3SM-Project/e3sm_diags - git_rev: v1.6.1 + git_rev: v1.7.0 build: number: 0 diff --git a/setup.py b/setup.py index 28c6f9d81..2ec9da28e 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.6.1", + version="1.7.0", author="Chengzhu (Jill) Zhang, Zeshawn Shaheen", author_email="zhang40@llnl.gov, shaheen2@llnl.gov", description="E3SM Diagnostics",