[Python-modules-commits] [django-polymorphic] 04/06: merge patched-experimental into experimental

[Michael Fladischer]

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

fladi pushed a commit to branch experimental
in repository django-polymorphic.

commit 30b2631c1d39f259f6125bd4841e4f631dfe37aa
Merge: d306d51 cb5b5d9
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri May 12 15:38:57 2017 +0200

    merge patched-experimental into experimental

 .gitignore                                         |   1 +
 .travis.yml                                        | 133 ++++++++++++---------
 README.rst                                         |   2 +-
 debian/.git-dpm                                    |   6 +-
 ...0001-use-local-objects.inv-where-possible.patch |   4 +-
 ...002-Replace-force_unicode-with-force_text.patch |  35 ------
 ...ngo.contrib.contenttypes-in-sphinx-docume.patch |  21 ----
 debian/patches/series                              |   2 -
 docs/_ext/djangodummy/requirements.txt             |   3 +-
 docs/changelog.rst                                 |  12 +-
 docs/conf.py                                       |   4 +-
 polymorphic/__init__.py                            |   2 +-
 polymorphic/admin/inlines.py                       |   1 +
 polymorphic/admin/parentadmin.py                   |   4 +-
 polymorphic/query.py                               | 127 +++++++++++++-------
 .../static/polymorphic/css/polymorphic_inlines.css |   1 +
 polymorphic/tests/__init__.py                      |   1 +
 polymorphic/tests/test_orm.py                      |  10 +-
 tox.ini                                            |  14 ++-
 19 files changed, 207 insertions(+), 176 deletions(-)

diff --cc debian/.git-dpm
index fadbe57,0000000..8c7c86a
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
- e8bafe7f766b39662718df6185e775e8790538ce
- e8bafe7f766b39662718df6185e775e8790538ce
- 9e36e07a53bb6f3d100cc5f51f162d36da9aa918
++cb5b5d9c82f7e6c4e61b2bb6a4fb1935fd2ed5de
++cb5b5d9c82f7e6c4e61b2bb6a4fb1935fd2ed5de
++5147ba19ea8c5b059f92669ca749e47f5c491dc5
 +5147ba19ea8c5b059f92669ca749e47f5c491dc5
 +django-polymorphic_1.2.orig.tar.gz
 +a6e5768707fbe17e8aa2d909becbc37353b7d049
 +97153
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-use-local-objects.inv-where-possible.patch
index 3c5f25a,0000000..068840c
mode 100644,000000..100644
--- a/debian/patches/0001-use-local-objects.inv-where-possible.patch
+++ b/debian/patches/0001-use-local-objects.inv-where-possible.patch
@@@ -1,44 -1,0 +1,44 @@@
- From 9a31c10573f7bd20a171c7f6e74bd058e29f3f77 Mon Sep 17 00:00:00 2001
++From cb5b5d9c82f7e6c4e61b2bb6a4fb1935fd2ed5de Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <FladischerMichael at fladi.at>
 +Date: Sun, 21 Aug 2016 13:17:22 +0200
 +Subject: use local objects.inv where possible
 +
 +Upstream uses intersphinx mappings that fetch the objects.inv for python django
 +through HTTP from a remote host. Using the local objects.inv from python and
 +django enables the package to build without network connection.
 +---
 + docs/conf.py | 21 ++++++++++++++++-----
 + 1 file changed, 16 insertions(+), 5 deletions(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
- index 8ae26d3..1559f0d 100644
++index 5221d1b..abae0fb 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -257,11 +257,22 @@ texinfo_documents = [
 + #texinfo_show_urls = 'footnote'
 + 
 + 
 +-# Example configuration for intersphinx: refer to the Python standard library.
 +-intersphinx_mapping = {
 +-    #'http://docs.python.org/': None,
 +-    'https://docs.djangoproject.com/en/stable': 'https://docs.djangoproject.com/en/stable/_objects',
 +-}
 ++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(
 ++        'django',
 ++        'https://docs.djangoproject.com/en/{v}'.format(
 ++            v='.'.join(map(str, django.VERSION[:2]))
 ++        ),
 ++        '/usr/share/doc/python-django-doc/html/objects.inv'
 ++    )
 ++)
 + 
 + # autodoc settings
 + autodoc_member_order = 'groupwise'
diff --cc debian/patches/series
index 3b17204,0000000..7f0b5b6
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,1 @@@
 +0001-use-local-objects.inv-where-possible.patch
- 0002-Replace-force_unicode-with-force_text.patch
- 0003-Install-django.contrib.contenttypes-in-sphinx-docume.patch

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