Merge pull request #108 from pelson/biggus_update

Updated biggus, and pinned down to 27 and 34 builds. Python 3.5 needs to be done as a subsequent PR.
SciTools · Sep 16, 2015 · 616e9e5 · 616e9e5
2 parents e2696a4 + 15636b6
commit 616e9e5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -35,5 +35,5 @@ install:
     - obvci_install_conda_build_tools.py
 
 script:
-    - obvci_conda_build_dir.py ./ SciTools --channel main --build-condition "numpy >=1.8" "python >=2.7,<3|>=3.4"
+    - obvci_conda_build_dir.py ./ SciTools --channel main --build-condition "numpy >=1.8" "python >=2.7,<3|>=3.4,<3.5"
 
diff --git a/appveyor.yml b/appveyor.yml
@@ -19,13 +19,13 @@ environment:
       PY_CONDITION: "python >=2.7,<3"
     - TARGET_ARCH: "x86"
       CONDA_PY: "34"
-      PY_CONDITION: "python >=3.4"
+      PY_CONDITION: "python >=3.4,<3.5"
     - TARGET_ARCH: "x64"
       CONDA_PY: "27"
       PY_CONDITION: "python >=2.7,<3"
     - TARGET_ARCH: "x64"
       CONDA_PY: "34"
-      PY_CONDITION: "python >=3.4"
+      PY_CONDITION: "python >=3.4,<3.5"
 
 # We always use a 64-bit machine, but can build x86 distributions
 # with the TARGET_ARCH variable (which is used by CMD_IN_ENV).

diff --git a/biggus/meta.yaml b/biggus/meta.yaml
@@ -1,10 +1,10 @@
 package:
     name: biggus
-    version: "0.11.0"
+    version: "0.12.0"
 
 source:
     git_url: https://github.com/SciTools/biggus.git
-    git_tag: v0.11.0
+    git_tag: v0.12.0
 
 build:
   number: 0

diff --git a/scripts/run_docker_build.sh b/scripts/run_docker_build.sh
@@ -39,7 +39,7 @@ conda info
 unset LANG
 yum install -y expat-devel git autoconf libtool texinfo check-devel
 
-obvci_conda_build_dir.py /conda-recipes $UPLOAD_OWNER --build-condition "numpy >=1.8" "python >=2.7,<3|>=3.4"
+obvci_conda_build_dir.py /conda-recipes $UPLOAD_OWNER --build-condition "numpy >=1.8" "python >=2.7,<3|>=3.4,<3.5"
     
 EOF