Fix upload (#530)

* need to have jinja or both py2 and py3 have same name * removed nesii channel and uvcdat channel
PCMDI · Mar 29, 2018 · 8053132 · 8053132
1 parent 44c9d88
commit 8053132
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,8 +16,8 @@ before_install:
  - conda update -y -q conda
 
 script:
- - conda create -q -n py2 -c cdat/label/nightly -c nesii/label/dev-esmf -c conda-forge -c uvcdat -c pcmdi vcs vcsaddons cdp mesalib image-compare flake8 nose cia "proj4<5" "python<3"
- - conda create -q -n py3 -c cdat/label/nightly -c nesii/label/dev-esmf -c conda-forge -c uvcdat -c pcmdi vcs vcsaddons cdp mesalib image-compare flake8 nose cia "proj4<5" "python>3"
+ - conda create -q -n py2 -c cdat/label/nightly -c conda-forge -c cdat -c pcmdi vcs vcsaddons cdp mesalib image-compare flake8 nose cia "proj4<5" "python<3"
+ - conda create -q -n py3 -c cdat/label/nightly -c conda-forge -c cdat -c pcmdi vcs vcsaddons cdp mesalib image-compare flake8 nose cia "proj4<5" "python>3"
  # Useful for debugging any issues with conda
  - conda info -a
  - source activate py2

diff --git a/recipes/pcmdi_metrics/conda_upload.sh b/recipes/pcmdi_metrics/conda_upload.sh
@@ -31,8 +31,8 @@ source deactivate
 source activate root
 python ./prep_for_build.py -l 1.1.2
 echo "starting conda build"
-conda build pcmdi_metrics -c nesii/label/dev-esmf -c conda-forge -c uvcdat -c pcmdi --python=27
-conda build pcmdi_metrics -c nesii/label/dev-esmf -c conda-forge -c uvcdat -c pcmdi --python=36
+conda build pcmdi_metrics -c conda-forge -c cdat -c pcmdi --python=27
+conda build pcmdi_metrics -c conda-forge -c cdat -c pcmdi --python=36
 echo "starting anaconda upload"
 anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l nightly $CONDA_BLD_PATH/$OS/$PKG_NAME-*tar.bz2 --force
 
diff --git a/recipes/pcmdi_metrics/meta.yaml b/recipes/pcmdi_metrics/meta.yaml
@@ -1,6 +1,6 @@
 package:
  name: pcmdi_metrics
- version: 2.12.2018.02.08.16.44.{{ GIT_FULL_HASH }}
+ version: 1.1.2.2018.03.29.13.52.{{ GIT_DESCRIBE_HASH }}
 
 source:
  git_url: git:https://github.com/PCMDI/pcmdi_metrics
@@ -12,10 +12,11 @@ build:
 
 requirements:
  build:
- - python
+ - python {{ python}}
  - setuptools
  - numpy
  run:
+ - python {{ python }}
  - vcs >=2.10
  - vcsaddons >=2.10
  - cdms2 >=2.10
@@ -25,6 +26,7 @@ requirements:
  - matplotlib
  - numpy
  - cia
+ - proj4 <5
 
 
 about:

diff --git a/recipes/pcmdi_metrics/meta.yaml.in b/recipes/pcmdi_metrics/meta.yaml.in
@@ -12,10 +12,11 @@ build:
 
 requirements:
  build:
- - python
+ - python {{ python}}
  - setuptools
  - numpy
  run:
+ - python {{ python }}
  - vcs >=2.10
  - vcsaddons >=2.10
  - cdms2 >=2.10