[Python-modules-commits] [celery] 02/08: Build documentation in override_dh_sphinxdoc.

Michael Fladischer fladi at moszumanska.debian.org
Wed Nov 8 08:18:07 UTC 2017


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

fladi pushed a commit to branch debian/master
in repository celery.

commit 46ab2def57c81cf511429e5f012fad947ae63cf2
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Mon Nov 6 11:17:32 2017 +0100

    Build documentation in override_dh_sphinxdoc.
---
 debian/changelog |  1 +
 debian/rules     | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3997e59..847d47c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 celery (4.1.0-1~exp2) UNRELEASED; urgency=medium
 
   * Run wrap-and-sort -bast to reduce diff size of future changes.
+  * Build documentation in override_dh_sphinxdoc.
 
  -- Michael Fladischer <fladi at debian.org>  Mon, 06 Nov 2017 08:48:20 +0100
 
diff --git a/debian/rules b/debian/rules
index 6888af8..e45e312 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,17 +13,12 @@ override_dh_installman:
 	docbook-to-man debian/manpage.celery.sgml > celery.1
 	dh_installman
 
-override_dh_auto_build:
-	PYTHONPATH=.:$$PYTHONPATH sphinx-build -b html -d .build/.doctrees -N docs .build/html
-	ln docs/images/celery_128.png .build/html/_images/celery_128.png
-	dh_auto_build
-
 override_dh_auto_test:
 	PYTHONPATH=. LC_ALL=C.UTF-8 \
 	dh_auto_test -- --system=custom --test-args="{interpreter} setup.py test"
 
 override_dh_clean:
-	rm -rf .build
+	rm -rf docs/.build
 	dh_clean
 
 override_dh_auto_install:
@@ -45,3 +40,9 @@ override_dh_installinit:
 
 override_dh_installchangelogs:
 	dh_installchangelogs Changelog
+
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
+	PYTHONPATH=. sphinx-build -b html -d docs/.build/.doctrees -N docs $(CURDIR)/debian/python-celery-doc/usr/share/doc/python-celery-doc/html
+	dh_sphinxdoc
+endif

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



More information about the Python-modules-commits mailing list