V3.1.0 1 (#36)

* version 3.1.1 * add conda_build_config.yaml * fix conda upload for new recipe * unpin conda-build to get the latest * only need to upload once * upload cdtime once * add conda-upload to macos py3
CDAT · Feb 7, 2019 · 12e2287 · 12e2287
1 parent b8c370e
commit 12e2287
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -88,7 +88,6 @@ jobs:
       - run: *create_conda_env
       - run: *setup_cdtime
       - run: *run_cdtime_tests
-      - run: *upload_cdtime
       - store_artifacts:
           path: tests_html
           destination: tests_html
@@ -124,7 +123,6 @@ jobs:
       - run: *create_conda_env
       - run: *setup_cdtime
       - run: *run_cdtime_tests
-      - run: *upload_cdtime
       - store_artifacts:
           path: tests_html
           destination: tests_html
@@ -160,5 +158,4 @@ workflows:
            requires:
               - linux_cdtime_py2
 
-
 
diff --git a/ci-support/conda_upload.sh b/ci-support/conda_upload.sh
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
 PKG_NAME=cdtime
 USER=cdat
-export VERSION="3.1.0"
+export VERSION="3.1.1"
 echo "Trying to upload to conda"
 echo ""
 echo "Activating base env"
 source activate base
 echo "Making sure conda-build is installed"
-conda install "conda-build<3.10"
+conda install conda-build
 echo "Updating conda"
 conda update -y -q conda
 if [ `uname` == "Linux" ]; then
@@ -35,6 +35,5 @@ ln -s ../recipe cdtime
 export BRANCH=${CIRCLE_BRANCH}
 python ./prep_for_build.py  -b ${BRANCH}
 
-conda build ${PKG_NAME} -c cdat/label/unstable -c conda-forge  --python 2.7
-conda build ${PKG_NAME} -c cdat/label/unstable -c conda-forge  --python 3.6
+conda build ${PKG_NAME} -c cdat/label/unstable -c cdat/label/nightly -c conda-forge  
 anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l $LABEL $CONDA_BLD_PATH/$OS/${PKG_NAME}-$VERSION.`date +%Y*`0.tar.bz2 --force
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -0,0 +1,8 @@
+python:
+    - 3.7
+    - 3.6
+    - 2.7
+
+numpy:
+    - 1.14
+
-Original file line number
+Diff line change
@@ -0,0 +1,8 @@
+    python:
+        - 3.7
+        - 3.6
+        - 2.7
+    numpy:
+        - 1.14