Skip to content

Commit

Permalink
Simplify job matrix on Travis (encode#6174)
Browse files Browse the repository at this point in the history
* Move to explicit Travis matrix

* Cleanup Python 3.6 matrix
  • Loading branch information
rpkilby authored and carltongibson committed Sep 17, 2018
1 parent ed6340e commit 5174a26
Showing 1 changed file with 11 additions and 19 deletions.
30 changes: 11 additions & 19 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
language: python
cache: pip

python:
- "2.7"
- "3.4"
- "3.5"

sudo: false

env:
- DJANGO=1.11
- DJANGO=2.0
- DJANGO=2.1
- DJANGO=master

matrix:
fast_finish: true
include:
- { python: "3.6", env: DJANGO=master }
- { python: "2.7", env: DJANGO=1.11 }

- { python: "3.4", env: DJANGO=1.11 }
- { python: "3.4", env: DJANGO=2.0 }

- { python: "3.5", env: DJANGO=1.11 }
- { python: "3.5", env: DJANGO=2.0 }
- { python: "3.5", env: DJANGO=2.1 }
- { python: "3.5", env: DJANGO=master }

- { python: "3.6", env: DJANGO=1.11 }
- { python: "3.6", env: DJANGO=2.0 }
- { python: "3.6", env: DJANGO=2.1 }
- { python: "3.6", env: DJANGO=master }

- { python: "3.7", env: DJANGO=2.0, dist: xenial, sudo: true }
- { python: "3.7", env: DJANGO=2.1, dist: xenial, sudo: true }
Expand All @@ -38,13 +37,6 @@ matrix:
- tox --installpkg ./dist/djangorestframework-*.whl
- tox # test sdist

exclude:
- { python: "2.7", env: DJANGO=master }
- { python: "2.7", env: DJANGO=2.0 }
- { python: "2.7", env: DJANGO=2.1 }
- { python: "3.4", env: DJANGO=master }
- { python: "3.4", env: DJANGO=2.1 }

allow_failures:
- env: DJANGO=master

Expand Down

0 comments on commit 5174a26

Please sign in to comment.