Skip to content

Commit

Permalink
CI: Fixed NumPy pinning in conda-build (#19575)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
TomAugspurger committed Feb 9, 2018
1 parent 7dcc864 commit a214915
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions ci/install_travis.sh
Expand Up @@ -110,7 +110,7 @@ if [ -e ${REQ} ]; then
fi

time conda install -n pandas pytest>=3.1.0
time pip install pytest-xdist moto
time pip install -q pytest-xdist moto

if [ "$LINT" ]; then
conda install flake8=3.4.1
Expand Down Expand Up @@ -181,10 +181,10 @@ elif [ "$CONDA_BUILD_TEST" ]; then

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

echo "[installing]"
conda install pandas --use-local
conda install pandas --use-local || exit 1

else

Expand Down
2 changes: 1 addition & 1 deletion ci/requirements-3.5_CONDA_BUILD_TEST.build
Expand Up @@ -2,5 +2,5 @@ python=3.5*
python-dateutil
pytz
nomkl
numpy=1.13*
numpy
cython
2 changes: 1 addition & 1 deletion ci/requirements-3.5_CONDA_BUILD_TEST.run
@@ -1,5 +1,5 @@
pytz
numpy=1.13*
numpy
openpyxl
xlsxwriter
xlrd
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements-3.5_CONDA_BUILD_TEST.sh
Expand Up @@ -8,4 +8,4 @@ echo "install 35 CONDA_BUILD_TEST"
conda remove -n pandas python-dateutil --force
pip install python-dateutil

conda install -n pandas -c conda-forge feather-format pyarrow=0.5.0
conda install -n pandas -c conda-forge feather-format pyarrow=0.7.1
2 changes: 1 addition & 1 deletion ci/requirements-3.6.build
Expand Up @@ -2,5 +2,5 @@ python=3.6*
python-dateutil
pytz
nomkl
numpy=1.13.*
numpy
cython
4 changes: 2 additions & 2 deletions conda.recipe/meta.yaml
Expand Up @@ -14,14 +14,14 @@ requirements:
build:
- python
- cython
- {{ pin_compatible('numpy', upper_bound='1.14') }}
- numpy 1.11.*
- setuptools >=3.3
- python-dateutil >=2.5.0
- pytz

run:
- python
- {{ pin_compatible('numpy', upper_bound='1.14') }}
- numpy >=1.11.*
- python-dateutil >=2.5.0
- pytz

Expand Down

0 comments on commit a214915

Please sign in to comment.