Skip to content

Commit a71a655

Browse files
committed
fix recipe
1 parent 09356e7 commit a71a655

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

ci/install_travis.sh

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@ conda config --set ssl_verify false || exit 1
5050
conda config --set quiet true --set always_yes true --set changeps1 false || exit 1
5151
conda update -q conda
5252

53-
if [ "$CONDA_BUILD_TEST" ]; then
54-
echo
55-
echo "[installing conda-build]"
56-
conda install conda-build
57-
fi
58-
5953
echo
6054
echo "[add channels]"
6155
conda config --remove channels defaults || exit 1
@@ -179,15 +173,15 @@ if [ "$PIP_BUILD_TEST" ]; then
179173

180174
elif [ "$CONDA_BUILD_TEST" ]; then
181175

176+
echo "[installing conda-build]"
177+
conda install conda-build
178+
182179
# build & install testing
183-
source deactivate
184180
echo "[building conda recipe]"
185-
artifact = $(conda build ./conda.recipe --numpy 1.11 --python 3.5 -q --output)
186-
conda build ./conda.recipe --numpy 1.13 --python 3.5 -q --no-test
181+
conda build ./conda.recipe --numpy 1.13 --python 3.5 -q
187182

188183
echo "[installing]"
189-
source activate pandas
190-
conda install "$artifact" --force
184+
conda install $(conda build ./conda.recipe --numpy 1.13 --python 3.5 --output)
191185

192186
else
193187

conda.recipe/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ requirements:
1414
build:
1515
- python
1616
- cython
17-
- numpy
17+
- {{ pin_compatible('numpy') }}
1818
- setuptools >=3.3
1919

2020
run:

0 commit comments

Comments
 (0)