Merge pull request #3 from treyhunner/master

merge latest

Author: KevinGrahamFoster

.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

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

.travis.yml

@@ -1,35 +1,46 @@
 language: python
 
+sudo: false
+
 python:
-  - 2.6
   - 2.7
-  - 3.2
   - 3.3
+  - 3.4
+  - 3.5
+  - 3.6
 
 env:
-  - DJANGO=Django==1.4.13
-  - DJANGO=Django==1.5.8
-  - DJANGO=Django==1.6.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"
+  - DJANGO="Django>=1.11,<1.12"
 
 install:
-  - pip install coverage coveralls $DJANGO --use-mirrors
+  - 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
-     env: DJANGO=Django==1.6.5
-   - python: 2.6
-     env: DJANGO="Django>=1.7,<1.8"
-   - python: 3.2
-     env: DJANGO=Django==1.4.13
-   - python: 3.3
-     env: DJANGO=Django==1.4.13
-
-  include:
    - python: 3.4
+     env: DJANGO="Django>=1.6,<1.7"
+   - python: 3.5
+     env: DJANGO="Django>=1.6,<1.7"
+   - python: 3.5
      env: DJANGO="Django>=1.7,<1.8"
+   - python: 3.6
+     env: DJANGO="Django>=1.6,<1.7"
+   - python: 3.6
+     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"
+   - python: 3.3
+     env: DJANGO="Django>=1.11,<1.12"
 
-after_success: coveralls
+after_success: codecov

AUTHORS.rst

@@ -2,27 +2,44 @@ Authors
 =======
 
 - Aleksey Kladov
+- bradford281
+- Buddy Lindsey, Jr.
 - Brian Dixon
 - Corey Bertram
 - Damien Nozay
 - Daniel Levy
 - Daniel Roschka
 - David Hite
+- Eduardo Cuducos
 - George Vilches
+- Grzegorz Bialy
 - Hamish Downer
-- jofusa
+- James Pulec
+- Joao Junior(@joaojunior)
 - Joao Pedro Francese
+- jofusa
+- John Whitlock
+- Jonathan Leroy
 - Jonathan Sanchez
 - Josh Fyne
 - Klaas van Schelven
-- Ross Lote
-- macro1
+- Maciej "RooTer" Urbański
+- Martin Bachwerk
 - Marty Alchin
 - Mauricio de Abreu Antunes
+- Micah Denbraver
 - Rajesh Pappula
+- Rod Xavier Bondoc
+- Ross Lote
+- Steven Klass
+- Steeve Chailloux
 - Trey Hunner
 - Ulysses Vilela
 - vnagendra
+- Lucas Wiman
+- Michael England
+- Gregory Bataille
+- Jesse Shapiro
 
 Background
 ==========

CHANGES.rst

@@ -1,6 +1,79 @@
 Changes
 =======
 
+Unreleased
+----------
+- Use get_queryset rather than model.objects in history_view. (gh-303)
+- Change ugettext calls in models.py to ugettext_lazy
+
+1.9.0 (2017-06-11)
+------------------
+- Add --batchsize option to the populate_history management command. (gh-231)
+- Add ability to show specific attributes in admin history list view. (gh-256)
+- Add Brazilian Portuguese translation file. (gh-279)
+- Fix locale file packaging issue. (gh-280)
+- Add ability to specify reason for history change. (gh-275)
+- Test against Django 1.11 and Python 3.6. (gh-276)
+- Add `excluded_fields` option to exclude fields from history. (gh-274)
+
+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]
+
+1.5.3 (2014-11-18)
+------------------
+- Fix migrations while using ``order_with_respsect_to`` (gh-140)
+- Fix migrations using south
+- Allow history accessor class to be overridden in ``register()``
+
+1.5.2 (2014-10-15)
+------------------
+- Additional fix for migrations (gh-128)
+
 1.5.1 (2014-10-13)
 ------------------
 - Removed some incompatibilities with non-default admin sites (gh-92)

MANIFEST.in

@@ -2,4 +2,5 @@ include MANIFEST.in
 include *.rst
 include *.txt
 recursive-include docs *.rst
+recursive-include simple_history/locale *
 recursive-include simple_history/templates *

Makefile

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

README.rst

@@ -3,31 +3,33 @@ 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.13 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
 ------------
 
-Documentation is available at https://django-simple-history.readthedocs.org/
+Documentation is available at https://django-simple-history.readthedocs.io/
 
 Issue tracker is at https://github.com/treyhunner/django-simple-history/issues
 
 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
-

doc-requirements.txt

@@ -0,0 +1,2 @@
+Sphinx==1.2.3
+sphinx-autobuild==0.3.0