[Python-modules-commits] [python-cryptography] 01/02: Actually build and ship the Sphinx documentation (closes: #823375).

[Tristan Seligmann]

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

mithrandi pushed a commit to branch master
in repository python-cryptography.

commit 73163d1705fb6a3255d35e475d818f77f2ab32fa
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Wed May 4 04:50:37 2016 +0200

    Actually build and ship the Sphinx documentation (closes: #823375).
---
 debian/changelog                    |  7 +++++++
 debian/control                      |  5 ++++-
 debian/python-cryptography-doc.docs |  3 ++-
 debian/rules                        | 17 ++++++++++++++++-
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 700dca2..27e7e3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-cryptography (1.3.1-2) unstable; urgency=medium
+
+  * Actually build and ship the Sphinx documentation (closes: #823375).
+    - The "nodoc" build profile is now supported.
+
+ -- Tristan Seligmann <mithrandi at debian.org>  Wed, 04 May 2016 04:50:24 +0200
+
 python-cryptography (1.3.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 5caef1b..238741a 100644
--- a/debian/control
+++ b/debian/control
@@ -28,6 +28,8 @@ Build-Depends:
  python3-cryptography-vectors (>= 1.3.1~) <!nocheck>,
  python3-hypothesis <!nocheck>,
  python3-idna (>= 2.0~),
+ python-sphinx-rtd-theme <!nodoc>,
+ python3-sphinx <!nodoc>,
  python3-iso8601 <!nocheck>,
  python3-pretend <!nocheck>,
  python3-pyasn1 (>= 0.1.8~),
@@ -87,8 +89,9 @@ Description: Python library exposing cryptographic recipes and primitives (Pytho
 
 Package: python-cryptography-doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
 Section: doc
+Build-Profiles: <!nodoc>
 Description: Python library exposing cryptographic recipes and primitives (documentation)
  The cryptography library is designed to be a "one-stop-shop" for
  all your cryptographic needs in Python.
diff --git a/debian/python-cryptography-doc.docs b/debian/python-cryptography-doc.docs
index 77f12ae..1618a62 100644
--- a/debian/python-cryptography-doc.docs
+++ b/debian/python-cryptography-doc.docs
@@ -1 +1,2 @@
-docs/
+.pybuild/docs/*
+README.rst
diff --git a/debian/rules b/debian/rules
index 60488fb..6c89379 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,13 @@ export PYBUILD_BEFORE_TEST=cp -R {dir}/src/${PYBUILD_NAME}.egg-info {build_dir}
 export PYBUILD_AFTER_TEST=rm -r {build_dir}/.hypothesis
 
 
+ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
+SPHINXDOC=,sphinxdoc
+else
+SPHINXDOC=
+endif
 %:
-	dh $@ --with python2,python3 --buildsystem=pybuild
+	dh $@ --with python2,python3$(SPHINXDOC) --buildsystem=pybuild
 
 
 override_dh_auto_clean:
@@ -34,3 +39,13 @@ override_dh_python3:
 	# See comment in override_dh_python2
 	sed -i '/^cffi/d' \
 	    debian/python3-cryptography/usr/lib/python3/dist-packages/cryptography*.egg-info/requires.txt
+
+
+ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
+override_dh_auto_build:
+	dh_auto_build
+	PYTHONPATH=. \
+	   http_proxy='127.0.0.1:9' \
+	   https_proxy='127.0.0.1:9' \
+	   sphinx-build -N -b html docs/ $(CURDIR)/.pybuild/docs/html/
+endif

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