[med-svn] [python-skbio] 02/09: Fix build deps & sphinx contrib to build docs

[Kevin Murray]

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 c167d9bde8d027d0d7431493a9574aab11f03bee
Author: Kevin Murray <spam at kdmurray.id.au>
Date:   Mon Nov 30 12:28:51 2015 +1100

    Fix build deps & sphinx contrib to build docs
---
 debian/control                                    |  2 ++
 debian/patches/0001-Use-stock-debian-sphinx.patch | 24 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 debian/rules                                      |  2 +-
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 465735c..24aee39 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,8 @@ Build-Depends: debhelper (>= 9),
                python-all-dev (>= 2.7),
                python3-all-dev,
                python-sphinx,
+               python-sphinx-bootstrap-theme,
+               python-numpydoc,
                python-setuptools,
                python3-setuptools,
                python-numpy (>= 1:1.9.2),
diff --git a/debian/patches/0001-Use-stock-debian-sphinx.patch b/debian/patches/0001-Use-stock-debian-sphinx.patch
new file mode 100644
index 0000000..6411157
--- /dev/null
+++ b/debian/patches/0001-Use-stock-debian-sphinx.patch
@@ -0,0 +1,24 @@
+From: Kevin Murray <spam at kdmurray.id.au>
+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/series b/debian/patches/series
new file mode 100644
index 0000000..a4e819d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Use-stock-debian-sphinx.patch
diff --git a/debian/rules b/debian/rules
index 34737d1..707245b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ export PYBUILD_NAME=skbio
 
 override_dh_auto_build:
 	dh_auto_build
-	export PYTHONPATH=. ; export http_proxy='127.0.0.1:9'; cd doc && make html
+	export PYTHONPATH="`pwd`"/.pybuild/pythonX.Y_2*/build/ ; export http_proxy='127.0.0.1:9'; cd doc && make html
 
 override_dh_auto_test:
 	#Loads of failures at this point.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-skbio.git