Skip to content

CI: Fixed NumPy pinning in conda-build #19575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Feb 9, 2018
Merged

CI: Fixed NumPy pinning in conda-build #19575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
27dd02e
CI: Fixed NumPy pinning in conda-build
TomAugspurger Feb 7, 2018
4de1e1e
Unpin NumPy
TomAugspurger Feb 7, 2018
34d8d70
Pin numpy
TomAugspurger Feb 8, 2018
d7fc473
Unpin everywhere else
TomAugspurger Feb 8, 2018
562a827
Build vs. 1.11
TomAugspurger Feb 8, 2018
a576f34
remove one more pin
TomAugspurger Feb 8, 2018
167abdb
Remove one more pin
TomAugspurger Feb 8, 2018
6f5f87a
bump pyarrow
TomAugspurger Feb 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ci/install_travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
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
View file
Open in desktop
Original file line number Diff line number Diff line change
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
View file
Open in desktop
Original file line number Diff line number Diff line change
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
View file
Open in desktop
Original file line number Diff line number Diff line change
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
View file
Open in desktop
Original file line number Diff line number Diff line change
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