File tree Expand file tree Collapse file tree 2 files changed +9
-4
lines changed Expand file tree Collapse file tree 2 files changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -5,8 +5,8 @@ language: python
55env :
66 - PYTHON=2.7 PANDAS=0.19.2 COVERAGE='false' LINT='true'
77 - PYTHON=3.5 PANDAS=0.18.1 COVERAGE='true' LINT='false'
8- - PYTHON=3.6 PANDAS=0.20.1 COVERAGE='false' LINT='true '
9- - PYTHON=3.6 PANDAS=MASTER COVERAGE='false' LINT='false '
8+ - PYTHON=3.6 PANDAS=0.20.1 COVERAGE='false' LINT='false '
9+ - PYTHON=3.6 PANDAS=MASTER COVERAGE='false' LINT='true '
1010
1111before_install :
1212 - echo "before_install"
@@ -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.
You can’t perform that action at this time.
0 commit comments