mirror of
https://github.com/encode/django-rest-framework.git
synced 2025-07-29 17:39:48 +03:00
added django 3.0 & removed vesion below 2.1 from martrix
This commit is contained in:
parent
89ac0a1c7e
commit
8c4e83c5df
|
@ -5,18 +5,15 @@ matrix:
|
||||||
fast_finish: true
|
fast_finish: true
|
||||||
include:
|
include:
|
||||||
|
|
||||||
- { 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=2.1 }
|
||||||
- { python: "3.5", env: DJANGO=2.2 }
|
- { python: "3.5", env: DJANGO=2.2 }
|
||||||
|
|
||||||
- { python: "3.6", env: DJANGO=1.11 }
|
- { python: "3.6", env: DJANGO=3.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=2.2 }
|
- { python: "3.6", env: DJANGO=2.2 }
|
||||||
- { python: "3.6", env: DJANGO=master }
|
- { python: "3.6", env: DJANGO=master }
|
||||||
|
|
||||||
- { python: "3.7", env: DJANGO=2.0 }
|
- { python: "3.7", env: DJANGO=3.0 }
|
||||||
- { python: "3.7", env: DJANGO=2.1 }
|
- { python: "3.7", env: DJANGO=2.1 }
|
||||||
- { python: "3.7", env: DJANGO=2.2 }
|
- { python: "3.7", env: DJANGO=2.2 }
|
||||||
- { python: "3.7", env: DJANGO=master }
|
- { python: "3.7", env: DJANGO=master }
|
||||||
|
@ -35,6 +32,7 @@ matrix:
|
||||||
|
|
||||||
allow_failures:
|
allow_failures:
|
||||||
- env: DJANGO=master
|
- env: DJANGO=master
|
||||||
|
- env: DJANGO=3.0
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- pip install tox tox-venv tox-travis
|
- pip install tox tox-venv tox-travis
|
||||||
|
|
8
tox.ini
8
tox.ini
|
@ -1,18 +1,17 @@
|
||||||
[tox]
|
[tox]
|
||||||
envlist =
|
envlist =
|
||||||
{py35,py36}-django111,
|
|
||||||
{py35,py36,py37}-django20,
|
|
||||||
{py35,py36,py37}-django21
|
{py35,py36,py37}-django21
|
||||||
{py35,py36,py37}-django22
|
{py35,py36,py37}-django22
|
||||||
|
{py36,py37}-django30,
|
||||||
{py36,py37}-djangomaster,
|
{py36,py37}-djangomaster,
|
||||||
base,dist,lint,docs,
|
base,dist,lint,docs,
|
||||||
|
|
||||||
[travis:env]
|
[travis:env]
|
||||||
DJANGO =
|
DJANGO =
|
||||||
1.11: django111
|
1.11: django111
|
||||||
2.0: django20
|
|
||||||
2.1: django21
|
2.1: django21
|
||||||
2.2: django22
|
2.2: django22
|
||||||
|
3.0: django30
|
||||||
master: djangomaster
|
master: djangomaster
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
|
@ -22,10 +21,9 @@ setenv =
|
||||||
PYTHONDONTWRITEBYTECODE=1
|
PYTHONDONTWRITEBYTECODE=1
|
||||||
PYTHONWARNINGS=once
|
PYTHONWARNINGS=once
|
||||||
deps =
|
deps =
|
||||||
django111: Django>=1.11,<2.0
|
|
||||||
django20: Django>=2.0,<2.1
|
|
||||||
django21: Django>=2.1,<2.2
|
django21: Django>=2.1,<2.2
|
||||||
django22: Django>=2.2,<3.0
|
django22: Django>=2.2,<3.0
|
||||||
|
django30: Django>=3.0a1,<3.1
|
||||||
djangomaster: https://github.com/django/django/archive/master.tar.gz
|
djangomaster: https://github.com/django/django/archive/master.tar.gz
|
||||||
-rrequirements/requirements-testing.txt
|
-rrequirements/requirements-testing.txt
|
||||||
-rrequirements/requirements-optionals.txt
|
-rrequirements/requirements-optionals.txt
|
||||||
|
|
Loading…
Reference in New Issue
Block a user