Skip to content

Commit ae8eecd

Browse files
committed
Merge pull request #17 from bashtage/binstar-fix
FIX: Binstar files updated for 2.0
2 parents 6d9b77c + ebccb44 commit ae8eecd

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

building/binstar/meta.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ requirements:
1212
build:
1313
- python
1414
- setuptools
15-
- cython
15+
- cython 0.20*
1616
- numpy
1717
- scipy
1818
- pandas

building/binstar_linux.sh building/binstar_unix.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/bash
22
cd ..
33

4+
export VERSION=2.0
45
## detect OS
56
if [ "$(uname)" == "Darwin" ]; then
67
export OS=osx-64
@@ -21,7 +22,7 @@ do
2122
for NPY in "${NPY_VERSIONS[@]}"
2223
do
2324
export CONDA_NPY=$NPY
24-
binstar remove bashtage/arch/1.0/${OS}/arch-1.0-np${NPY}py${PY}_0.tar.bz2 -f
25+
binstar remove bashtage/arch/${VERSION}/${OS}/arch-${VERSION}-np${NPY}py${PY}_0.tar.bz2 -f
2526
conda build ./building/binstar
2627
done
2728
done

building/binstar_windows.bat

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Setlocal EnableDelayedExpansion
33
REM Get current directory
44
SET CURRENT_WORKING_DIR=%~dp0
55
REM Python and NumPy versions
6+
set VERSION=2.0
67
set PY_VERSION=27 33 34
78
set NPY_VERSION=18 19
89

@@ -34,7 +35,7 @@ set NPY_VERSION=18 19
3435
echo Python: !CONDA_PY!, NumPy: !CONDA_NPY!
3536

3637
REM Remove from binstar
37-
binstar remove bashtage/arch/1.0/win-64\arch-1.0-np!CONDA_NPY!py!CONDA_PY!_0.tar.bz2 --force
38+
binstar remove bashtage/arch/!VERSION!/win-64\arch-!VERSION!-np!CONDA_NPY!py!CONDA_PY!_0.tar.bz2 --force
3839
cd %CURRENT_WORKING_DIR%
3940
conda build binstar
4041

0 commit comments

Comments
 (0)