Dropped support for Django 1.10 and added support for Django 2.0

Author: Ross Mechanic

.travis.yml

@@ -9,8 +9,8 @@ python:
   - 3.6
 
 env:
-  - DJANGO="Django>=1.10,<1.11"
   - DJANGO="Django>=1.11,<1.12"
+  - DJANGO="Django>=2.0,<2.1"
 
 install:
   - pip install -U coverage codecov
@@ -19,4 +19,9 @@ install:
 
 script: coverage run setup.py test
 
+matrix:
+  exclude:
+    - python: 2.7
+      env: DJANGO="Django>=2.0,<2.1"
+
 after_success: codecov

AUTHORS.rst

@@ -13,10 +13,12 @@ Authors
 - Brian Dixon
 - Corey Bertram
 - Damien Nozay
+- Daniel Gilge
 - Daniel Levy
 - Daniel Roschka
 - David Hite
 - Eduardo Cuducos
+- Florian Eßer
 - George Vilches
 - Grzegorz Bialy
 - Hamish Downer
@@ -40,6 +42,7 @@ Authors
 - Rod Xavier Bondoc
 - Ross Lote
 - Ross Mechanic
+- Ross Rogers
 - Steven Klass
 - Steeve Chailloux
 - Trey Hunner

CHANGES.rst

@@ -3,7 +3,8 @@ Changes
 
 Unreleased
 ----------
-- Dropped support for Django<=1.9 (gh-356)
+- Added Django 2.0 support
+- Dropped support for Django<=1.10 (gh-356)
 - Fix bug where history_view ignored user permissions (gh-361)
 - Fixed HistoryRequestMiddleware which hadn't been working for Django>1.9 (gh-364)
 

setup.py

@@ -2,7 +2,7 @@
 import simple_history
 
 tests_require = [
-    'Django>=1.10', 'WebTest==2.0.24', 'django-webtest==1.8.0', 'mock==1.0.1']
+    'Django>=1.11', 'WebTest==2.0.24', 'django-webtest==1.8.0', 'mock==1.0.1']
 
 setup(
     name='django-simple-history',
@@ -25,8 +25,8 @@
         "Environment :: Web Environment",
         "Intended Audience :: Developers",
         "Framework :: Django",
-        "Framework :: Django :: 1.10",
         "Framework :: Django :: 1.11",
+        "Framework :: Django :: 2.0"
         "Programming Language :: Python",
         "Programming Language :: Python :: 2.7",
         'Programming Language :: Python :: 3',

simple_history/models.py

@@ -12,8 +12,9 @@
 from django.urls import reverse
 from django.utils import six
 from django.utils.encoding import python_2_unicode_compatible, smart_text
+from django.utils.text import format_lazy
 from django.utils.timezone import now
-from django.utils.translation import string_concat, ugettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 
 from . import exceptions
 from .manager import HistoryDescriptor
@@ -254,8 +255,8 @@ def get_meta_options(self, model):
         if self.user_set_verbose_name:
             name = self.user_set_verbose_name
         else:
-            name = string_concat('historical ',
-                                 smart_text(model._meta.verbose_name))
+            name = format_lazy('historical {}',
+                               smart_text(model._meta.verbose_name))
         meta_fields['verbose_name'] = name
         return meta_fields
 

simple_history/tests/models.py

@@ -73,6 +73,9 @@ class Voter(models.Model):
         related_name='voters',
     )
 
+    def __str__(self):
+        return 'Voter object'
+
 
 class HistoricalRecordsVerbose(HistoricalRecords):
     def get_extra_fields(self, model, fields):

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 envlist =
-    py{27,34,35,36}-django110,
     py{27,34,35,36}-django111,
+    py{34,35,36}-django20,
     py{35,36}-djangotrunk,
     docs, flake8
 
@@ -27,8 +27,8 @@ commands = sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
 [testenv]
 deps =
     coverage
-    django110: Django>=1.10,<1.11
     django111: Django>=1.11,<1.12
+    django20: Django>=2.0,<2.1
     djangotrunk: https://github.com/django/django/tarball/master
 commands =
     coverage run -a --branch setup.py test