[Python-modules-commits] [python-django-etcd-settings] 13/14: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Wed Dec 14 10:25:30 UTC 2016
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository python-django-etcd-settings.
commit 42fd86a72368d8518f4b62a95ff5b36450a3284b
Merge: 975033f 805dfbd
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Wed Dec 14 10:28:07 2016 +0100
merge patched into master
debian/.git-dpm | 4 ++--
.../0002-Remove-plantuml-sphinx-extension.patch | 27 ++++++++++++++++++++++
...Use-packaged-plantuml.jar-file-for-sphinx.patch | 22 ------------------
.../0003-Remove-mathjax-sphinx-extension.patch | 22 ++++++++++++++++++
.../0003-Use-packaged-MathJax.js-for-sphinx.patch | 22 ------------------
...e-local-objects.inv-files-for-intersphinx.patch | 6 ++---
debian/patches/series | 4 ++--
docs/conf.py | 7 ------
8 files changed, 56 insertions(+), 58 deletions(-)
diff --cc debian/.git-dpm
index e6d5620,0000000..c0572eb
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
- dddda3230bedb458533a039b4c5e546aac81287d
- dddda3230bedb458533a039b4c5e546aac81287d
++805dfbd47bdd1ab9cda0d60475b05d42237b9b07
++805dfbd47bdd1ab9cda0d60475b05d42237b9b07
+8f621f963901bc060b322d52b9033ba29d618fae
+8f621f963901bc060b322d52b9033ba29d618fae
+python-django-etcd-settings_0.1.11+dfsg.orig.tar.gz
+7417d0c665a0d29025de15da71ab2b723cc109bc
+21439
diff --cc debian/patches/0002-Remove-plantuml-sphinx-extension.patch
index 0000000,0000000..f72332f
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Remove-plantuml-sphinx-extension.patch
@@@ -1,0 -1,0 +1,27 @@@
++From 97b5098bc8340bc5f630d15431012349b0f24381 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Wed, 14 Dec 2016 09:50:12 +0100
++Subject: Remove plantuml sphinx extension.
++
++It is not used anywhere in the documentation sources.
++---
++ docs/conf.py | 4 ----
++ 1 file changed, 4 deletions(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index 84610cf..bf3d3f8 100755
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -37,12 +37,8 @@ extensions = [
++ 'sphinx.ext.coverage',
++ 'sphinx.ext.mathjax',
++ 'sphinx.ext.napoleon',
++- 'sphinxcontrib.plantuml',
++ ]
++
++-plantuml_jar_path = os.path.abspath('./_plantuml/plantuml.jar')
++-plantuml = 'java -Djava.awt.headless=true -jar {0}'.format(plantuml_jar_path)
++-
++ # Add any paths that contain templates here, relative to this directory.
++ templates_path = ['_templates']
++
diff --cc debian/patches/0003-Remove-mathjax-sphinx-extension.patch
index 0000000,0000000..b65d4f2
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Remove-mathjax-sphinx-extension.patch
@@@ -1,0 -1,0 +1,22 @@@
++From fd055c60876de44fbe634413f20c0c465434e0a7 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Wed, 14 Dec 2016 09:52:21 +0100
++Subject: Remove mathjax sphinx extension.
++
++It is not used anywhere in the documentation sources.
++---
++ docs/conf.py | 1 -
++ 1 file changed, 1 deletion(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index bf3d3f8..085a773 100755
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -35,7 +35,6 @@ extensions = [
++ 'sphinx.ext.intersphinx',
++ 'sphinx.ext.todo',
++ 'sphinx.ext.coverage',
++- 'sphinx.ext.mathjax',
++ 'sphinx.ext.napoleon',
++ ]
++
diff --cc debian/patches/0004-Use-local-objects.inv-files-for-intersphinx.patch
index de66d4f,0000000..07540e7
mode 100644,000000..100644
--- a/debian/patches/0004-Use-local-objects.inv-files-for-intersphinx.patch
+++ b/debian/patches/0004-Use-local-objects.inv-files-for-intersphinx.patch
@@@ -1,52 -1,0 +1,52 @@@
- From dddda3230bedb458533a039b4c5e546aac81287d Mon Sep 17 00:00:00 2001
++From 805dfbd47bdd1ab9cda0d60475b05d42237b9b07 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <FladischerMichael at fladi.at>
+Date: Wed, 14 Dec 2016 10:04:52 +0100
+Subject: Use local objects.inv files for intersphinx.
+
+---
+ docs/conf.py | 27 +++++++++++++++++++++------
+ 1 file changed, 21 insertions(+), 6 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
- index df0fd8e..bdd5eac 100755
++index 085a773..ca9e3e0 100755
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -16,6 +16,8 @@ import sys
+ import os
+ import shlex
+
++import django
++
+ # If extensions (or modules to document with autodoc) are in another directory,
+ # add these directories to sys.path here. If the directory is relative to the
+ # documentation root, use os.path.abspath to make it absolute, like shown here.
- @@ -299,10 +301,23 @@ texinfo_documents = [
++@@ -292,10 +294,23 @@ texinfo_documents = [
+
+
+ # Example configuration for intersphinx: refer to the Python standard library.
+-intersphinx_mapping = {
+- 'https://docs.python.org/': None,
+- 'django': (
+- 'http://docs.djangoproject.com/en/1.8/',
+- 'http://docs.djangoproject.com/en/1.8/_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 0f79694,0000000..2168abd
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,4 @@@
+0001-Add-setup-file-to-avoid-yet-another-Build-Depends-on.patch
- 0002-Use-packaged-plantuml.jar-file-for-sphinx.patch
- 0003-Use-packaged-MathJax.js-for-sphinx.patch
++0002-Remove-plantuml-sphinx-extension.patch
++0003-Remove-mathjax-sphinx-extension.patch
+0004-Use-local-objects.inv-files-for-intersphinx.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-django-etcd-settings.git
More information about the Python-modules-commits
mailing list