Merge pull request #10 from paulcwatts/django20

Add Django 2.0, remove Django 1.10

.travis.yml

@@ -6,12 +6,10 @@ python:
   - "3.5"
   - "3.6"
 env:
-  - DJANGO='django>=1.10.0,<1.11.0' DRF='djangorestframework>=3.5,<3.6'
   - DJANGO='django>=1.11.0,<1.12.0' DRF='djangorestframework>=3.5,<3.6'
-  - DJANGO='django>=1.10.0,<1.11.0' DRF='djangorestframework>=3.6,<3.7'
   - DJANGO='django>=1.11.0,<1.12.0' DRF='djangorestframework>=3.6,<3.7'
-  - DJANGO='django>=1.10.0,<1.11.0' DRF='djangorestframework>=3.7,<3.8'
   - DJANGO='django>=1.11.0,<1.12.0' DRF='djangorestframework>=3.7,<3.8'
+  - DJANGO='django>=2.0.0,<2.1.0' DRF='djangorestframework>=3.7,<3.8'
 before_install:
   - pip install -U pytest
   - pip install -r requirements-test.txt
@@ -21,6 +19,9 @@ install:
 script:
   - py.test --flake8 --cov=./
 matrix:
+  exclude:
+    - python: "2.7"
+      env: DJANGO='django>=2.0.0,<2.1.0' DRF='djangorestframework>=3.7,<3.8'
   allow_failures:
     - env: DJANGO='https://github.com/django/django/archive/master.tar.gz'
 after_success:

requirements.txt

@@ -1,3 +1,3 @@
-Django>=1.8
+Django>=1.11
 djangorestframework>=3.5
 six

rest_framework_json_schema/tests/test_negotiation.py

@@ -1,5 +1,5 @@
-from django.core.urlresolvers import reverse
 from django.test import override_settings
+from django.urls import reverse
 from rest_framework.test import APISimpleTestCase, APIRequestFactory
 from rest_framework_json_schema.negotiation import JSONAPIContentNegotiation
 

rest_framework_json_schema/tests/test_pagination.py

@@ -1,7 +1,7 @@
 import json
 
-from django.core.urlresolvers import reverse
 from django.test import override_settings
+from django.urls import reverse
 from rest_framework.test import APISimpleTestCase, APIRequestFactory
 
 from rest_framework_json_schema.test_support.serializers import reset_data

rest_framework_json_schema/tests/test_parsers.py

@@ -1,5 +1,5 @@
-from django.core.urlresolvers import reverse
 from django.test import override_settings
+from django.urls import reverse
 from rest_framework.test import APISimpleTestCase, APIRequestFactory
 
 from rest_framework_json_schema.test_support.serializers import (

rest_framework_json_schema/tests/test_renderers.py

@@ -1,7 +1,7 @@
 import json
 
-from django.core.urlresolvers import reverse
 from django.test import override_settings
+from django.urls import reverse
 from rest_framework.test import APISimpleTestCase, APIRequestFactory
 
 from rest_framework_json_schema.test_support.serializers import reset_data

tox.ini

@@ -1,12 +1,12 @@
 [tox]
 envlist =
-    {py27,py34,py35,py36}-{django110,django111}-drf{35,36,37}
+    {py27,py34,py35,py36}-{django111}-drf{35,36,37},{py34,py35,py36}-{django20}-drf{37}
 
 [testenv]
 deps =
     -rrequirements-test.txt
-    django110: django>=1.10.0,<1.11.0
     django111: django>=1.11.0,<1.12.0
+    django20: django>=2.0.0,<2.1.0
     drf35: djangorestframework>=3.5.<3.6
     drf36: djangorestframework>=3.6.<3.7
     drf37: djangorestframework>=3.7.<3.8