Merge branch 'master' into ExcludeAndIncludeFields

Author: macro1

.travis.yml

@@ -13,6 +13,7 @@ env:
   - DJANGO="Django>=1.7,<1.8"
   - DJANGO="Django>=1.8,<1.9"
   - DJANGO="Django>=1.9,<1.10"
+  - DJANGO="Django>=1.10,<1.11"
 
 install:
   - pip install -U coverage codecov
@@ -31,5 +32,7 @@ matrix:
      env: DJANGO="Django>=1.7,<1.8"
    - python: 3.3
      env: DJANGO="Django>=1.9,<1.10"
+   - python: 3.3
+     env: DJANGO="Django>=1.10,<1.11"
 
 after_success: codecov

AUTHORS.rst

@@ -33,6 +33,7 @@ Authors
 - Ulysses Vilela
 - vnagendra
 - Lucas Wiman
+- Michael England
 
 Background
 ==========

CHANGES.rst

@@ -3,7 +3,12 @@ Changes
 
 tip (unreleased)
 ----------------
+- Added --batchsize option to the populate_history management command.
+
+1.8.2 (2017-01-19)
+------------------
 - Add Polish locale.
+- Add Django 1.10 support.
 
 1.8.1 (2016-03-19)
 ------------------

docs/usage.rst

@@ -37,7 +37,7 @@ settings:
 
 .. code-block:: python
 
-    MIDDLEWARE_CLASSES = [
+    MIDDLEWARE = [
         # ...
         'simple_history.middleware.HistoryRequestMiddleware',
     ]
@@ -83,6 +83,9 @@ initial change for preexisting model instances:
 
     $ python manage.py populate_history --auto
 
+By default, history rows are inserted in batches of 200. This can be changed if needed for large tables
+by using the ``--batchsize`` option, for example ``--batchsize 500``.
+
 .. _admin_integration:
 
 Integration with Django Admin
@@ -168,5 +171,6 @@ records for all ``Choice`` instances can be queried by using the manager on the
     <simple_history.manager.HistoryManager object at 0x1cc4290>
     >>> Choice.history.all()
     [<HistoricalChoice: Choice object as of 2010-10-25 18:05:12.183340>, <HistoricalChoice: Choice object as of 2010-10-25 18:04:59.047351>]
-    
-Because the history is model, you can also filter it like regulary QuerySets, a.k. Choice.history.filter(choice_text='Not Much') will work!
+
+Because the history is model, you can also filter it like regularly QuerySets,
+a.k. Choice.history.filter(choice_text='Not Much') will work!

runtests.py

@@ -16,7 +16,7 @@
     'simple_history.tests',
     'simple_history.tests.custom_user',
     'simple_history.tests.external',
-    'simple_history.tests.migration_test_app',
+    'simple_history.registry_tests.migration_test_app',
 
     'simple_history',
 
@@ -50,6 +50,7 @@
 
 
 def main():
+
     if not settings.configured:
         settings.configure(**DEFAULT_SETTINGS)
     if hasattr(django, 'setup'):
@@ -59,9 +60,10 @@ def main():
     except ImportError:
         from django.test.simple import DjangoTestSuiteRunner
         failures = DjangoTestSuiteRunner(failfast=False).run_tests(['tests'])
+        failures |= DjangoTestSuiteRunner(failfast=False).run_tests(['registry_tests'])
     else:
-        failures = DiscoverRunner(failfast=False).run_tests(
-            ['simple_history.tests'])
+        failures = DiscoverRunner(failfast=False).run_tests(['simple_history.tests'])
+        failures |= DiscoverRunner(failfast=False).run_tests(['simple_history.registry_tests'])
     sys.exit(failures)
 
 

setup.py

@@ -2,11 +2,7 @@
 import simple_history
 
 tests_require = [
-    'Django>=1.4', 'WebTest==2.0.18', 'django-webtest==1.7.8', 'mock==1.0.1']
-try:
-    from unittest import skipUnless
-except ImportError:  # Python 2.6 compatibility
-    tests_require.append("unittest2")
+    'Django>=1.6', 'WebTest==2.0.24', 'django-webtest==1.8.0', 'mock==1.0.1']
 
 setup(
     name='django-simple-history',
@@ -29,7 +25,6 @@
         "Environment :: Web Environment",
         "Intended Audience :: Developers",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.2',

simple_history/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import unicode_literals
 
-__version__ = '1.8.1'
+__version__ = '1.8.2'
 
 
 def register(

simple_history/admin.py

@@ -18,6 +18,11 @@
     from django.contrib.admin.utils import unquote
 except ImportError:  # Django < 1.7
     from django.contrib.admin.util import unquote
+try:
+    from django.utils.version import get_complete_version
+except ImportError:
+    from django import VERSION
+    get_complete_version = lambda: VERSION
 
 USER_NATURAL_KEY = tuple(
     key.lower() for key in settings.AUTH_USER_MODEL.split('.', 1))
@@ -75,8 +80,10 @@ def history_view(self, request, object_id, extra_context=None):
             'admin_user_view': admin_user_view
         }
         context.update(extra_context or {})
-        return render(request, template_name=self.object_history_template,
-                      dictionary=context, current_app=request.current_app)
+        extra_kwargs = {}
+        if get_complete_version() < (1, 8):
+            extra_kwargs['current_app'] = request.current_app
+        return render(request, self.object_history_template, context, **extra_kwargs)
 
     def response_change(self, request, obj):
         if '_change_history' in request.POST and SIMPLE_HISTORY_EDIT:
@@ -178,8 +185,10 @@ def history_form_view(self, request, object_id, version_id):
             'save_on_top': self.save_on_top,
             'root_path': getattr(self.admin_site, 'root_path', None),
         }
-        return render(request, template_name=self.object_history_form_template,
-                      dictionary=context, current_app=request.current_app)
+        extra_kwargs = {}
+        if get_complete_version() < (1, 8):
+            extra_kwargs['current_app'] = request.current_app
+        return render(request, self.object_history_form_template, context, **extra_kwargs)
 
     def save_model(self, request, obj, form, change):
         """Set special model attribute to user for reference after save"""

simple_history/exceptions.py

@@ -2,6 +2,7 @@
 django-simple-history exceptions and warnings classes.
 """
 
+
 class MultipleRegistrationsError(Exception):
     """The model has been registered to have history tracking more than once"""
     pass

simple_history/management/commands/_populate_utils.py

@@ -15,7 +15,7 @@ def get_history_model_for_model(model):
     return getattr(model, manager_name).model
 
 
-def bulk_history_create(model, history_model):
+def bulk_history_create(model, history_model, batch_size):
     """Save a copy of all instances to the historical model."""
     historical_instances = [
         history_model(
@@ -26,4 +26,4 @@ def bulk_history_create(model, history_model):
                 for field in instance._meta.fields
             }
         ) for instance in model.objects.all()]
-    history_model.objects.bulk_create(historical_instances)
+    history_model.objects.bulk_create(historical_instances, batch_size=batch_size)