Skip to content

Commit 4136c0c

Browse files
authored
TST: remove 4 builds from travis that are on circleci (#15465)
1 parent f62e8f2 commit 4136c0c

File tree

2 files changed

+4
-110
lines changed

2 files changed

+4
-110
lines changed

.travis.yml

Lines changed: 0 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -91,21 +91,6 @@ matrix:
9191
packages:
9292
- libatlas-base-dev
9393
- gfortran
94-
# In allow_failures
95-
- python: 2.7
96-
env:
97-
- PYTHON_VERSION=2.7
98-
- JOB_NAME: "27_nslow_nnet_COMPAT"
99-
- TEST_ARGS="--skip-slow --skip-network"
100-
- LOCALE_OVERRIDE="it_IT.UTF-8"
101-
- INSTALL_TEST=true
102-
- JOB_TAG=_COMPAT
103-
- CACHE_NAME="27_nslow_nnet_COMPAT"
104-
- USE_CACHE=true
105-
addons:
106-
apt:
107-
packages:
108-
- language-pack-it
10994
# In allow_failures
11095
- python: 2.7
11196
env:
@@ -127,37 +112,6 @@ matrix:
127112
- BUILD_TEST=true
128113
- CACHE_NAME="27_build_test_conda"
129114
- USE_CACHE=true
130-
# In allow_failures
131-
- python: 3.4
132-
env:
133-
- PYTHON_VERSION=3.4
134-
- JOB_NAME: "34_nslow"
135-
- LOCALE_OVERRIDE="zh_CN.UTF-8"
136-
- TEST_ARGS="--skip-slow"
137-
- FULL_DEPS=true
138-
- CLIPBOARD=xsel
139-
- CACHE_NAME="34_nslow"
140-
- USE_CACHE=true
141-
addons:
142-
apt:
143-
packages:
144-
- xsel
145-
- language-pack-zh-hans
146-
# In allow_failures
147-
- python: 3.4
148-
env:
149-
- PYTHON_VERSION=3.4
150-
- JOB_NAME: "34_slow"
151-
- JOB_TAG=_SLOW
152-
- TEST_ARGS="--only-slow --skip-network"
153-
- FULL_DEPS=true
154-
- CLIPBOARD=xsel
155-
- CACHE_NAME="34_slow"
156-
- USE_CACHE=true
157-
addons:
158-
apt:
159-
packages:
160-
- xsel
161115
# In allow_failures
162116
- python: 3.5
163117
env:
@@ -173,16 +127,6 @@ matrix:
173127
packages:
174128
- libatlas-base-dev
175129
- gfortran
176-
# In allow_failures
177-
- python: 3.5
178-
env:
179-
- PYTHON_VERSION=3.5
180-
- JOB_NAME: "35_ascii"
181-
- JOB_TAG=_ASCII
182-
- TEST_ARGS="--skip-slow --skip-network"
183-
- LOCALE_OVERRIDE="C"
184-
- CACHE_NAME="35_ascii"
185-
- USE_CACHE=true
186130
# In allow_failures
187131
- python: 3.5
188132
env:
@@ -203,20 +147,6 @@ matrix:
203147
- FULL_DEPS=true
204148
- CACHE_NAME="27_slow"
205149
- USE_CACHE=true
206-
- python: 3.4
207-
env:
208-
- PYTHON_VERSION=3.4
209-
- JOB_NAME: "34_slow"
210-
- JOB_TAG=_SLOW
211-
- TEST_ARGS="--only-slow --skip-network"
212-
- FULL_DEPS=true
213-
- CLIPBOARD=xsel
214-
- CACHE_NAME="34_slow"
215-
- USE_CACHE=true
216-
addons:
217-
apt:
218-
packages:
219-
- xsel
220150
- python: 2.7
221151
env:
222152
- PYTHON_VERSION=2.7
@@ -227,21 +157,6 @@ matrix:
227157
- BUILD_TEST=true
228158
- CACHE_NAME="27_build_test_conda"
229159
- USE_CACHE=true
230-
- python: 3.4
231-
env:
232-
- PYTHON_VERSION=3.4
233-
- JOB_NAME: "34_nslow"
234-
- LOCALE_OVERRIDE="zh_CN.UTF-8"
235-
- TEST_ARGS="--skip-slow"
236-
- FULL_DEPS=true
237-
- CLIPBOARD=xsel
238-
- CACHE_NAME="34_nslow"
239-
- USE_CACHE=true
240-
addons:
241-
apt:
242-
packages:
243-
- xsel
244-
- language-pack-zh-hans
245160
- python: 3.5
246161
env:
247162
- PYTHON_VERSION=3.5
@@ -256,29 +171,6 @@ matrix:
256171
packages:
257172
- libatlas-base-dev
258173
- gfortran
259-
- python: 2.7
260-
env:
261-
- PYTHON_VERSION=2.7
262-
- JOB_NAME: "27_nslow_nnet_COMPAT"
263-
- TEST_ARGS="--skip-slow --skip-network"
264-
- LOCALE_OVERRIDE="it_IT.UTF-8"
265-
- INSTALL_TEST=true
266-
- JOB_TAG=_COMPAT
267-
- CACHE_NAME="27_nslow_nnet_COMPAT"
268-
- USE_CACHE=true
269-
addons:
270-
apt:
271-
packages:
272-
- language-pack-it
273-
- python: 3.5
274-
env:
275-
- PYTHON_VERSION=3.5
276-
- JOB_NAME: "35_ascii"
277-
- JOB_TAG=_ASCII
278-
- TEST_ARGS="--skip-slow --skip-network"
279-
- LOCALE_OVERRIDE="C"
280-
- CACHE_NAME="35_ascii"
281-
- USE_CACHE=true
282174
- python: 3.5
283175
env:
284176
- PYTHON_VERSION=3.5
@@ -299,7 +191,6 @@ before_install:
299191
- pwd
300192
- uname -a
301193
- python -V
302-
# git info & get tags
303194
- git --version
304195
- git tag
305196
- ci/before_install_travis.sh

circle.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@ machine:
33
# these are globally set
44
MINICONDA_DIR: /home/ubuntu/miniconda3
55

6+
67
database:
78
override:
89
- ./ci/install_db_circle.sh
910

11+
1012
checkout:
1113
post:
1214
# since circleci does a shallow fetch
1315
# we need to populate our tags
1416
- git fetch --depth=1000
15-
- git fetch --tags
17+
1618

1719
dependencies:
1820
override:
@@ -29,6 +31,7 @@ dependencies:
2931
esac
3032
- ./ci/show_circle.sh
3133

34+
3235
test:
3336
override:
3437
- case $CIRCLE_NODE_INDEX in 0) ./ci/run_circle.sh --skip-slow --skip-network ;; 1) ./ci/run_circle.sh --only-slow --skip-network ;; 2) ./ci/run_circle.sh --skip-slow --skip-network ;; 3) ./ci/run_circle.sh --skip-slow --skip-network ;; esac:

0 commit comments

Comments
 (0)