[python-fabio] 03/04: refresh the rules

Frédéric-Emmanuel Picca picca at moszumanska.debian.org
Sat Sep 2 16:09:17 UTC 2017


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

picca pushed a commit to branch master
in repository python-fabio.

commit ba4b636ca72be3f79640d3a0e92ab954adaf9271
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Sep 2 17:50:48 2017 +0200

    refresh the rules
---
 debian/changelog |  1 +
 debian/control   |  4 ++--
 debian/rules     | 17 +++++++++++------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8af16bb..484a447 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ python-fabio (0.5.0+dfsg-1) UNRELEASED; urgency=medium
   * New upstream version 0.5.0+dfsg
   * switch to compat level 10
   * d/control
+    - fabio-viewer scripts python2 -> python3
     - Bump Standard-Versions to 4.1.0 (extra -> optional)
     - cme fixed
     - wrap-and-sort
diff --git a/debian/control b/debian/control
index 4d770e6..514a13a 100644
--- a/debian/control
+++ b/debian/control
@@ -44,9 +44,9 @@ X-Python3-Version: >= 3.4
 Package: fabio-viewer
 Architecture: all
 Section: python
-Depends: python-fabio (>= ${source:Version}),
+Depends: python3-fabio (>= ${source:Version}),
          ${misc:Depends},
-         ${python:Depends}
+         ${python3:Depends}
 Breaks: python-fabio (<< 0.2.2+dfsg-2~)
 Replaces: python-fabio (<< 0.2.2+dfsg-2~)
 Description: Viewer for images produced by 2D X-ray detector
diff --git a/debian/rules b/debian/rules
index d8e4793..41bb9c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,13 +10,18 @@ override_dh_clean:
         # remove the cython generated files distributed by upstream
 	rm -f $(patsubst %.pyx,%.c,$(wildcard fabio/ext/*.pyx))
 	rm -rf doc/build/html
+	rm -rf build/man
 	rm -rf *.egg-info
 	dh_clean
 
-# unactive test for now
+override_dh_auto_build:
+	dh_auto_build
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_BUILD_ARGS="PYTHONPATH={build_dir} {interpreter} setup.py build_man" dh_auto_build
+
 override_dh_auto_test:
-#	PYBUILD_SYSTEM=custom \
-#	PYBUILD_TEST_ARGS="PYTHONPATH={build_dir} FABIO_TESTIMAGES=testimages {interpreter} ./run_tests.py" dh_auto_test
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_TEST_ARGS="PYTHONPATH={build_dir} http_proxy='127.0.0.1:9' FABIO_TESTIMAGES=testimages {interpreter} ./run_tests.py" dh_auto_test
 
 override_dh_install:
 	dh_install
@@ -24,15 +29,15 @@ override_dh_install:
 	dh_numpy3
 
         # install scripts into fabio-viewer
-	python setup.py install_scripts -d debian/fabio-viewer/usr/bin
+	python3 setup.py install_scripts -d debian/fabio-viewer/usr/bin
 
 override_dh_installman:
-	dh_installman -p fabio-viewer doc/man/fabio_viewer.1
+	dh_installman -p fabio-viewer build/man/*.1
 
 override_dh_sphinxdoc:
 ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
 	PYBUILD_SYSTEM=custom \
-	PYBUILD_BUILD_ARGS="cd doc && PYTHONPATH={build_dir} http_proxy='127.0.0.1:9' {interpreter} -c \"import sys;from sphinx import main;sys.exit(main(sys.argv))\" -N -bhtml source build/html" dh_auto_build  # HTML generator
+	PYBUILD_BUILD_ARGS="cd doc && PYTHONPATH={build_dir} http_proxy='127.0.0.1:9' {interpreter} -m sphinx -N -bhtml source build/html" dh_auto_build  # HTML generator
 	dh_installdocs "doc/build/html" -p python-fabio-doc
 	dh_sphinxdoc -O--buildsystem=pybuild
 endif

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



More information about the debian-science-commits mailing list