Skip to content

Commit 60a65a1

Browse files
author
Ryan P Kilby
committed
Move to explicit Travis matrix
1 parent c4b068c commit 60a65a1

File tree

1 file changed

+12
-19
lines changed

1 file changed

+12
-19
lines changed

.travis.yml

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
language: python
22
cache: pip
33

4-
python:
5-
- "2.7"
6-
- "3.4"
7-
- "3.5"
8-
94
sudo: false
105

11-
env:
12-
- DJANGO=1.11
13-
- DJANGO=2.0
14-
- DJANGO=2.1
15-
- DJANGO=master
16-
176
matrix:
187
fast_finish: true
198
include:
20-
- { python: "3.6", env: DJANGO=master }
9+
- { python: "2.7", env: DJANGO=1.11 }
10+
11+
- { python: "3.4", env: DJANGO=1.11 }
12+
- { python: "3.4", env: DJANGO=2.0 }
13+
14+
- { python: "3.5", env: DJANGO=1.11 }
15+
- { python: "3.5", env: DJANGO=2.0 }
16+
- { python: "3.5", env: DJANGO=2.1 }
17+
- { python: "3.5", env: DJANGO=master }
18+
2119
- { python: "3.6", env: DJANGO=1.11 }
2220
- { python: "3.6", env: DJANGO=2.0 }
2321
- { python: "3.6", env: DJANGO=2.1 }
22+
- { python: "3.6", env: DJANGO=master }
23+
2424
- { python: "3.6", env: TOXENV=base }
2525
- { python: "2.7", env: TOXENV=lint }
2626
- { python: "2.7", env: TOXENV=docs }
@@ -33,13 +33,6 @@ matrix:
3333
- tox --installpkg ./dist/djangorestframework-*.whl
3434
- tox # test sdist
3535

36-
exclude:
37-
- { python: "2.7", env: DJANGO=master }
38-
- { python: "2.7", env: DJANGO=2.0 }
39-
- { python: "2.7", env: DJANGO=2.1 }
40-
- { python: "3.4", env: DJANGO=master }
41-
- { python: "3.4", env: DJANGO=2.1 }
42-
4336
allow_failures:
4437
- env: DJANGO=master
4538
- env: DJANGO=2.1

0 commit comments

Comments
 (0)