[Python-modules-commits] [django-polymorphic] 04/05: 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-polymorphic.

commit ee4d343be5a66ec3394e924ac077a0c7498409e2
Merge: 67e257b 68a6eb6
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sun Aug 21 13:18:12 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...0002-use-local-objects.inv-where-possible.patch | 39 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/conf.py                                       | 19 ++++++++---
 4 files changed, 56 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index bc376e3,0000000..89731fe
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
- 661f9712cac2ca128abd892cf10c3c37181a6569
- 661f9712cac2ca128abd892cf10c3c37181a6569
++68a6eb676bede0455fbbe4ca52af99bb4b5efade
++68a6eb676bede0455fbbe4ca52af99bb4b5efade
 +d95b26a48a4bb5c234781c000b2ef40933f5e20c
 +d95b26a48a4bb5c234781c000b2ef40933f5e20c
 +django-polymorphic_0.9.2.orig.tar.gz
 +7ec1267dedc7e560889d93ac304dffc5001dd3a2
 +69159
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-use-local-objects.inv-where-possible.patch
index 0000000,0000000..43123fd
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-use-local-objects.inv-where-possible.patch
@@@ -1,0 -1,0 +1,39 @@@
++From 68a6eb676bede0455fbbe4ca52af99bb4b5efade 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 | 19 ++++++++++++++-----
++ 1 file changed, 14 insertions(+), 5 deletions(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index 7f84262..901f846 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -249,8 +249,17 @@ 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/dev': 'https://docs.djangoproject.com/en/dev/_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('python',
+++                                             'http://docs.python.org/',
+++                                             '/usr/share/doc/python'
+++                                             + '.'.join([str(x) for x in sys.version_info[0:2]])
+++                                             + '/html/objects.inv'))
+++intersphinx_mapping.update(check_object_path('django',
+++                                             'https://docs.djangoproject.com/en/dev',
+++                                             '/usr/share/doc/python-django-doc/html/objects.inv'))
diff --cc debian/patches/series
index 3209344,0000000..517e7f0
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Add-separate-test-configuration-for-Django-1.10.patch
++0002-use-local-objects.inv-where-possible.patch

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