Merge pull request #203 from xylar/update_conda_recipe

Update package versions in conda recipe

.travis.yml

@@ -15,15 +15,18 @@ before_install:
       wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
     fi
   - bash miniconda.sh -b -p $HOME/miniconda
-  - export PATH="$HOME/miniconda/bin:$PATH"
+  - source $HOME/miniconda/etc/profile.d/conda.sh
+  - conda activate base
   - hash -r
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
   - conda config --set anaconda_upload no
 
-  - conda install python=$TRAVIS_PYTHON_VERSION cdp=1.1.0 vcs=2.12 vtk-cdat=7.1.0.2.12 vcsaddons=2.12 dv3d=2.12 cdms2=2.12 cdutil=2.12 genutil=2.12 cdtime=2.12 numpy "matplotlib<=2.0.2" cartopy beautifulsoup4 lxml flake8 -c conda-forge -c uvcdat -y
+  - conda create -n e3sm_diags python=$TRAVIS_PYTHON_VERSION cdp=1.4.2 vcs=8.1 vtk-cdat=8.2.0rc2.8.1 vcsaddons=8.1 dv3d=8.1 cdms2=3.1.2 cdutil=8.1 genutil=8.1.1 cdtime=3.1.2 numpy matplotlib cartopy beautifulsoup4 lxml flake8 -c conda-forge -c cdat -c cdat/label/v81 -y
+  - conda activate e3sm_diags
   - export UVCDAT_ANONYMOUS_LOG=False
 
+
 install:
   - python setup.py install
 

Dockerfile

@@ -5,7 +5,7 @@
 FROM continuumio/miniconda:4.5.4
 
 LABEL maintainer="[email protected]"
-LABEL version="1.6.0"
+LABEL version="1.6.1"
 
 # Copy the entire project dir because we'll install from source.
 COPY . .

acme_diags/__init__.py

@@ -1,5 +1,5 @@
 import os
 import sys
 
-__version__ = 'v1.6.0'
+__version__ = 'v1.6.1'
 INSTALL_PATH = os.path.join(sys.prefix, 'share/e3sm_diags/')

conda/conda_build_config.yaml

@@ -1,3 +1,4 @@
 python:
     - 2.7
     - 3.6
+    - 3.7

conda/meta.yaml

@@ -1,30 +1,34 @@
 package:
     name: e3sm_diags
-    version: 1.6.0
+    version: 1.6.1
 
 source:
+    #path: ..
     git_url: https://github.com/E3SM-Project/e3sm_diags
-    git_rev: v1.6.0
+    git_rev: v1.6.1
 
 build:
-    script: python setup.py install
+    number: 0
+    noarch: python
+    script: "{{ PYTHON }} -m pip install . --no-deps -vv"
 
 requirements:
-  build:
-    - python {{ python }}
+  host:
+    - python
     - setuptools
+    - pip
 
   run:
-    - python {{ python }}
-    - cdp 1.4.1
-    - vcs 8.0
-    - vtk-cdat 8.0.1.8.0
-    - vcsaddons 8.0
-    - dv3d 8.0
-    - cdms2 3.0.1
-    - cdutil 8.0
-    - genutil 8.0
-    - cdtime 3.0
+    - python
+    - cdp >=1.4.1
+    - vcs >=8.0
+    - vtk-cdat 8.2.0rc2.8.1
+    - vcsaddons >=8.0
+    - dv3d >=8.0
+    - cdms2 >=3.0.1
+    - cdutil >=8.0
+    - genutil >=8.0
+    - cdtime >=3.0
     - numpy
     - matplotlib
     - cartopy

setup.py

@@ -33,7 +33,7 @@ def get_all_files_in_dir(directory, pattern):
 rgb_files = get_all_files_in_dir('acme_diags/plot/colormaps', '*.rgb')
 control_runs_files = get_all_files_in_dir('acme_diags/driver/control_runs', '*.csv')
 
-INSTALL_PATH = os.path.join(sys.prefix, 'share/e3sm_diags/')
+INSTALL_PATH = 'share/e3sm_diags/'
 
 data_files = [
     (os.path.join(INSTALL_PATH, 'zonal_mean_xy'),
@@ -65,7 +65,7 @@ def get_all_files_in_dir(directory, pattern):
 
 setup(
     name="e3sm_diags",
-    version="1.6.0",
+    version="1.6.1",
     author="Chengzhu (Jill) Zhang, Zeshawn Shaheen",
     author_email="[email protected], [email protected]",
     description="E3SM Diagnostics",