[Python-modules-commits] [python-testfixtures] 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 python-testfixtures.

commit 0fd9abac599c1c611adc15b08d864b203ee8decd
Merge: 19d93e5 ef4865d
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Jan 27 09:51:54 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...0001-Use-local-objects.inv-where-possible.patch | 35 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/conf.py                                       | 12 +++++++-
 4 files changed, 49 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 251861b,0000000..ffcca28
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- bdb10da94ce984ae8dd3926ee24f256b869e0b73
- bdb10da94ce984ae8dd3926ee24f256b869e0b73
++ef4865dec81eaa5dd24c6c07edbffc10db783e36
++ef4865dec81eaa5dd24c6c07edbffc10db783e36
 +bdb10da94ce984ae8dd3926ee24f256b869e0b73
 +bdb10da94ce984ae8dd3926ee24f256b869e0b73
 +python-testfixtures_4.13.3.orig.tar.gz
 +d7626cabcc9bcdf22d51da53d7554490ee3cae33
 +93533
diff --cc debian/patches/0001-Use-local-objects.inv-where-possible.patch
index 0000000,0000000..2f7ed07
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-local-objects.inv-where-possible.patch
@@@ -1,0 -1,0 +1,35 @@@
++From ef4865dec81eaa5dd24c6c07edbffc10db783e36 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Fri, 27 Jan 2017 09:50:38 +0100
++Subject: Use local objects.inv where possible
++
++Upstream uses intersphinx mappings that fetch the objects.inv for python by
++HTTP from a remote host. Using the local objects.inv from python enables the
++package to build without network connection.
++---
++ docs/conf.py | 12 +++++++++++-
++ 1 file changed, 11 insertions(+), 1 deletion(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index 602454b..48b009b 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -12,7 +12,17 @@ extensions = [
++     'sphinx.ext.intersphinx'
++     ]
++ 
++-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',
+++                                            'https://docs.python.org/',
+++                                            '/usr/share/doc/python'
+++                                              + '.'.join([str(x) for x in sys.version_info[0:2]])
+++                                              + '/html/objects.inv'))
++ 
++ # General
++ source_suffix = '.txt'
diff --cc debian/patches/series
index 0000000,0000000..693f90d
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-local-objects.inv-where-possible.patch

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