Resolve the conflicts

Author: joaojunior

.editorconfig

@@ -8,6 +8,7 @@ charset = utf-8
 indent_style = space
 end_of_line = lf
 insert_final_newline = true
+max_line_length = 79
 trim_trailing_whitespace = true
 
 [*.{py,rst,ini}]

.landscape.yml

@@ -1,2 +1,3 @@
+max-line-length: 79
 uses:
-  - Django
+  - django

.travis.yml

@@ -1,35 +1,38 @@
 language: python
 
+sudo: false
+
 python:
-  - 2.6
   - 2.7
-  - 3.2
   - 3.3
+  - 3.4
+  - 3.5
 
 env:
-  - DJANGO="Django>=1.4,<1.5"
   - DJANGO="Django>=1.6,<1.7"
   - 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 coveralls $DJANGO
-  - python -c 'from __future__ import print_function; import django; print("Django " + django.get_version())'
+  - pip install -U coverage codecov
+  - pip install -U $DJANGO
+  - pip freeze
 
-script: coverage run -a setup.py test
+script: coverage run setup.py test
 
 matrix:
   exclude:
-   - python: 2.6
+   - python: 3.4
      env: DJANGO="Django>=1.6,<1.7"
-   - python: 2.6
+   - python: 3.5
+     env: DJANGO="Django>=1.6,<1.7"
+   - python: 3.5
      env: DJANGO="Django>=1.7,<1.8"
-   - python: 3.2
-     env: DJANGO="Django>=1.4,<1.5"
    - python: 3.3
-     env: DJANGO="Django>=1.4,<1.5"
-
-  include:
-   - python: 3.4
-     env: DJANGO="Django>=1.7,<1.8"
+     env: DJANGO="Django>=1.9,<1.10"
+   - python: 3.3
+     env: DJANGO="Django>=1.10,<1.11"
 
-after_success: coveralls
+after_success: codecov

AUTHORS.rst

@@ -2,31 +2,38 @@ Authors
 =======
 
 - Aleksey Kladov
+- bradford281
+- Buddy Lindsey, Jr.
 - Brian Dixon
 - Corey Bertram
 - Damien Nozay
 - Daniel Levy
 - Daniel Roschka
 - David Hite
 - George Vilches
+- Grzegorz Bialy
 - Hamish Downer
 - James Pulec
 - Joao Pedro Francese
 - jofusa
 - John Whitlock
+- Jonathan Leroy
 - Jonathan Sanchez
 - Josh Fyne
 - Klaas van Schelven
+- Martin Bachwerk
 - Marty Alchin
 - Mauricio de Abreu Antunes
 - Micah Denbraver
 - Rajesh Pappula
+- Rod Xavier Bondoc
 - Ross Lote
 - Steven Klass
 - Trey Hunner
 - Ulysses Vilela
 - vnagendra
-- hmit
+- Lucas Wiman
+- Michael England
 
 Background
 ==========

CHANGES.rst

@@ -3,6 +3,52 @@ 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)
+------------------
+- Clear the threadlocal request object when processing the response to prevent test interactions. (gh-213)
+
+1.8.0 (2016-02-02)
+------------------
+- History tracking can be inherited by passing `inherit=True`. (gh-63)
+
+1.7.0 (2015-12-02)
+------------------
+- Add ability to list history in admin when the object instance is deleted. (gh-72)
+- Add ability to change history through the admin. (Enabled with the `SIMPLE_HISTORY_EDIT` setting.)
+- Add Django 1.9 support.
+- Support for custom tables names. (gh-196)
+
+1.6.3 (2015-07-30)
+------------------
+- Respect `to_field` and `db_column` parameters (gh-182)
+
+1.6.2 (2015-07-04)
+------------------
+- Use app loading system and fix deprecation warnings on Django 1.8 (gh-172)
+- Update Landscape configuration
+
+1.6.1 (2015-04-21)
+------------------
+- Fix OneToOneField transformation for historical models (gh-166)
+- Disable cascading deletes from related models to historical models
+- Fix restoring historical instances with missing one-to-one relations (gh-162)
+
+1.6.0 (2015-04-16)
+------------------
+- Add support for Django 1.8+
+- Deprecated use of ``CustomForeignKeyField`` (to be removed)
+- Remove default reverse accessor to `auth.User` for historical models (gh-121)
+
+1.5.4 (2015-01-03)
+------------------
+- Fix a bug when models have a ``ForeignKey`` with ``primary_key=True``
 - Do NOT delete the history elements when a user is deleted.
 - Add support for ``latest``
 - Allow setting a reason for change. [using option changeReason]

Makefile

@@ -14,7 +14,7 @@ clean-pyc:
 	find . -name '*~' -exec rm -f {} +
 
 init:
-	pip install tox>=1.8 coverage Sphinx
+	pip install "tox>=1.8" coverage Sphinx
 
 test:
 	coverage erase

README.rst

@@ -3,20 +3,24 @@ django-simple-history
 
 .. image:: https://secure.travis-ci.org/treyhunner/django-simple-history.png?branch=master
    :target: http://travis-ci.org/treyhunner/django-simple-history
