From c0fdf84f1dc29296e3e41a75caf6fdb5a739a979 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 18 Nov 2019 13:38:41 +0000 Subject: [PATCH] First pass at Django 3.0 compat --- .travis.yml | 3 +++ requirements/requirements-optionals.txt | 2 +- tests/test_relations.py | 4 ++-- tox.ini | 3 +++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f89e77531..7266df2d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,13 +14,16 @@ matrix: - { python: "3.6", env: DJANGO=2.0 } - { python: "3.6", env: DJANGO=2.1 } - { python: "3.6", env: DJANGO=2.2 } + - { python: "3.6", env: DJANGO=3.0 } - { python: "3.6", env: DJANGO=master } - { python: "3.7", env: DJANGO=2.0 } - { python: "3.7", env: DJANGO=2.1 } - { python: "3.7", env: DJANGO=2.2 } + - { python: "3.7", env: DJANGO=3.0 } - { python: "3.7", env: DJANGO=master } + - { python: "3.8", env: DJANGO=3.0 } - { python: "3.8", env: DJANGO=master } - { python: "3.8", env: TOXENV=base } diff --git a/requirements/requirements-optionals.txt b/requirements/requirements-optionals.txt index a33248d10..14957a531 100644 --- a/requirements/requirements-optionals.txt +++ b/requirements/requirements-optionals.txt @@ -2,7 +2,7 @@ psycopg2-binary>=2.8.2, <2.9 markdown==3.1.1 pygments==2.4.2 -django-guardian==1.5.0 +django-guardian==2.1.0 django-filter>=2.2.0, <2.3 coreapi==2.3.1 coreschema==0.0.4 diff --git a/tests/test_relations.py b/tests/test_relations.py index c89293415..c669777c1 100644 --- a/tests/test_relations.py +++ b/tests/test_relations.py @@ -145,9 +145,9 @@ class TestProxiedPrimaryKeyRelatedField(APISimpleTestCase): assert representation == self.instance.pk.int -@override_settings(ROOT_URLCONF=[ +@override_settings(ROOT_URLCONF=( url(r'^example/(?P.+)/$', lambda: None, name='example'), -]) +)) class TestHyperlinkedRelatedField(APISimpleTestCase): def setUp(self): self.queryset = MockQueryset([ diff --git a/tox.ini b/tox.ini index 587c469b1..1153eae29 100644 --- a/tox.ini +++ b/tox.ini @@ -4,6 +4,7 @@ envlist = {py35,py36,py37}-django20, {py35,py36,py37}-django21 {py35,py36,py37}-django22 + {py36,py37,py38}-django30, {py36,py37,py38}-djangomaster, base,dist,lint,docs, @@ -13,6 +14,7 @@ DJANGO = 2.0: django20 2.1: django21 2.2: django22 + 3.0: django30 master: djangomaster [testenv] @@ -26,6 +28,7 @@ deps = django20: Django>=2.0,<2.1 django21: Django>=2.1,<2.2 django22: Django>=2.2,<3.0 + django30: Django==3.0rc1 djangomaster: https://github.com/django/django/archive/master.tar.gz -rrequirements/requirements-testing.txt -rrequirements/requirements-optionals.txt