Skip to content

Commit

Permalink
change_before_release2.1.1 (#321)
Browse files Browse the repository at this point in the history
* change_before_release2.1.1

* address review comments
  • Loading branch information
chengzhuzhang authored Jul 31, 2020
1 parent 2589d17 commit e0720ac
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 28 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
FROM continuumio/miniconda3:4.6.14

LABEL maintainer="[email protected]"
LABEL version="2.1.0"
LABEL version="2.1.1"

# Copy the entire project dir because we'll install from source.
COPY . .
Expand Down
2 changes: 1 addition & 1 deletion acme_diags/__init__.py
Original file line number Diff line number Diff line change
@@ -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/')
20 changes: 0 additions & 20 deletions conda/0001-one-more-change-on-version-before-releasing.patch

This file was deleted.

2 changes: 1 addition & 1 deletion conda/e3sm_diags_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions conda/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "e3sm_diags" %}
{% set version = "2.1.0" %}
{% set version = "2.1.1" %}

package:
name: {{ name|lower }}
Expand All @@ -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

Expand All @@ -38,6 +36,7 @@ requirements:
- cartopy
- beautifulsoup4
- lxml
- dask 2.15.0

about:
home: https://github.com/E3SM-Project/e3sm_diags
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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="[email protected]",
description="E3SM Diagnostics",
Expand Down

0 comments on commit e0720ac

Please sign in to comment.