Merge pull request #17 from bashtage/binstar-fix

FIX: Binstar files updated for 2.0
bashtage · Oct 16, 2014 · ae8eecd · ae8eecd
2 parents 6d9b77c + ebccb44
commit ae8eecd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/building/binstar/meta.yaml b/building/binstar/meta.yaml
@@ -12,7 +12,7 @@ requirements:
   build:
     - python
     - setuptools
-    - cython
+    - cython 0.20*
     - numpy
     - scipy
     - pandas

diff --git a/building/binstar_linux.sh → building/binstar_unix.sh b/building/binstar_linux.sh → building/binstar_unix.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 cd ..
 
+export VERSION=2.0
 ## detect OS
 if [ "$(uname)" == "Darwin" ]; then
     export OS=osx-64
@@ -21,7 +22,7 @@ do
     for NPY in "${NPY_VERSIONS[@]}"
     do
         export CONDA_NPY=$NPY
-        binstar remove bashtage/arch/1.0/${OS}/arch-1.0-np${NPY}py${PY}_0.tar.bz2 -f
+        binstar remove bashtage/arch/${VERSION}/${OS}/arch-${VERSION}-np${NPY}py${PY}_0.tar.bz2 -f
         conda build ./building/binstar
     done
 done
diff --git a/building/binstar_windows.bat b/building/binstar_windows.bat
@@ -3,6 +3,7 @@ Setlocal EnableDelayedExpansion
 REM Get current directory
 SET CURRENT_WORKING_DIR=%~dp0
 REM Python and NumPy versions
+set VERSION=2.0
 set PY_VERSION=27 33 34
 set NPY_VERSION=18 19
 
@@ -34,7 +35,7 @@ set NPY_VERSION=18 19
         echo Python: !CONDA_PY!, NumPy: !CONDA_NPY!
 
         REM Remove from binstar
-        binstar remove bashtage/arch/1.0/win-64\arch-1.0-np!CONDA_NPY!py!CONDA_PY!_0.tar.bz2 --force
+        binstar remove bashtage/arch/!VERSION!/win-64\arch-!VERSION!-np!CONDA_NPY!py!CONDA_PY!_0.tar.bz2 --force
         cd %CURRENT_WORKING_DIR%
         conda build binstar
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ requirements: @@
       build:
         - python
         - setuptools
-        - cython
+        - cython 0.20*
         - numpy
         - scipy
         - pandas
@@ Expand Down @@