Merge pull request #38 from hsmett/master

Confirm compatibility with Django 1.11
peopledoc · Sep 4, 2017 · 5416668 · 5416668
2 parents 61d418f + 84cabce
commit 5416668
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,6 @@
+
+[run]
+branch = True
+
+[report]
+show_missing = True
diff --git a/CHANGELOG b/CHANGELOG
@@ -9,6 +9,7 @@ about future releases, check `milestones`_ and :doc:`/about/vision`.
 ----------------
 
 - Add explicit on_delete on ForeignKeys.
+- Confirm compatibility with Django 1.11
 
 
 1.1 (2017-03-24)

diff --git a/setup.py b/setup.py
@@ -47,6 +47,7 @@ def run_tests(self):
     'Framework :: Django :: 1.8',
     'Framework :: Django :: 1.9',
     'Framework :: Django :: 1.10',
+    'Framework :: Django :: 1.11',
 ]
 KEYWORDS = [
     'signature',
@@ -57,7 +58,7 @@ def run_tests(self):
 PACKAGES = [NAME.replace('-', '_'), 'django_dummysign']
 REQUIREMENTS = [
     # BEGIN requirements
-    'Django>=1.8,<1.11',
+    'Django>=1.8,<2.0',
     'setuptools',
     # END requirements
 ]

diff --git a/tox.ini b/tox.ini
@@ -1,8 +1,6 @@
 [tox]
 envlist =
-    py{27,34,35}-django{18},
-    py{27,34,35}-django{19},
-    py{27,34,35}-django{110},
+    py{27,34,35}-django{18,19,110,111},
     flake8,
     sphinx,
     readme
@@ -17,6 +15,7 @@ deps =
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
+    django111: Django>=1.11,<2.0
     nose
     nose-exclude
     py27: mock