Skip to content

Commit 3ab883f

Browse files
committed
TST: install dependencies with Conda on py3.6.
Cover dependency installation via Conda in one of the tests.
1 parent 852b2a3 commit 3ab883f

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.travis.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ install:
1919
- hash -r
2020
- conda config --set always_yes yes --set changeps1 no
2121
- conda config --add channels pandas
22+
- conda config --add channels conda-forge
2223
- conda update -q conda
2324
- conda info -a
2425
- conda create -n test-environment python=$PYTHON
@@ -31,8 +32,12 @@ install:
3132
conda install pandas=$PANDAS;
3233
fi
3334
- pip install coverage pytest pytest-cov flake8 codecov
34-
- REQ="ci/requirements-${PYTHON}-${PANDAS}.pip"
35-
- pip install -r $REQ
35+
- REQ="ci/requirements-${PYTHON}-${PANDAS}"
36+
- if [ -f "$REQ.pip" ]; then
37+
pip install -r "$REQ.pip";
38+
else
39+
conda install --file "$REQ.conda";
40+
fi
3641
- conda list
3742
- python setup.py install
3843

File renamed without changes.

0 commit comments

Comments
 (0)