encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-20 13:30:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added testing against Django 2.2a1. (#6422)

Browse Source 
* Added testing against Django 2.2a1.
* Allow failures for Django 2.2
This commit is contained in:
Asif Saif Uddin 2019-01-31 21:50:36 +06:00 committed by Carlton Gibson
parent 190f6201cb
commit 2b62941bb4
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -12,15 +12,18 @@ matrix:
- { python: "3.5", env: DJANGO=1.11 } - { python: "3.5", env: DJANGO=1.11 }
- { python: "3.5", env: DJANGO=2.0 } - { 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=master } - { 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=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=2.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=master } - { python: "3.7", env: DJANGO=master }
- { python: "3.7", env: TOXENV=base } - { python: "3.7", env: TOXENV=base }
@ -37,6 +40,7 @@ matrix:
allow_failures: allow_failures:
- env: DJANGO=master - env: DJANGO=master
- env: DJANGO=2.2
install: install:
- pip install tox tox-venv tox-travis - pip install tox tox-venv tox-travis

3
tox.ini
View File

@ -3,6 +3,7 @@ envlist =
{py27,py34,py35,py36}-django111, {py27,py34,py35,py36}-django111,
{py34,py35,py36,py37}-django20, {py34,py35,py36,py37}-django20,
{py35,py36,py37}-django21 {py35,py36,py37}-django21
{py35,py36,py37}-django22
{py35,py36,py37}-djangomaster, {py35,py36,py37}-djangomaster,
base,dist,lint,docs, base,dist,lint,docs,
@ -11,6 +12,7 @@ DJANGO =
1.11: django111 1.11: django111
2.0: django20 2.0: django20
2.1: django21 2.1: django21
2.2: django22
master: djangomaster master: djangomaster
[testenv] [testenv]
@ -23,6 +25,7 @@ deps =
django111: Django>=1.11,<2.0 django111: Django>=1.11,<2.0
django20: Django>=2.0,<2.1 django20: Django>=2.0,<2.1
django21: Django>=2.1,<2.2 django21: Django>=2.1,<2.2
django22: Django>=2.2a1,<3.0
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