mirror of
https://github.com/encode/django-rest-framework.git
synced 2024-11-22 01:26:53 +03:00
Updated tox/travis to point to Django main
branch. (#7827)
This commit is contained in:
parent
39a98c80a6
commit
f070619061
|
@ -20,11 +20,11 @@ matrix:
|
|||
- { python: "3.8", env: DJANGO=3.0 }
|
||||
- { python: "3.8", env: DJANGO=3.1 }
|
||||
- { python: "3.8", env: DJANGO=3.2 }
|
||||
- { python: "3.8", env: DJANGO=master }
|
||||
- { python: "3.8", env: DJANGO=main }
|
||||
|
||||
- { python: "3.9", env: DJANGO=3.1 }
|
||||
- { python: "3.9", env: DJANGO=3.2 }
|
||||
- { python: "3.9", env: DJANGO=master }
|
||||
- { python: "3.9", env: DJANGO=main }
|
||||
|
||||
- { python: "3.8", env: TOXENV=base }
|
||||
- { python: "3.8", env: TOXENV=lint }
|
||||
|
@ -39,7 +39,7 @@ matrix:
|
|||
- tox # test sdist
|
||||
|
||||
allow_failures:
|
||||
- env: DJANGO=master
|
||||
- env: DJANGO=main
|
||||
- env: DJANGO=3.2
|
||||
|
||||
install:
|
||||
|
|
6
tox.ini
6
tox.ini
|
@ -4,7 +4,7 @@ envlist =
|
|||
{py36,py37,py38}-django30,
|
||||
{py36,py37,py38,py39}-django31,
|
||||
{py36,py37,py38,py39}-django32,
|
||||
{py38,py39}-djangomaster,
|
||||
{py38,py39}-djangomain,
|
||||
base,dist,lint,docs,
|
||||
|
||||
[travis:env]
|
||||
|
@ -13,7 +13,7 @@ DJANGO =
|
|||
3.0: django30
|
||||
3.1: django31
|
||||
3.2: django32
|
||||
master: djangomaster
|
||||
main: djangomain
|
||||
|
||||
[testenv]
|
||||
commands = python -W error::DeprecationWarning -W error::PendingDeprecationWarning runtests.py --fast --coverage {posargs}
|
||||
|
@ -26,7 +26,7 @@ deps =
|
|||
django30: Django>=3.0,<3.1
|
||||
django31: Django>=3.1,<3.2
|
||||
django32: Django>=3.2a1,<4.0
|
||||
djangomaster: https://github.com/django/django/archive/master.tar.gz
|
||||
djangomain: https://github.com/django/django/archive/main.tar.gz
|
||||
-rrequirements/requirements-testing.txt
|
||||
-rrequirements/requirements-optionals.txt
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user