Skip to content

Commit 1abaa0c

Browse files
jrebackmattip
jreback
authored and
mattip
committed
CI: typo in .travis.yml for print_skipped
CI: linted .travis.yml CI: removed CLIPBOARD env variables as not used closes pandas-dev#15803
1 parent 1b5a182 commit 1abaa0c

File tree

1 file changed

+16
-79
lines changed

1 file changed

+16
-79
lines changed

‎.travis.yml

+16-79
Original file line numberDiff line numberDiff line change
@@ -27,63 +27,37 @@ matrix:
2727
- language: objective-c
2828
os: osx
2929
compiler: clang
30-
osx_image: xcode6.4
3130
cache:
3231
ccache: true
3332
directories:
3433
- $HOME/.cache # cython cache
3534
- $HOME/.ccache # compiler cache
3635
env:
37-
- PYTHON_VERSION=3.5
38-
- JOB_NAME: "35_osx"
39-
- TEST_ARGS="--skip-slow --skip-network"
40-
- JOB_TAG=_OSX
41-
- TRAVIS_PYTHON_VERSION=3.5
42-
- USE_CACHE=true
36+
- PYTHON_VERSION=3.5 JOB_NAME="35_osx" TEST_ARGS="--skip-slow --skip-network" JOB_TAG="_OSX" TRAVIS_PYTHON_VERSION=3.5 USE_CACHE=true
4337
- python: 2.7
4438
env:
45-
- PYTHON_VERSION=2.7
46-
- JOB_NAME: "27_slow_nnet_LOCALE"
47-
- TEST_ARGS="--only-slow --skip-network"
48-
- LOCALE_OVERRIDE="zh_CN.UTF-8"
49-
- JOB_TAG=_LOCALE
50-
- USE_CACHE=true
39+
- PYTHON_VERSION=2.7 JOB_NAME="27_slow_nnet_LOCALE" TEST_ARGS="--only-slow --skip-network" LOCALE_OVERRIDE="zh_CN.UTF-8" JOB_TAG="_LOCALE" USE_CACHE=true
5140
addons:
5241
apt:
5342
packages:
5443
- language-pack-zh-hans
5544
- python: 2.7
5645
env:
57-
- PYTHON_VERSION=2.7
58-
- JOB_NAME: "27_nslow"
59-
- TEST_ARGS="--skip-slow"
60-
- CLIPBOARD_GUI=gtk2
61-
- LINT=true
62-
- USE_CACHE=true
46+
- PYTHON_VERSION=2.7 JOB_NAME="27_nslow" TEST_ARGS="--skip-slow" LINT=true USE_CACHE=true
6347
addons:
6448
apt:
6549
packages:
6650
- python-gtk2
6751
- python: 3.5
6852
env:
69-
- PYTHON_VERSION=3.5
70-
- JOB_NAME: "35_nslow"
71-
- TEST_ARGS="--skip-slow --skip-network"
72-
- CLIPBOARD=xsel
73-
- COVERAGE=true
74-
- USE_CACHE=true
53+
- PYTHON_VERSION=3.5 JOB_NAME="35_nslow" TEST_ARGS="--skip-slow --skip-network" COVERAGE=true USE_CACHE=true
7554
addons:
7655
apt:
7756
packages:
7857
- xsel
7958
- python: 3.6
8059
env:
81-
- PYTHON_VERSION=3.6
82-
- JOB_NAME: "36"
83-
- TEST_ARGS="--skip-slow --skip-network"
84-
- PANDAS_TESTING_MODE="deprecate"
85-
- CONDA_FORGE=true
86-
- USE_CACHE=true
60+
- PYTHON_VERSION=3.6 JOB_NAME="36" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" CONDA_FORGE=true USE_CACHE=true
8761
addons:
8862
apt:
8963
packages:
@@ -92,68 +66,32 @@ matrix:
9266
# In allow_failures
9367
- python: 2.7
9468
env:
95-
- PYTHON_VERSION=2.7
96-
- JOB_NAME: "27_slow"
97-
- JOB_TAG=_SLOW
98-
- TEST_ARGS="--only-slow --skip-network"
99-
- USE_CACHE=true
69+
- PYTHON_VERSION=2.7 JOB_NAME="27_slow" JOB_TAG="_SLOW" TEST_ARGS="--only-slow --skip-network" USE_CACHE=true
10070
# In allow_failures
10171
- python: 2.7
10272
env:
103-
- PYTHON_VERSION=2.7
104-
- JOB_NAME: "27_build_test"
105-
- JOB_TAG=_BUILD_TEST
106-
- TEST_ARGS="--skip-slow"
107-
- BUILD_TEST=true
108-
- USE_CACHE=true
73+
- PYTHON_VERSION=2.7 JOB_NAME="27_build_test" JOB_TAG="_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true USE_CACHE=true
10974
# In allow_failures
11075
- python: 3.5
11176
env:
112-
- PYTHON_VERSION=3.5
113-
- JOB_NAME: "35_numpy_dev"
114-
- JOB_TAG=_NUMPY_DEV
115-
- TEST_ARGS="--skip-slow --skip-network"
116-
- PANDAS_TESTING_MODE="deprecate"
117-
- USE_CACHE=true
77+
- PYTHON_VERSION=3.5 JOB_NAME="35_numpy_dev" JOB_TAG="_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" USE_CACHE=true
11878
# In allow_failures
11979
- python: 3.5
12080
env:
121-
- PYTHON_VERSION=3.5
122-
- JOB_NAME: "doc_build"
123-
- DOC_BUILD=true
124-
- JOB_TAG=_DOC_BUILD
125-
- USE_CACHE=true
81+
- PYTHON_VERSION=3.5 JOB_NAME="doc_build" DOC_BUILD=true JOB_TAG="_DOC_BUILD" USE_CACHE=true
12682
allow_failures:
12783
- python: 2.7
12884
env:
129-
- PYTHON_VERSION=2.7
130-
- JOB_NAME: "27_slow"
131-
- JOB_TAG=_SLOW
132-
- TEST_ARGS="--only-slow --skip-network"
133-
- USE_CACHE=true
85+
- PYTHON_VERSION=2.7 JOB_NAME="27_slow" JOB_TAG="_SLOW" TEST_ARGS="--only-slow --skip-network" USE_CACHE=true
13486
- python: 2.7
13587
env:
136-
- PYTHON_VERSION=2.7
137-
- JOB_NAME: "27_build_test"
138-
- JOB_TAG=_BUILD_TEST
139-
- TEST_ARGS="--skip-slow"
140-
- BUILD_TEST=true
141-
- USE_CACHE=true
88+
- PYTHON_VERSION=2.7 JOB_NAME="27_build_test" JOB_TAG="_BUILD_TEST" TEST_ARGS="--skip-slow" BUILD_TEST=true USE_CACHE=true
14289
- python: 3.5
14390
env:
144-
- PYTHON_VERSION=3.5
145-
- JOB_NAME: "35_numpy_dev"
146-
- JOB_TAG=_NUMPY_DEV
147-
- TEST_ARGS="--skip-slow --skip-network"
148-
- PANDAS_TESTING_MODE="deprecate"
149-
- USE_CACHE=true
91+
- PYTHON_VERSION=3.5 JOB_NAME="35_numpy_dev" JOB_TAG="_NUMPY_DEV" TEST_ARGS="--skip-slow --skip-network" PANDAS_TESTING_MODE="deprecate" USE_CACHE=true
15092
- python: 3.5
15193
env:
152-
- PYTHON_VERSION=3.5
153-
- JOB_NAME: "doc_build"
154-
- DOC_BUILD=true
155-
- JOB_TAG=_DOC_BUILD
156-
- USE_CACHE=true
94+
- PYTHON_VERSION=3.5 JOB_NAME="doc_build" DOC_BUILD=true JOB_TAG="_DOC_BUILD" USE_CACHE=true
15795

15896
before_install:
15997
- echo "before_install"
@@ -165,7 +103,7 @@ before_install:
165103
- git --version
166104
- git tag
167105
- ci/before_install_travis.sh
168-
- export DISPLAY=:99.0
106+
- export DISPLAY=":99.0"
169107

170108
install:
171109
- echo "install start"
@@ -194,12 +132,11 @@ after_success:
194132

195133
after_script:
196134
- echo "after_script start"
197-
- ci/install_test.sh
198135
- source activate pandas && python -c "import pandas; pandas.show_versions();"
199-
- if [ "$DOC_BUILD"]; then
136+
- if [ -e /tmp/single.xml ]; then
200137
ci/print_skipped.py /tmp/single.xml;
201138
fi
202-
- if [ "$DOC_BUILD"]; then
139+
- if [ -e /tmp/multiple.xml ]; then
203140
ci/print_skipped.py /tmp/multiple.xml;
204141
fi
205142
- echo "after_script done"

0 commit comments

Comments
 (0)