[Python-modules-commits] [python-pskc] 05/07: Switch way in which Sphinx documentation is built

[Arthur de Jong]

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

adejong pushed a commit to branch master
in repository python-pskc.

commit 2d2265e0e956e0831ece4680c367534b49197d9b
Author: Arthur de Jong <adejong at debian.org>
Date:   Sun Dec 31 15:28:53 2017 +0100

    Switch way in which Sphinx documentation is built
---
 debian/changelog | 3 ++-
 debian/control   | 2 +-
 debian/rules     | 5 ++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f230745..16816f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,8 +26,9 @@ python-pskc (1.0-1) UNRELEASED; urgency=medium
   * Drop patch to add missing file from tarball
   * Work around test suite issues
   * Switch to HTTPS URLs
+  * Use Python3 version to build Sphinx documentation and use sphinx-build
 
- -- Arthur de Jong <adejong at debian.org>  Fri, 29 Dec 2017 23:47:52 +0100
+ -- Arthur de Jong <adejong at debian.org>  Sun, 31 Dec 2017 15:28:53 +0100
 
 python-pskc (0.5-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 041b443..5c5166d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Arthur de Jong <adejong at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Standards-Version: 3.9.8
 Build-Depends: python-all (>= 2.6.6-3~), python3-all (>= 3.1.2-10~),
-               debhelper (>= 9), dh-python, python-sphinx (>= 1.0.7+dfsg),
+               debhelper (>= 9), dh-python, python3-sphinx (>= 1.0.7+dfsg),
                python-setuptools, python3-setuptools,
                python-nose (>= 1.2.0), python3-nose (>= 1.2.0),
                python-cryptography, python3-cryptography,
diff --git a/debian/rules b/debian/rules
index 52d3705..7c70921 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,12 @@ export PYBUILD_NAME = pskc
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
+override_dh_auto_build: export http_proxy=127.0.0.1:9
+override_dh_auto_build: export https_proxy=127.0.0.1:9
 override_dh_auto_build:
 	dh_auto_build
-	http_proxy='127.0.0.1:9' python $(CURDIR)/setup.py build_sphinx
+	PYTHONPATH=. sphinx-build -N -bhtml docs build/sphinx/html
+	PYTHONPATH=. sphinx-build -N -bman docs build/sphinx/man
 
 override_dh_auto_test:
 	dh_auto_test -- --system=custom --test-args='PYTHONWARNINGS=all TZ=Europe/Amsterdam {interpreter} setup.py nosetests --exclude="(test_signature|test_pskc2csv).doctest" --cover-min-percentage 95'

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