-.. image:: https://coveralls.io/repos/treyhunner/django-simple-history/badge.png?branch=master
-   :target: https://coveralls.io/r/treyhunner/django-simple-history
-.. image:: https://pypip.in/v/django-simple-history/badge.png
-   :target: https://crate.io/packages/django-simple-history
-.. image:: https://pypip.in/d/django-simple-history/badge.png
-   :target: https://crate.io/packages/django-simple-history
+   :alt: Build Status
+
+.. image:: https://img.shields.io/codecov/c/github/treyhunner/django-simple-history/master.svg
+   :target: http://codecov.io/github/treyhunner/django-simple-history?branch=master
+   :alt: Test Coverage
+
+.. image:: https://img.shields.io/pypi/v/django-simple-history.svg
+   :target: https://pypi.python.org/pypi/django-simple-history
+   :alt: PyPI Version
+
 .. image:: https://landscape.io/github/treyhunner/django-simple-history/master/landscape.png
    :target: https://landscape.io/github/treyhunner/django-simple-history/master
    :alt: Code Health
 
 
 django-simple-history stores Django model state on every create/update/delete.
 
-This app requires Django 1.4.2 or greater and Python 2.6 or greater.
+This app requires Django 1.6 or greater and Python 2.7, 3.3, or greater.
 
 Getting Help
 ------------
@@ -29,9 +33,3 @@ Pull requests are welcome.  Read the CONTRIBUTING file for tips on
 submitting a pull request.
 
 .. _PyPI: https://pypi.python.org/pypi/django-email-log/
-
-
-.. image:: https://d2weczhvl823v0.cloudfront.net/treyhunner/django-simple-history/trend.png
-   :alt: Bitdeli badge
-   :target: https://bitdeli.com/free
-

docs/advanced.rst

@@ -65,6 +65,35 @@ third-party apps you don't have control over.  Here's an example of using
     register(User)
 
 
+Allow tracking to be inherited
+---------------------------------
+
+By default history tracking is only added for the model that is passed
+to ``register()`` or has the ``HistoricalRecords`` descriptor. By
+passing ``inherit=True`` to either way of registering you can change
+that behavior so that any child model inheriting from it will have
+historical tracking as well. Be careful though, in cases where a model
+can be tracked more than once, ``MultipleRegistrationsError`` will be
+raised.
+
+.. code-block:: python
+
+    from django.contrib.auth.models import User
+    from django.db import models
+    from simple_history import register
+    from simple_history.models import HistoricalRecords
+
+    # register() example
+    register(User, inherit=True)
+
+    # HistoricalRecords example
+    class Poll(models.Model):
+        history = HistoricalRecords(inherit=True)
+
+Both ``User`` and ``Poll`` in the example above will cause any model
+inheriting from them to have historical tracking as well.
+
+
 .. recording_user:
 
 Recording Which User Changed a Model
@@ -158,3 +187,29 @@ To change the auto-generated HistoricalRecord models base class from
         pub_date = models.DateTimeField('date published')
         changed_by = models.ForeignKey('auth.User')
         history = HistoricalRecords(bases=[RoutableModel])
+
+Custom history table name
+-------------------------
+
+By default, the table name for historical models follow the Django convention
+and just add ``historical`` before model name. For instance, if your application
+name is ``polls`` and your model name ``Question``, then the table name will be
+``polls_historicalquestion``.
+
+You can use the ``table_name`` parameter with both ``HistoricalRecords()`` or
+``register()`` to change this behavior.
+
+.. code-block:: python
+
+    class Question(models.Model):
+        question_text = models.CharField(max_length=200)
+        pub_date = models.DateTimeField('date published')
+        history = HistoricalRecords(table_name='polls_question_history')
+
+.. code-block:: python
+
+    class Question(models.Model):
+        question_text = models.CharField(max_length=200)
+        pub_date = models.DateTimeField('date published')
+
+    register(Question, table_name='polls_question_history')

docs/conf.py

@@ -95,7 +95,7 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+# html_theme = 'default'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

docs/usage.rst

@@ -37,13 +37,13 @@ settings:
 
 .. code-block:: python
 
-    MIDDLEWARE_CLASSES = [
+    MIDDLEWARE = [
         # ...
         'simple_history.middleware.HistoryRequestMiddleware',
     ]
 
 If you do not want to use the middleware, you can explicitly indicate
-the user making the change as documented in :ref:`recording_user`.
+the user making the change as documented in :doc:`/advanced`.
 
 Models
 ~~~~~~
@@ -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
@@ -121,7 +124,7 @@ An example of admin integration for the ``Poll`` and ``Choice`` models:
     admin.site.register(Poll, SimpleHistoryAdmin)
     admin.site.register(Choice, SimpleHistoryAdmin)
 
-Changing a history-tracked model from the admin interface will automatically record the user who made the change (see :ref:`recording_user`).
+Changing a history-tracked model from the admin interface will automatically record the user who made the change (see :doc:`/advanced`).
 
 
 Querying history
@@ -168,3 +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 regularly QuerySets,
+a.k. Choice.history.filter(choice_text='Not Much') will work!