Skip to content

Commit 262c5f1

Browse files
committed
CI: tests latest versions of openpyxl
1 parent c266dc3 commit 262c5f1

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

ci/install_conda.sh

+10-2
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,23 @@ 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+
# 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
95+
96+
# install blosc See https://github.com/pydata/pandas/pull/9783
97+
pip install -U blosc
9098
python -c 'import blosc; blosc.print_versions()'
9199

92100
# set the compiler cache to work

ci/requirements-3.3.pip

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

ci/requirements-3.3.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
python-dateutil
22
pytz=2013b
3-
openpyxl=1.6.2
43
xlsxwriter=0.4.6
54
xlrd=0.9.2
65
html5lib=1.0b2

0 commit comments

Comments
 (0)