Skip to content

Commit f03b2eb

Browse files
committed
Merge pull request #11081 from jreback/pip
CI: support *.pip for installations
2 parents 391fd79 + 0f2108a commit f03b2eb

7 files changed

+13
-3
lines changed

ci/install_conda.sh

+7-3
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,20 @@ conda config --set ssl_verify false || exit 1
7878
# Useful for debugging any issues with conda
7979
conda info -a || exit 1
8080

81+
REQ="ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.txt"
8182
conda create -n pandas python=$TRAVIS_PYTHON_VERSION || exit 1
82-
conda install -n pandas --file=ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.txt || exit 1
83+
conda install -n pandas --file=${REQ} || exit 1
8384

8485
conda install -n pandas pip setuptools nose || exit 1
8586
conda remove -n pandas pandas
8687

8788
source activate pandas
8889

89-
pip install -U blosc # See https://github.com/pydata/pandas/pull/9783
90-
python -c 'import blosc; blosc.print_versions()'
90+
# we may have additional pip installs
91+
REQ="ci/requirements-${TRAVIS_PYTHON_VERSION}${JOB_TAG}.pip"
92+
if [ -e ${REQ} ]; then
93+
pip install -r $REQ
94+
fi
9195

9296
# set the compiler cache to work
9397
if [ "$IRON_TOKEN" ]; then

ci/requirements-2.6.pip

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blosc

ci/requirements-2.7.pip

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blosc

ci/requirements-2.7_LOCALE.pip

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blosc

ci/requirements-3.3.pip

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blosc

ci/requirements-3.4.pip

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blosc

pandas/util/print_versions.py

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ def show_versions(as_json=False):
7272
("patsy", lambda mod: mod.__version__),
7373
("dateutil", lambda mod: mod.__version__),
7474
("pytz", lambda mod: mod.VERSION),
75+
("blosc", lambda mod: mod.__version__),
7576
("bottleneck", lambda mod: mod.__version__),
7677
("tables", lambda mod: mod.__version__),
7778
("numexpr", lambda mod: mod.__version__),

0 commit comments

Comments
 (0)