[Python-modules-commits] [terminaltables] 01/01: Improve sphinx documentation building

[Carl Suster]

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

arcresu-guest pushed a commit to branch master
in repository terminaltables.

commit e0f2da0a4a4033874c8c15d697817c30ab972a98
Author: Carl Suster <carl at contraflo.ws>
Date:   Mon Jan 9 16:57:31 2017 +1100

    Improve sphinx documentation building
    
    - Avoid compressing in html directory
    - Also block https with proxy variable
    - Suggest documentation from main package
---
 debian/changelog | 2 +-
 debian/control   | 1 +
 debian/rules     | 6 ++++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 74f753a..549783a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ terminaltables (3.1.0-1) experimental; urgency=medium
 
   * Initial release (Closes: #850093)
 
- -- Carl Suster <carl at contraflo.ws>  Fri, 06 Jan 2017 23:46:16 +1100
+ -- Carl Suster <carl at contraflo.ws>  Mon, 09 Jan 2017 16:56:28 +1100
diff --git a/debian/control b/debian/control
index d6fda5d..128d31c 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ X-Python3-Version: >= 3.3
 Package: python3-terminaltables
 Architecture: all
 Depends: ${python3:Depends}, ${misc:Depends}
+Suggests: python3-terminaltables-doc
 Description: Python library for printing tables to the console
  Easily draw tables in terminal/console applications from a list of lists of
  strings.
diff --git a/debian/rules b/debian/rules
index f41263a..db661dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,14 +9,16 @@ export PYBUILD_AFTER_TEST=rm {build_dir}/example*.py
 %:
 	dh $@ --with python3,sphinxdoc --buildsystem pybuild
 
+override_dh_sphinxdoc: export http_proxy=127.0.0.1:9
+override_dh_sphinxdoc: export https_proxy=127.0.0.1:9
 override_dh_sphinxdoc:
 ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
-	http_proxy='http://127.0.0.1:9/' PYTHONPATH=. sphinx-build -N -q -E -b html docs/ debian/python3-terminaltables-doc/usr/share/doc/python3-terminaltables-doc/html/
+	PYTHONPATH=. sphinx-build -N -q -E -b html docs/ debian/python3-terminaltables-doc/usr/share/doc/python3-terminaltables-doc/html/
 	dh_sphinxdoc
 endif
 
 override_dh_compress:
-	dh_compress -X example1.py -X example2.py -X example3.py
+	dh_compress -X example1.py -X example2.py -X example3.py -X html/
 
 override_dh_installchangelogs:
 	# Trim the changelog section out of the README file. Note that this will

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