Merge remote-tracking branch 'plq/master'

Solution4Future · Jan 3, 2017 · f92823a · f92823a
2 parents d095e87 + 26762b9
commit f92823a
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 33 deletions.
diff --git a/setup.py b/setup.py
@@ -233,7 +233,6 @@ def run_tests(self):
             ret = call_pytest_subprocess('interop/test_zeep.py',
                                                     capture=self.capture) or ret
 
-        ret = call_tox_subprocess('py%s-dj17' % PYVER) or ret
         ret = call_tox_subprocess('py%s-dj18' % PYVER) or ret
         ret = call_tox_subprocess('py%s-dj19' % PYVER) or ret
         ret = call_tox_subprocess('py%s-dj110' % PYVER) or ret

diff --git a/tox.ini b/tox.ini
@@ -3,9 +3,10 @@
 # python setup.py test
 
 [tox]
-envlist = py27-dj17, py27-dj18, py27-dj19, py27-dj110,
-                     py34-dj18, py34-dj19, py34-dj110,
-                     py35-dj18, py35-dj19, py35-dj110,
+envlist = py27-dj18, py27-dj19, py27-dj110,
+          py34-dj18, py34-dj19, py34-dj110,
+          py35-dj18, py35-dj19, py35-dj110,
+          py36-dj18, py36-dj19, py36-dj110,
 
 usedevelop = True
 
@@ -16,17 +17,6 @@ setenv =
 commands =
     py.test --junitxml=test_result.{envname}.xml --cov-append --cov-report= --cov spyne --tb=short {env:TESTS}
 
-[testenv:py27-dj17]
-basepython = {env:BASEPYTHON:python2.7}
-setenv =
-    DJANGO_SETTINGS_MODULE=rpctest.settings
-    PYTHONPATH = {toxinidir}/examples/django/
-    TESTS = spyne/test/interop/test_django.py
-
-deps =
-    Django>=1.7,<18
-    -rrequirements/test_django_req.txt
-
 [testenv:py27-dj18]
 basepython = {env:BASEPYTHON:python2.7}
 setenv =
@@ -61,18 +51,6 @@ deps =
     -rrequirements/test_django_req.txt
 
 
-
-[testenv:py34-dj17]
-basepython = {env:BASEPYTHON:python3.4}
-setenv =
-    DJANGO_SETTINGS_MODULE=rpctest.settings
-    PYTHONPATH = {toxinidir}/examples/django/
-    TESTS = spyne/test/interop/test_django.py
-
-deps =
-    Django>=1.7,<1.8
-    -rrequirements/test_django_req.txt
-
 [testenv:py34-dj18]
 basepython = {env:BASEPYTHON:python3.4}
 setenv =
@@ -108,18 +86,18 @@ deps =
 
 
 
-[testenv:py35-dj17]
+[testenv:py35-dj18]
 basepython = {env:BASEPYTHON:python3.5}
 setenv =
     DJANGO_SETTINGS_MODULE=rpctest.settings
     PYTHONPATH = {toxinidir}/examples/django/
     TESTS = spyne/test/interop/test_django.py
 
 deps =
-    Django>=1.7,<1.8
+    Django>=1.8,<1.9
     -rrequirements/test_django_req.txt
 
-[testenv:py35-dj18]
+[testenv:py35-dj19]
 basepython = {env:BASEPYTHON:python3.5}
 setenv =
     DJANGO_SETTINGS_MODULE=rpctest.settings
@@ -130,19 +108,41 @@ deps =
     Django>=1.8,<1.9
     -rrequirements/test_django_req.txt
 
-[testenv:py35-dj19]
+[testenv:py35-dj110]
 basepython = {env:BASEPYTHON:python3.5}
 setenv =
     DJANGO_SETTINGS_MODULE=rpctest.settings
     PYTHONPATH = {toxinidir}/examples/django/
     TESTS = spyne/test/interop/test_django.py
 
+deps =
+    Django>=1.9,<1.10
+    -rrequirements/test_django_req.txt
+
+[testenv:py36-dj18]
+basepython = {env:BASEPYTHON:python3.6}
+setenv =
+    DJANGO_SETTINGS_MODULE=rpctest.settings
+    PYTHONPATH = {toxinidir}/examples/django/
+    TESTS = spyne/test/interop/test_django.py
+
 deps =
     Django>=1.8,<1.9
     -rrequirements/test_django_req.txt
 
-[testenv:py35-dj110]
-basepython = {env:BASEPYTHON:python3.5}
+[testenv:py36-dj19]
+basepython = {env:BASEPYTHON:python3.6}
+setenv =
+    DJANGO_SETTINGS_MODULE=rpctest.settings
+    PYTHONPATH = {toxinidir}/examples/django/
+    TESTS = spyne/test/interop/test_django.py
+
+deps =
+    Django>=1.8,<1.9
+    -rrequirements/test_django_req.txt
+
+[testenv:py36-dj110]
+basepython = {env:BASEPYTHON:python3.6}
 setenv =
     DJANGO_SETTINGS_MODULE=rpctest.settings
     PYTHONPATH = {toxinidir}/examples/django/