[Python-modules-commits] [python-scipy] 01/01: generate documentation in build target too

[Sebastian Humenda]

This is an automated email from the git hooks/post-receive script.

moomoc-guest pushed a commit to branch master
in repository python-scipy.

commit 45fa35c6ace24cf40f308ba349d03f8dccd234ad
Author: Sebastian Humenda <shumenda at gmx.de>
Date:   Sun Sep 25 00:29:52 2016 +0200

    generate documentation in build target too
    
    Sphinx imports scipy to query the docstrings. To make it importable, it has
    to be build first. Therefore the build-indep target depends on the build
    target, so it actually builds architecture-dependent stuff.
---
 debian/changelog |  6 ++++++
 debian/rules     | 15 ++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8d9834e..a5ca27b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-scipy (0.18.1-1) UNRELEASED; urgency=medium
+
+  * import new upstream (bug fix) release
+
+ -- Sebastian Humenda <shumenda at gmx.de>  Sat, 24 Sep 2016 19:48:37 +0200
+
 python-scipy (0.18.0-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index 6652b1a..703f06a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,9 +19,14 @@ endif
 %:
 	dh $@ --with python2,python3
 
+clean: override_dh_auto_clean
+
 override_dh_auto_clean:
 	rm -rf build
+	-rm -rf doc/source/fontList.cache
+	-rm -rf doc/build
 	find . -name "*.pyc" -exec rm {} \;
+	dh_clean
 
 override_dh_auto_configure:
 	cd scipy/special && python generate_ufuncs.py
@@ -32,13 +37,13 @@ build-python%:
 	CFLAGS="-g -ggdb" python$*-dbg setup.py config_fc \
 				--noarch build;
 
-build: build-arch build-indep
+build-arch: build
 
-build-arch:
+build:
 	dh build --with=python2,python3
-
-build-indep:
+	# generate documentation (see comment below)
 	(export MPLCONFIGDIR=. ; make -C doc html PYTHONPATH=../$(PYLIBPATH))
+build-indep: build # no point in doing anything here, scipy must be compiled, before any documentation can be extracted; the module needs to be importable for sphinx
 
 override_dh_auto_build: $(PY2VERS:%=build-python%) $(PY3VERS:%=build-python%)
 
@@ -46,7 +51,7 @@ install-python%:
 	python$* setup.py install --root $(BASE)/tmp \
 		--force --no-compile --install-layout=deb;
 
-	python$*-dbg setup.py install --root $(BASE)/tmp \
+	python$*-dbg setup.py install --root $(BASE)/python$*-scipy-dbg \
 		--force --no-compile --install-layout=deb;
 
 override_dh_install: $(PY3VERS:%=install-python%) $(PY2VERS:%=install-python%)

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