encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-13 05:06:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Updated tox/travis to point to Django main branch. (#7827)

Browse Source
This commit is contained in:
Carlton Gibson 2021-03-11 11:26:11 +01:00 committed by GitHub
parent 39a98c80a6
commit f070619061
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -20,11 +20,11 @@ matrix:
- { python: "3.8", env: DJANGO=3.0 } - { python: "3.8", env: DJANGO=3.0 }
- { python: "3.8", env: DJANGO=3.1 } - { python: "3.8", env: DJANGO=3.1 }
- { python: "3.8", env: DJANGO=3.2 } - { 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.1 }
- { python: "3.9", env: DJANGO=3.2 } - { 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=base }
- { python: "3.8", env: TOXENV=lint } - { python: "3.8", env: TOXENV=lint }
@ -39,7 +39,7 @@ matrix:
- tox # test sdist - tox # test sdist
allow_failures: allow_failures:
- env: DJANGO=master - env: DJANGO=main
- env: DJANGO=3.2 - env: DJANGO=3.2
install: install:

6
tox.ini
View File

@ -4,7 +4,7 @@ envlist =
{py36,py37,py38}-django30, {py36,py37,py38}-django30,
{py36,py37,py38,py39}-django31, {py36,py37,py38,py39}-django31,
{py36,py37,py38,py39}-django32, {py36,py37,py38,py39}-django32,
{py38,py39}-djangomaster, {py38,py39}-djangomain,
base,dist,lint,docs, base,dist,lint,docs,
[travis:env] [travis:env]
@ -13,7 +13,7 @@ DJANGO =
3.0: django30 3.0: django30
3.1: django31 3.1: django31
3.2: django32 3.2: django32
master: djangomaster main: djangomain
[testenv] [testenv]
commands = python -W error::DeprecationWarning -W error::PendingDeprecationWarning runtests.py --fast --coverage {posargs} commands = python -W error::DeprecationWarning -W error::PendingDeprecationWarning runtests.py --fast --coverage {posargs}
@ -26,7 +26,7 @@ deps =
django30: Django>=3.0,<3.1 django30: Django>=3.0,<3.1
django31: Django>=3.1,<3.2 django31: Django>=3.1,<3.2
django32: Django>=3.2a1,<4.0 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-testing.txt
-rrequirements/requirements-optionals.txt -rrequirements/requirements-optionals.txt