add python 3.5 and 3.6 support

pavlov99 · Jun 21, 2017 · 7292eb8 · 7292eb8
1 parent a76fa94
commit 7292eb8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +3,11 @@ language: python
 python: "2.7"
 
 env:
-    - TOXENV=py26
     - TOXENV=py27
     - TOXENV=py33
     - TOXENV=py34
+    - TOXENV=py35
+    - TOXENV=py36
     - TOXENV=pypy
     - TOXENV=cov
 

diff --git a/jsonrpc/tests/test_backend_django/tests.py b/jsonrpc/tests/test_backend_django/tests.py
@@ -18,6 +18,7 @@ class TestDjangoBackend(TestCase):
     def setUpClass(cls):
         os.environ['DJANGO_SETTINGS_MODULE'] = \
             'jsonrpc.tests.test_backend_django.settings'
+        super(TestDjangoBackend, cls).setUpClass()
 
     def test_urls(self):
         self.assertTrue(isinstance(api.urls, list))

diff --git a/jsonrpc/tests/test_backend_django/urls.py b/jsonrpc/tests/test_backend_django/urls.py
@@ -1,8 +1,7 @@
-from django.conf.urls import patterns, url, include
+from django.conf.urls import url, include
 from jsonrpc.backend.django import api
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'', include(api.urls)),
     url(r'prefix', include(api.urls)),
-)
+]
diff --git a/tox.ini b/tox.ini
@@ -1,13 +1,13 @@
 [tox]
-envlist = py26, py27, py33, py34, pypy, pep8, cov
+envlist = py27, py33, py34, py35, py36, pypy, pep8, cov
 
 [testenv]
 commands = nosetests
 setenv = DJANGO_SETTINGS_MODULE=jsonrpc.tests.test_backend_django.settings
 deps =
     nose
     mock
-    django==1.6
+    django==1.10
     flask>=0.10.1
 
 [testenv:py26]