File tree 2 files changed +9
-4
lines changed
2 files changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -5,8 +5,8 @@ language: python
5
5
env :
6
6
- PYTHON=2.7 PANDAS=0.19.2 COVERAGE='false' LINT='true'
7
7
- 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 '
10
10
11
11
before_install :
12
12
- echo "before_install"
@@ -19,6 +19,7 @@ install:
19
19
- hash -r
20
20
- conda config --set always_yes yes --set changeps1 no
21
21
- conda config --add channels pandas
22
+ - conda config --add channels conda-forge
22
23
- conda update -q conda
23
24
- conda info -a
24
25
- conda create -n test-environment python=$PYTHON
@@ -31,8 +32,12 @@ install:
31
32
conda install pandas=$PANDAS;
32
33
fi
33
34
- 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
36
41
- conda list
37
42
- python setup.py install
38
43
File renamed without changes.
You can’t perform that action at this time.
0 commit comments