encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-28 17:09:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

First pass at Django 3.0 compat

Browse Source
This commit is contained in:
Tom Christie 2019-11-18 13:38:41 +00:00
parent a73d3c309f
commit c0fdf84f1d
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -14,13 +14,16 @@ matrix:
- { 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=2.2 }
- { python: "3.6", env: DJANGO=3.0 }
- { 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=2.2 }
- { python: "3.7", env: DJANGO=3.0 }
- { python: "3.7", env: DJANGO=master } - { python: "3.7", env: DJANGO=master }
- { python: "3.8", env: DJANGO=3.0 }
- { python: "3.8", env: DJANGO=master } - { python: "3.8", env: DJANGO=master }
- { python: "3.8", env: TOXENV=base } - { python: "3.8", env: TOXENV=base }

2
requirements/requirements-optionals.txt
View File

@ -2,7 +2,7 @@
psycopg2-binary>=2.8.2, <2.9 psycopg2-binary>=2.8.2, <2.9
markdown==3.1.1 markdown==3.1.1
pygments==2.4.2 pygments==2.4.2
django-guardian==1.5.0 django-guardian==2.1.0
django-filter>=2.2.0, <2.3 django-filter>=2.2.0, <2.3
coreapi==2.3.1 coreapi==2.3.1
coreschema==0.0.4 coreschema==0.0.4

4
tests/test_relations.py
View File

@ -145,9 +145,9 @@ class TestProxiedPrimaryKeyRelatedField(APISimpleTestCase):
assert representation == self.instance.pk.int assert representation == self.instance.pk.int
@override_settings(ROOT_URLCONF=[ @override_settings(ROOT_URLCONF=(
url(r'^example/(?P<name>.+)/$', lambda: None, name='example'), url(r'^example/(?P<name>.+)/$', lambda: None, name='example'),
]) ))
class TestHyperlinkedRelatedField(APISimpleTestCase): class TestHyperlinkedRelatedField(APISimpleTestCase):
def setUp(self): def setUp(self):
self.queryset = MockQueryset([ self.queryset = MockQueryset([

3
tox.ini
View File

@ -4,6 +4,7 @@ envlist =
{py35,py36,py37}-django20, {py35,py36,py37}-django20,
{py35,py36,py37}-django21 {py35,py36,py37}-django21
{py35,py36,py37}-django22 {py35,py36,py37}-django22
{py36,py37,py38}-django30,
{py36,py37,py38}-djangomaster, {py36,py37,py38}-djangomaster,
base,dist,lint,docs, base,dist,lint,docs,
@ -13,6 +14,7 @@ DJANGO =
2.0: django20 2.0: django20
2.1: django21 2.1: django21
2.2: django22 2.2: django22
3.0: django30
master: djangomaster master: djangomaster
[testenv] [testenv]
@ -26,6 +28,7 @@ deps =
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.2,<3.0 django22: Django>=2.2,<3.0
django30: Django==3.0rc1
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