Merge a1c328581f into f6c19e5eac

.travis.yml

@@ -12,6 +12,7 @@ env:
     - DJANGO=1.9
     - DJANGO=1.10
     - DJANGO=1.11
+    - DJANGO=2.0
     - DJANGO=master
 
 matrix:
@@ -21,6 +22,8 @@ matrix:
         env: DJANGO=master
       - python: "3.6"
         env: DJANGO=1.11
+      - python: "3.6"
+        env: DJANGO=2.0
       - python: "3.3"
         env: DJANGO=1.8
       - python: "2.7"
@@ -30,11 +33,14 @@ matrix:
     exclude:
       - python: "2.7"
         env: DJANGO=master
+      - python: "2.7"
+        env: DJANGO=2.0
       - python: "3.4"
         env: DJANGO=master
 
     allow_failures:
       - env: DJANGO=master
+      - env: DJANGO=2.0
 
 install:
     - pip install tox tox-travis

requirements/requirements-codestyle.txt

@@ -1,6 +1,6 @@
 # PEP8 code linting, which we run on all commits.
-flake8==2.4.0
+flake8==3.4.1
-pep8==1.5.7
+pep8==1.7.0
 
 # Sort and lint imports
 isort==4.2.5

requirements/requirements-documentation.txt

@@ -1,2 +1,2 @@
 # MkDocs to build our documentation.
-mkdocs==0.16.2
+mkdocs==0.16.3

requirements/requirements-optionals.txt

@@ -1,7 +1,7 @@
 # Optional packages which may be used with REST framework.
 pytz==2017.2
 markdown==2.6.4
-django-guardian==1.4.8
+django-guardian==1.4.9
 django-filter==1.0.4
-coreapi==2.2.4
+coreapi==2.3.1
 coreschema==0.0.4

requirements/requirements-packaging.txt

@@ -1,8 +1,8 @@
 # Wheel for PyPI installs.
-wheel==0.29.0
+wheel==0.30.0
 
 # Twine for secured PyPI uploads.
-twine==1.6.5
+twine==1.9.1
 
 # Transifex client for managing translation resources.
 transifex-client==0.11

requirements/requirements-testing.txt

@@ -1,4 +1,4 @@
 # PyTest for running the tests.
-pytest==3.0.5
+pytest==3.2.2
 pytest-django==3.1.2
-pytest-cov==2.4.0
+pytest-cov==2.5.1

rest_framework/compat.py

@@ -20,11 +20,13 @@ from django.views.generic import View
 
 try:
     from django.urls import (
-        NoReverseMatch, RegexURLPattern, RegexURLResolver, ResolverMatch, Resolver404, get_script_prefix, reverse, reverse_lazy, resolve
+        NoReverseMatch, URLResolver, ResolverMatch, Resolver404,
+        get_script_prefix, reverse, reverse_lazy, resolve, URLPattern
     )
 except ImportError:
     from django.core.urlresolvers import (  # Will be removed in Django 2.0
-        NoReverseMatch, RegexURLPattern, RegexURLResolver, ResolverMatch, Resolver404, get_script_prefix, reverse, reverse_lazy, resolve
+        NoReverseMatch, RegexURLPattern, RegexURLResolver, ResolverMatch,
+        Resolver404, get_script_prefix, reverse, reverse_lazy, resolve
     )
 
 

tox.ini

@@ -6,6 +6,7 @@ envlist =
        {py27,py33,py34,py35}-django18,
        {py27,py34,py35}-django{19,110},
        {py27,py34,py35,py36}-django111,
+       {py34,py35,py36}-django20,
        {py35,py36}-djangomaster
        lint,docs
 
@@ -15,6 +16,7 @@ DJANGO =
     1.9: django19
     1.10: django110
     1.11: django111
+    2.0: django20
     master: djangomaster
 
 [testenv]
@@ -27,6 +29,7 @@ deps =
         django19: Django>=1.9,<1.10
         django110: Django>=1.10,<1.11
         django111: Django>=1.11,<2.0
+        django20: Django>=2.0a1,<2.1
         djangomaster: https://github.com/django/django/archive/master.tar.gz
         -rrequirements/requirements-testing.txt
         -rrequirements/requirements-optionals.txt