Django 1.10 & 1.11 support

FundersClub · Apr 10, 2017 · f695740 · f695740
1 parent c26698d
commit f695740
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,8 @@
+Version 1.1.4
+===========================================================
+*   Django 1.10 and 1.11 support.
+
+
 Version 1.1.3
 ===========================================================
 *   Make papertrail admin viewer resilient to the model class referenced

diff --git a/papertrail/__init__.py b/papertrail/__init__.py
@@ -1,2 +1,2 @@
-__version__ = '1.1.3'
+__version__ = '1.1.4'
 default_app_config = 'papertrail.apps.PapertrailConfig'
diff --git a/papertrail/admin.py b/papertrail/admin.py
@@ -191,7 +191,7 @@ def view_papertrail(self, request, queryset, extra_context=None):
             "admin/%s/%s/object_papertrail.html" % (app_label, opts.object_name.lower()),
             "admin/%s/object_papertrail.html" % app_label,
             "admin/object_papertrail.html"
-        ], context, current_app=self.admin_site.name)
+        ], context)
     view_papertrail.short_description = 'View Paper Trail'
 
     def _map_to_related_queryset(self, queryset, field):

diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 
 setup(
     name='django-papertrail',
-    version='1.1.3',
+    version='1.1.4',
     packages=['papertrail'],
     install_requires=[
         'Django>=1.7',
@@ -30,6 +30,8 @@
         'Framework :: Django :: 1.7',
         'Framework :: Django :: 1.8',
         'Framework :: Django :: 1.9',
+        'Framework :: Django :: 1.10',
+        'Framework :: Django :: 1.11',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: Apache Software License',
         'Operating System :: OS Independent',

diff --git a/tox.ini b/tox.ini
@@ -2,6 +2,8 @@
 envlist =
     py{27,33,34}-django{17,18},
     py{27,34,35}-django19,
+    py{27,35}-django110,
+    py{27,35}-django111,
     flake8,
     isort
 
@@ -18,6 +20,8 @@ deps =
     django17: Django>=1.7,<1.8
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
+    django110: Django>=1.10,<1.11
+    django11: Django>=1.11,<1.12
 setenv =
     PYTHONPATH = {toxinidir}
 whitelist_externals = make