[Python-modules-commits] [python-django-otp] 04/13: 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-django-otp.

commit 0b42d6465d76659e20ede39aa2ec387ab9a551c2
Merge: e32ad94 0361027
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sun Feb 26 17:19:54 2017 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...se-local-objects.inv-file-for-intersphinx.patch | 56 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/source/conf.py                                | 28 +++++++++--
 4 files changed, 82 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index 8b81f24,0000000..024facb
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
- 005ed8efc70304aec1ed83ead75ebe646e4528f2
- 005ed8efc70304aec1ed83ead75ebe646e4528f2
++03610274d93c451c5ddb4a085e7ca716c2c32cb8
++03610274d93c451c5ddb4a085e7ca716c2c32cb8
 +005ed8efc70304aec1ed83ead75ebe646e4528f2
 +005ed8efc70304aec1ed83ead75ebe646e4528f2
 +python-django-otp_0.3.8.orig.tar.gz
 +54393d561d85e1b9b1e90c8c3848a50206a5e1b6
 +41143
diff --cc debian/patches/0001-Use-local-objects.inv-file-for-intersphinx.patch
index 0000000,0000000..f905d47
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-local-objects.inv-file-for-intersphinx.patch
@@@ -1,0 -1,0 +1,56 @@@
++From 03610274d93c451c5ddb4a085e7ca716c2c32cb8 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Sun, 26 Feb 2017 17:19:06 +0100
++Subject: Use local objects.inv file for intersphinx.
++
++This makes sure that no online resources are used during package build.
++---
++ docs/source/conf.py | 28 +++++++++++++++++++++++-----
++ 1 file changed, 23 insertions(+), 5 deletions(-)
++
++diff --git a/docs/source/conf.py b/docs/source/conf.py
++index 24a7a03..af921d1 100644
++--- a/docs/source/conf.py
+++++ b/docs/source/conf.py
++@@ -36,6 +36,7 @@ extensions = [
++ ]
++ 
++ # autodoc and viewcode need valid settings in order to process Django modules.
+++import django
++ import django.conf
++ django.conf.settings.configure(
++     DATABASES={
++@@ -46,11 +47,28 @@ django.conf.settings.configure(
++     }
++ )
++ 
++-intersphinx_mapping = {
++-    'python': ('http://docs.python.org/2/', None),
++-    'django': ('https://docs.djangoproject.com/en/1.10/',
++-               'https://docs.djangoproject.com/en/1.10/_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',
+++    'https://docs.python.org/{v}/'.format(
+++        v='.'.join(map(str, sys.version_info[0:2]))
+++    ),
+++    '/usr/share/doc/python{v}/html/objects.inv'.format(
+++        v='.'.join(map(str, sys.version_info[0:2]))
+++    )
+++)
+++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')
+++)
++ 
++ # Add any paths that contain templates here, relative to this directory.
++ templates_path = ['_templates']
diff --cc debian/patches/series
index 0000000,0000000..8831570
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-local-objects.inv-file-for-intersphinx.patch

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