mirror of
https://github.com/encode/django-rest-framework.git
synced 2024-11-26 11:33:59 +03:00
Simplify job matrix on Travis (#6174)
* Move to explicit Travis matrix * Cleanup Python 3.6 matrix
This commit is contained in:
parent
ed6340ee76
commit
5174a26ec9
30
.travis.yml
30
.travis.yml
|
@ -1,26 +1,25 @@
|
||||||
language: python
|
language: python
|
||||||
cache: pip
|
cache: pip
|
||||||
|
|
||||||
python:
|
|
||||||
- "2.7"
|
|
||||||
- "3.4"
|
|
||||||
- "3.5"
|
|
||||||
|
|
||||||
sudo: false
|
sudo: false
|
||||||
|
|
||||||
env:
|
|
||||||
- DJANGO=1.11
|
|
||||||
- DJANGO=2.0
|
|
||||||
- DJANGO=2.1
|
|
||||||
- DJANGO=master
|
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
fast_finish: true
|
fast_finish: true
|
||||||
include:
|
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=1.11 }
|
||||||
- { python: "3.6", env: DJANGO=2.0 }
|
- { python: "3.6", env: DJANGO=2.0 }
|
||||||
- { python: "3.6", env: DJANGO=2.1 }
|
- { 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.0, dist: xenial, sudo: true }
|
||||||
- { python: "3.7", env: DJANGO=2.1, dist: xenial, sudo: true }
|
- { python: "3.7", env: DJANGO=2.1, dist: xenial, sudo: true }
|
||||||
|
@ -38,13 +37,6 @@ matrix:
|
||||||
- tox --installpkg ./dist/djangorestframework-*.whl
|
- tox --installpkg ./dist/djangorestframework-*.whl
|
||||||
- tox # test sdist
|
- 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:
|
allow_failures:
|
||||||
- env: DJANGO=master
|
- env: DJANGO=master
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user