Merge pull request #68 from jezeniel/tests/latest

Update tox for python 3.6 and Django 1.11
vintasoftware · Apr 25, 2017 · 5bb09e3 · 5bb09e3
2 parents a0d7d31 + 61f2efd
commit 5bb09e3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -85,6 +85,7 @@ def get_package_data(package):
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
     test_suite='rolepermissions.tests',
     tests_require=test_requirements

diff --git a/tox.ini b/tox.ini
@@ -1,9 +1,9 @@
 [tox]
 envlist =
-    py{27}-django{15,16,17,18,19,110},
+    py{27}-django{15,16,17,18,19,110,111},
     py{33,34}-django{17},
-    py{34,35}-django{18,19,110},
-    py{34,35}-djangolatest
+    py{34,35,36}-django{18,19,110,111},
+    py{34,35,36}-djangolatest
 
 [testenv]
 commands = python manage.py test
@@ -12,6 +12,7 @@ basepython =
     py33: python3.3
     py34: python3.4
     py35: python3.5
+    py36: python3.6
 
 deps =
     six
@@ -22,6 +23,7 @@ deps =
     django18: Django>=1.8.0,<1.9.0
     django19: Django>=1.9.0,<1.10.0
     django110: Django>=1.10.0,<1.11.0
+    django111: Django>=1.11.0,<1.12.0
     djangolatest: https://github.com/django/django/archive/master.tar.gz
 
 [testenv:py34-djangolatest]