[Python-modules-commits] [python-django-treebeard] 11/17: 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-treebeard.

commit e758081059cd72570159e1e747097d2a26c7601f
Merge: d6a0dc3 25be557
Author: Michael Fladischer <fladi at debian.org>
Date:   Wed Dec 30 20:44:11 2015 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...django-in-sphinx-configuration-to-prevent.patch | 24 +++++++++++
 ...phinx-use-local-copies-of-objects.inv-fil.patch | 46 ++++++++++++++++++++++
 debian/patches/series                              |  2 +
 docs/conf.py                                       | 32 +++++++++++----
 5 files changed, 99 insertions(+), 9 deletions(-)

diff --cc debian/.git-dpm
index 9159ba2,0000000..8399eeb
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
- 802b81aecc7da82a4058bf2b78ae9b8e84b6947d
- 802b81aecc7da82a4058bf2b78ae9b8e84b6947d
++25be55710dc9aac26bbeecff4a898fa00fdf1647
++25be55710dc9aac26bbeecff4a898fa00fdf1647
 +02d1914271cd7f1807f85bfc1db0632cc5fe3133
 +02d1914271cd7f1807f85bfc1db0632cc5fe3133
 +python-django-treebeard_4.0+dfsg.orig.tar.gz
 +5b635a2406f890f4ec931bc47aa8069bfd432940
 +73678
diff --cc debian/patches/0002-Initialize-django-in-sphinx-configuration-to-prevent.patch
index 0000000,0000000..c6a3c9a
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Initialize-django-in-sphinx-configuration-to-prevent.patch
@@@ -1,0 -1,0 +1,24 @@@
++From d955fcf84c4cc7f1ecacd65eb3da8c8f4f6e9713 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <fladi at debian.org>
++Date: Wed, 30 Dec 2015 20:36:42 +0100
++Subject: Initialize django in sphinx configuration to prevent
++ AppRegistryNotReady exception.
++
++---
++ docs/conf.py | 3 +++
++ 1 file changed, 3 insertions(+)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index 689155d..a869995 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -23,6 +23,9 @@ for directory in ('_ext', '..'):
++ 
++ os.environ['DJANGO_SETTINGS_MODULE'] = 'treebeard.tests.settings'
++ 
+++import django
+++django.setup()
+++
++ extensions = [
++     'djangodocs',
++     'sphinx.ext.autodoc',
diff --cc debian/patches/0003-Make-intersphinx-use-local-copies-of-objects.inv-fil.patch
index 0000000,0000000..c74a695
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Make-intersphinx-use-local-copies-of-objects.inv-fil.patch
@@@ -1,0 -1,0 +1,46 @@@
++From 25be55710dc9aac26bbeecff4a898fa00fdf1647 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <fladi at debian.org>
++Date: Wed, 30 Dec 2015 20:43:47 +0100
++Subject: Make intersphinx use local copies of objects.inv files.
++
++---
++ docs/conf.py | 29 ++++++++++++++++++++++-------
++ 1 file changed, 22 insertions(+), 7 deletions(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index a869995..4bed276 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -53,10 +53,25 @@ latex_documents = [(
++     'django-treebeard Documentation',
++     'Gustavo Picon',
++     'manual')]
++-intersphinx_mapping = {
++-    'python': ('http://docs.python.org/3', None),
++-    'django': (
++-        'https://docs.djangoproject.com/en/1.7/',
++-        'https://docs.djangoproject.com/en/1.7/_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/' + django.get_version() + '/',
+++        '/usr/share/doc/python-django-doc/html/objects.inv'
+++    )
+++)
diff --cc debian/patches/series
index 6dc4abf,0000000..5f2909b
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,3 @@@
 +0001-Remove-version-infromation-from-jquery-ui-filename.patch
++0002-Initialize-django-in-sphinx-configuration-to-prevent.patch
++0003-Make-intersphinx-use-local-copies-of-objects.inv-fil.patch

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