Skip to content

Commit a214915

Browse files
CI: Fixed NumPy pinning in conda-build (#19575)
* CI: Fixed NumPy pinning in conda-build * Unpin NumPy Quite install * Pin numpy * Unpin everywhere else * Build vs. 1.11 * remove one more pin * Remove one more pin * bump pyarrow
1 parent 7dcc864 commit a214915

6 files changed

+9
-9
lines changed

ci/install_travis.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ if [ -e ${REQ} ]; then
110110
fi
111111

112112
time conda install -n pandas pytest>=3.1.0
113-
time pip install pytest-xdist moto
113+
time pip install -q pytest-xdist moto
114114

115115
if [ "$LINT" ]; then
116116
conda install flake8=3.4.1
@@ -181,10 +181,10 @@ elif [ "$CONDA_BUILD_TEST" ]; then
181181

182182
# build & install testing
183183
echo "[building conda recipe]"
184-
time conda build ./conda.recipe --numpy 1.13 --python 3.5 -q --no-test
184+
time conda build ./conda.recipe --python 3.5 -q --no-test || exit 1
185185

186186
echo "[installing]"
187-
conda install pandas --use-local
187+
conda install pandas --use-local || exit 1
188188

189189
else
190190

ci/requirements-3.5_CONDA_BUILD_TEST.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ python=3.5*
22
python-dateutil
33
pytz
44
nomkl
5-
numpy=1.13*
5+
numpy
66
cython

ci/requirements-3.5_CONDA_BUILD_TEST.run

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pytz
2-
numpy=1.13*
2+
numpy
33
openpyxl
44
xlsxwriter
55
xlrd

ci/requirements-3.5_CONDA_BUILD_TEST.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ echo "install 35 CONDA_BUILD_TEST"
88
conda remove -n pandas python-dateutil --force
99
pip install python-dateutil
1010

11-
conda install -n pandas -c conda-forge feather-format pyarrow=0.5.0
11+
conda install -n pandas -c conda-forge feather-format pyarrow=0.7.1

ci/requirements-3.6.build

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ python=3.6*
22
python-dateutil
33
pytz
44
nomkl
5-
numpy=1.13.*
5+
numpy
66
cython

conda.recipe/meta.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ requirements:
1414
build:
1515
- python
1616
- cython
17-
- {{ pin_compatible('numpy', upper_bound='1.14') }}
17+
- numpy 1.11.*
1818
- setuptools >=3.3
1919
- python-dateutil >=2.5.0
2020
- pytz
2121

2222
run:
2323
- python
24-
- {{ pin_compatible('numpy', upper_bound='1.14') }}
24+
- numpy >=1.11.*
2525
- python-dateutil >=2.5.0
2626
- pytz
2727

0 commit comments

Comments
 (0)