From e0720ac1f3344767de43d3ac8e4cbacb9c29c410 Mon Sep 17 00:00:00 2001
From: Jill Chengzhu Zhang <zhang40@llnl.gov>
Date: Fri, 31 Jul 2020 00:33:12 -0700
Subject: [PATCH] change_before_release2.1.1 (#321)

* change_before_release2.1.1

* address review comments
---
 Dockerfile                                    |  2 +-
 acme_diags/__init__.py                        |  2 +-
 ...e-change-on-version-before-releasing.patch | 20 -------------------
 conda/e3sm_diags_env.yml                      |  2 +-
 conda/meta.yaml                               |  7 +++----
 setup.py                                      |  2 +-
 6 files changed, 7 insertions(+), 28 deletions(-)
 delete mode 100644 conda/0001-one-more-change-on-version-before-releasing.patch

diff --git a/Dockerfile b/Dockerfile
index 67cedc743..5d1d7ed51 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@
 FROM continuumio/miniconda3:4.6.14
 
 LABEL maintainer="zhang40@llnl.gov"
-LABEL version="2.1.0"
+LABEL version="2.1.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 ca4b74776..5e5fe19c1 100644
--- a/acme_diags/__init__.py
+++ b/acme_diags/__init__.py
@@ -1,5 +1,5 @@
 import os
 import sys
 
-__version__ = 'v2.1.0'
+__version__ = 'v2.1.1'
 INSTALL_PATH = os.path.join(sys.prefix, 'share/e3sm_diags/')
diff --git a/conda/0001-one-more-change-on-version-before-releasing.patch b/conda/0001-one-more-change-on-version-before-releasing.patch
deleted file mode 100644
index 73cf2bf3c..000000000
--- a/conda/0001-one-more-change-on-version-before-releasing.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 8b3b50b804aba393896addcd90fa740ae338d70e Mon Sep 17 00:00:00 2001
-From: chengzhuzhang <zhang40@llnl.gov>
-Date: Sun, 19 Jul 2020 23:09:48 -0700
-Subject: [PATCH] one more change on version before releasing
-
----
- acme_diags/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/acme_diags/__init__.py b/acme_diags/__init__.py
-index db469b6d..ca4b7477 100644
---- a/acme_diags/__init__.py
-+++ b/acme_diags/__init__.py
-@@ -1,5 +1,5 @@
- import os
- import sys
- 
--__version__ = 'v2.0.0'
-+__version__ = 'v2.1.0'
- 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 495a3f5a1..0685c78ad 100644
--- a/conda/e3sm_diags_env.yml
+++ b/conda/e3sm_diags_env.yml
@@ -171,7 +171,7 @@ dependencies:
   - zipp=0.6.0
   - zlib=1.2.11
   - zstd=1.4.3
-  - e3sm_diags=2.1.0
+  - e3sm_diags=2.1.1
   - pip:
     - cdms2==3.1.4
     - pyqt5-sip==4.19.18
diff --git a/conda/meta.yaml b/conda/meta.yaml
index e69cd2b6a..6200428d2 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = "e3sm_diags" %}
-{% set version = "2.1.0" %}
+{% set version = "2.1.1" %}
 
 package:
     name: {{ name|lower }}
@@ -8,11 +8,9 @@ package:
 source:
     url: https://github.com/E3SM-Project/e3sm_diags/archive/v{{ version }}.tar.gz
     sha256: 9c169c27fcdfec870b4e20fd71c24a3a426136424c32003bb9a714af157a3cb5
-    patches:
-      - 0001-one-more-change-on-version-before-releasing.patch
 
 build:
-    number: 2
+    number: 0
     noarch: python
     script: {{ PYTHON }} -m pip install . --no-deps -vv
 
@@ -38,6 +36,7 @@ requirements:
     - cartopy
     - beautifulsoup4
     - lxml
+    - dask 2.15.0
 
 about:
     home: https://github.com/E3SM-Project/e3sm_diags
diff --git a/setup.py b/setup.py
index 3e8a27160..b7012f983 100644
--- a/setup.py
+++ b/setup.py
@@ -92,7 +92,7 @@ def get_all_files_in_dir(directory, pattern):
 
 setup(
     name="e3sm_diags",
-    version="2.1.0",
+    version="2.1.1",
     author="Chengzhu (Jill) Zhang, Ryan Forsyth, Chris Golaz and Zeshawn Shaheen",
     author_email="zhang40@llnl.gov",
     description="E3SM Diagnostics",