[Python-modules-commits] [django-reversion] 04/07: merge patched into master

[Michael Fladischer]

This is an automated email from the git hooks/post-receive script.

fladi pushed a commit to branch master
in repository django-reversion.

commit c813b138f33312daced6151b7cb029a5d7cc28cf
Merge: c924e3b 31470d3
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Apr 22 22:24:59 2016 +0200

    merge patched into master

 .travis.yml                                        |  22 +---
 CHANGELOG.md                                       |  16 ++-
 MANIFEST.in                                        |   1 +
 README.rst                                         |   4 +-
 debian/.git-dpm                                    |   6 +-
 debian/patches/intersphinx.patch                   |   4 +-
 docs/admin.rst                                     |   4 +
 docs/api.rst                                       |  86 +++++++-------
 docs/conf.py                                       |   2 +-
 docs/diffs.rst                                     |   3 +-
 docs/django-versions.rst                           |   4 +-
 docs/how-it-works.rst                              |   8 +-
 setup.py                                           |   3 +-
 src/reversion/__init__.py                          |   2 +-
 src/reversion/admin.py                             |  31 +++--
 .../management/commands/createinitialrevisions.py  |  67 ++++-------
 .../management/commands/deleterevisions.py         |  66 +++++------
 src/reversion/models.py                            |   2 +
 src/reversion/revisions.py                         |  18 +--
 src/reversion/south_migrations/0001_initial.py     | 104 ----------------
 .../0002_auto__add_field_version_type.py           |  77 ------------
 .../0003_auto__add_field_version_object_id_int.py  |  79 -------------
 .../0004_populate_object_id_int.py                 |  89 --------------
 .../0005_auto__add_field_revision_manager_slug.py  |  80 -------------
 .../0006_remove_delete_revisions.py                |  77 ------------
 .../0007_auto__del_field_version_type.py           |  80 -------------
 .../0008_auto__add_index_revision_date_created.py  |  78 ------------
 src/reversion/south_migrations/__init__.py         |   0
 src/tests/test_reversion/admin.py                  |  23 +++-
 src/tests/test_reversion/models.py                 |  12 ++
 src/tests/test_reversion/tests.py                  | 131 ++++++++++++---------
 31 files changed, 280 insertions(+), 899 deletions(-)

diff --cc debian/.git-dpm
index 7041a8d,0000000..157dc85
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 6a817d6acfe388dd943392634b3ac40f57867c0b
- 6a817d6acfe388dd943392634b3ac40f57867c0b
- eff368a2f2f7ea64de7a9a772c7645afc7240b70
++31470d3f1b10086e0929d43c4a4fe5e6e807084d
++31470d3f1b10086e0929d43c4a4fe5e6e807084d
++84e698bf83ced2e70fb3cbad750746143666b346
 +84e698bf83ced2e70fb3cbad750746143666b346
 +django-reversion_1.10.2.orig.tar.gz
 +6416d8ab7a764f5d14917639aa3b0c1a8a612098
 +68300
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/intersphinx.patch
index c928314,0000000..4b2cb69
mode 100644,000000..100644
--- a/debian/patches/intersphinx.patch
+++ b/debian/patches/intersphinx.patch
@@@ -1,37 -1,0 +1,37 @@@
- From 6a817d6acfe388dd943392634b3ac40f57867c0b Mon Sep 17 00:00:00 2001
++From 31470d3f1b10086e0929d43c4a4fe5e6e807084d Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <fladi at debian.org>
 +Date: Thu, 8 Oct 2015 08:56:37 -0700
 +Subject: use local objects.inv where possible
 +
 + Upstream uses intersphinx mappings that fetch the objects.inv for Python, HTTP
 + from a remote host. Using the local objects.inv from Python enables the package
 + to build without network connection.
 +Forwarded: not-needed
 +Last-Update: 2015-05-19
 +
 +Patch-Name: intersphinx.patch
 +---
 + docs/conf.py | 13 ++++++++++++-
 + 1 file changed, 12 insertions(+), 1 deletion(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
- index 45d3047..6615316 100644
++index 998c66b..3f448db 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -244,4 +244,15 @@ texinfo_documents = [
 + 
 + 
 + # Example configuration for intersphinx: refer to the Python standard library.
 +-intersphinx_mapping = {'http://docs.python.org/': None}
 ++def check_object_path(key, url, path):
 ++    if os.path.isfile(path):
 ++        return {key: (url, path)}
 ++    return {}
 ++
 ++intersphinx_mapping = {}
 ++intersphinx_mapping.update(check_object_path('python',
 ++                                             'http://docs.python.org/',
 ++                                             '/usr/share/doc/python'
 ++                                              + '.'.join([str(x) for x in sys.version_info[0:2]])
 ++                                              + '/html/objects.inv'))
 ++

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-reversion.git