[Python-modules-commits] [django-polymorphic] 07/17: 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 c81226ba49c457ff754e9432aac2e78ac13d2952
Merge: d437882 9a31c10
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Mon Mar 6 12:19:19 2017 +0100

    merge patched-experimental into experimental

 debian/.git-dpm                                                | 4 ++--
 debian/patches/0001-use-local-objects.inv-where-possible.patch | 6 +++---
 docs/conf.py                                                   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index b898f51,0000000..5013e87
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
- bb7145f73c6a96f3861cfc01224ca6ac4d616c91
- bb7145f73c6a96f3861cfc01224ca6ac4d616c91
++9a31c10573f7bd20a171c7f6e74bd058e29f3f77
++9a31c10573f7bd20a171c7f6e74bd058e29f3f77
 +9e36e07a53bb6f3d100cc5f51f162d36da9aa918
 +9e36e07a53bb6f3d100cc5f51f162d36da9aa918
 +django-polymorphic_1.1.orig.tar.gz
 +6abe4a9df5041bea9e67211f988c0b4615f9d983
 +96348
 +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 185417d,0000000..3c5f25a
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 bb7145f73c6a96f3861cfc01224ca6ac4d616c91 Mon Sep 17 00:00:00 2001
++From 9a31c10573f7bd20a171c7f6e74bd058e29f3f77 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..675e67a 100644
++index 8ae26d3..1559f0d 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]))
+++            v='.'.join(map(str, django.VERSION[:2]))
 ++        ),
 ++        '/usr/share/doc/python-django-doc/html/objects.inv'
 ++    )
 ++)
 + 
 + # autodoc settings
 + autodoc_member_order = 'groupwise'

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