Skip to content

Commit d7e8f31

Browse files
committed
CI: use conda defaults for 3.6 build
1 parent bd29a74 commit d7e8f31

6 files changed

+18
-21
lines changed

.travis.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,10 @@ matrix:
8080
apt:
8181
packages:
8282
- xsel
83-
- python: 3.6-dev
83+
- python: 3.6
8484
env:
8585
- PYTHON_VERSION=3.6
86-
- JOB_NAME: "36_dev"
87-
- JOB_TAG=_DEV
86+
- JOB_NAME: "36"
8887
- NOSE_ARGS="not slow and not network and not disabled"
8988
- PANDAS_TESTING_MODE="deprecate"
9089
addons:

ci/install-3.6_DEV.sh

-16
This file was deleted.

ci/install_travis.sh

+9-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,15 @@ if [ -e ${INSTALL} ]; then
9090
else
9191

9292
# create new env
93-
time conda create -n pandas python=$PYTHON_VERSION nose coverage flake8 || exit 1
93+
time conda create -n pandas python=$PYTHON_VERSION nose || exit 1
94+
95+
if [ "$COVERAGE" ]; then
96+
pip install coverage
97+
fi
98+
if [ "$LINT" ]; then
99+
conda install flake8
100+
pip install cpplint
101+
fi
94102
fi
95103

96104
# build deps

ci/lint.sh

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ source activate pandas
77
RET=0
88

99
if [ "$LINT" ]; then
10-
pip install cpplint
1110

1211
# pandas/rpy is deprecated and will be removed.
1312
# pandas/src is C code, so no need to search there.

ci/requirements-3.6.build

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
python-dateutil
2+
pytz
3+
numpy
4+
cython

ci/requirements-3.6.run

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
python-dateutil
2+
pytz
3+
numpy

0 commit comments

Comments
 (0)