This is an automated email from the git hooks/post-receive script. daube-guest pushed a commit to branch master in repository python-skbio.
commit be0c95f04639ea3eba49f4d8f0aa6e2ab0a3d80c Author: Kevin Murray <[email protected]> Date: Mon Dec 21 16:49:44 2015 +1100 Refresh patches after new upstream imported --- debian/patches/0001-Use-stock-debian-sphinx.patch | 24 ------------ debian/patches/0002-Disable-intersphinx.patch | 44 ---------------------- ...ce-use-of-Agg-backend-no-X-for-matplotlib.patch | 14 +++---- debian/patches/series | 2 - 4 files changed, 6 insertions(+), 78 deletions(-) diff --git a/debian/patches/0001-Use-stock-debian-sphinx.patch b/debian/patches/0001-Use-stock-debian-sphinx.patch deleted file mode 100644 index 6411157..0000000 --- a/debian/patches/0001-Use-stock-debian-sphinx.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Kevin Murray <[email protected]> -Date: Mon, 30 Nov 2015 12:27:53 +1100 -Subject: Use stock debian sphinx - ---- - doc/source/conf.py | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/doc/source/conf.py b/doc/source/conf.py -index 3905715..172e0ca 100644 ---- a/doc/source/conf.py -+++ b/doc/source/conf.py -@@ -6,11 +6,7 @@ import sys - import os - - # Check that dependencies are installed and the correct version if necessary --sphinx_version = '1.2.2' - import sphinx --if sphinx.__version__ != sphinx_version: -- raise RuntimeError("Sphinx %s required" % sphinx_version) -- - import sphinx_bootstrap_theme - - # We currently rely on the latest version of numpydoc available on GitHub: diff --git a/debian/patches/0002-Disable-intersphinx.patch b/debian/patches/0002-Disable-intersphinx.patch deleted file mode 100644 index cb0ee4e..0000000 --- a/debian/patches/0002-Disable-intersphinx.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Kevin Murray <[email protected]> -Date: Mon, 30 Nov 2015 12:35:17 +1100 -Subject: Disable intersphinx - ---- - doc/source/conf.py | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/doc/source/conf.py b/doc/source/conf.py -index 172e0ca..6e44c17 100644 ---- a/doc/source/conf.py -+++ b/doc/source/conf.py -@@ -48,7 +48,7 @@ extensions = [ - 'sphinx.ext.coverage', - 'sphinx.ext.doctest', - 'sphinx.ext.autosummary', -- 'sphinx.ext.intersphinx' -+# 'sphinx.ext.intersphinx' - ] - - # Determine if the matplotlib has a recent enough version of the -@@ -372,14 +372,14 @@ if not use_matplotlib_plot_directive: - # ----------------------------------------------------------------------------- - # Intersphinx configuration - # ----------------------------------------------------------------------------- --intersphinx_mapping = { -- 'http://docs.python.org/dev': None, -- 'http://docs.scipy.org/doc/numpy': None, -- 'http://docs.scipy.org/doc/scipy/reference': None, -- 'http://matplotlib.org': None, -- 'http://pandas.pydata.org': None, -- 'http://www.biom-format.org':None --} -+#intersphinx_mapping = { -+# 'http://docs.python.org/dev': None, -+# 'http://docs.scipy.org/doc/numpy': None, -+# 'http://docs.scipy.org/doc/scipy/reference': None, -+# 'http://matplotlib.org': None, -+# 'http://pandas.pydata.org': None, -+# 'http://www.biom-format.org':None -+#} - - # ----------------------------------------------------------------------------- - # Source code links diff --git a/debian/patches/0003-Force-use-of-Agg-backend-no-X-for-matplotlib.patch b/debian/patches/0003-Force-use-of-Agg-backend-no-X-for-matplotlib.patch index 6813276..0008224 100644 --- a/debian/patches/0003-Force-use-of-Agg-backend-no-X-for-matplotlib.patch +++ b/debian/patches/0003-Force-use-of-Agg-backend-no-X-for-matplotlib.patch @@ -6,22 +6,20 @@ Subject: Force use of Agg backend (no X) for matplotlib doc/source/conf.py | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/doc/source/conf.py b/doc/source/conf.py -index 6e44c17..cd40a43 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py -@@ -5,6 +5,10 @@ import glob - import sys - import os +@@ -7,6 +7,10 @@ + import types + import re +# Force matplotlib to not use any Xwindows backend. +import matplotlib +matplotlib.use('Agg') + - # Check that dependencies are installed and the correct version if necessary import sphinx - import sphinx_bootstrap_theme -@@ -53,6 +57,7 @@ extensions = [ + import sphinx.ext.autosummary as autosummary + +@@ -128,6 +132,7 @@ # Determine if the matplotlib has a recent enough version of the # plot_directive. diff --git a/debian/patches/series b/debian/patches/series index 7d40ef6..0932e9b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ -0001-Use-stock-debian-sphinx.patch -0002-Disable-intersphinx.patch 0003-Force-use-of-Agg-backend-no-X-for-matplotlib.patch 0004-Don-t-turn-sphinx-warnings-into-errors.patch 0005-Set-mathjax-path-to-debian-s-copy.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-skbio.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
