Skip to content

Commit b98eea1

Browse files
jrebackNo-Stream
authored andcommitted
CI: move clipboard tests to an allowed-failure test (pandas-dev#18251)
CI: change 2.7-build_test -> 3.6-build_test
1 parent 6469d63 commit b98eea1

6 files changed

+22
-17
lines changed

.travis.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ matrix:
5252
- dist: trusty
5353
env:
5454
- JOB="3.5" TEST_ARGS="--skip-slow --skip-network" COVERAGE=true
55-
addons:
56-
apt:
57-
packages:
58-
- xsel
5955
- dist: trusty
6056
env:
6157
- JOB="3.6" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" CONDA_FORGE=true
@@ -66,7 +62,11 @@ matrix:
6662
# In allow_failures
6763
- dist: trusty
6864
env:
69-
- JOB="2.7_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true
65+
- JOB="3.6_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true
66+
addons:
67+
apt:
68+
packages:
69+
- xsel
7070
# In allow_failures
7171
- dist: trusty
7272
env:
@@ -75,17 +75,17 @@ matrix:
7575
- dist: trusty
7676
env:
7777
- JOB="3.6_DOC" DOC=true
78-
addons:
79-
apt:
80-
packages:
81-
- xsel
8278
allow_failures:
8379
- dist: trusty
8480
env:
8581
- JOB="2.7_SLOW" SLOW=true
8682
- dist: trusty
8783
env:
88-
- JOB="2.7_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true
84+
- JOB="3.6_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true
85+
addons:
86+
apt:
87+
packages:
88+
- xsel
8989
- dist: trusty
9090
env:
9191
- JOB="3.6_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate"

ci/requirements-2.7_BUILD_TEST.build

-6
This file was deleted.

ci/requirements-3.6_BUILD_TEST.build

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
python=3.6*
2+
python-dateutil
3+
pytz
4+
nomkl
5+
numpy
6+
cython

ci/requirements-2.7_BUILD_TEST.sh renamed to ci/requirements-3.6_BUILD_TEST.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
source activate pandas
44

5-
echo "install 27 BUILD_TEST"
5+
echo "install 36 BUILD_TEST"
66

77
conda install -n pandas -c conda-forge pyarrow dask

ci/script_multi.sh

+5
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ if [ "$BUILD_TEST" ]; then
2727
echo "[running]"
2828
cd /tmp
2929
unset PYTHONPATH
30+
31+
echo "[build-test: single]"
32+
python -c 'import pandas; pandas.test(["--skip-slow", "--skip-network", "-r xX", "-m single"])'
33+
34+
echo "[build-test: not single]"
3035
python -c 'import pandas; pandas.test(["-n 2", "--skip-slow", "--skip-network", "-r xX", "-m not single"])'
3136

3237
elif [ "$DOC" ]; then

0 commit comments

Comments
 (0)