[python-fabio] 49/73: use pybuild and switch to compat level 9

Tue Jan 5 11:34:10 UTC 2016

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

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

commit 7794eb7b15a82b74d299f917c21c1c636c07cbc1
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sun Apr 6 14:54:41 2014 +0200

    use pybuild and switch to compat level 9
---
 debian/changelog         | 13 +++++++++---
 debian/compat            |  2 +-
 debian/control           |  9 +++++---
 debian/copyright         |  4 ++--
 debian/python-fabio.NEWS | 53 ------------------------------------------------
 debian/rules             | 32 ++++++++++++++++-------------
 6 files changed, 37 insertions(+), 76 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ef1535..3a135b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,19 @@
-python-fabio (0.1.4-1) UNRELEASED; urgency=medium
+python-fabio (0.1.4-1) unstable; urgency=medium
 
-  * Imported Upstream version 0.1.4
+  * Imported Upstream version 0.1.4 (Closes: #735432, #693121)
+  * Run all tests during the build (thanks to pybuild)
+  * debian/control
+    - Add Build-Depends: dh-python for pybuild
+  * debian/compat
+    - switch to compat level 9
   * debian/copyright
-    - updated with the 0.1.4 informations
+    - updated for 0.1.4 version
   * debian/patchs
     - deleted (applyed by upstream)
       - 0001-forwarded-upstream-cythonize-during-the-build.patch
       - 0002-compat_2.5.patch
+  * debian/rules
+    - use the pybuild buildsystem
   * debian/watch
     - use the sourceforge redirector
 
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index f81bb2c..6998b6c 100644
--- a/debian/control
+++ b/debian/control
@@ -7,14 +7,17 @@ Priority: extra
 Build-Depends: cython,
                cython-dbg,
                debhelper (>= 9),
+               dh-python,
                python-all-dev,
                python-all-dbg,
+               python-imaging,
+               python-imaging-dbg,
+               python-lxml,
+               python-lxml-dbg,
                python-numpy,
                python-numpy-dbg,
                python-setuptools
-Build-Depends-Indep: python-imaging,
-                     python-lxml,
-                     python-sphinx (>= 1.0.7+dfsg-1~)
+Build-Depends-Indep: python-sphinx (>= 1.0.7+dfsg-1~)
 Standards-Version: 3.9.5
 Vcs-Browser: http://git.epn-campus.eu/projects/fabio/repository
 Vcs-Git: git://git@git.epn-campus.eu:python-fabio
diff --git a/debian/copyright b/debian/copyright
index ae0b3af..8133cfb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -34,7 +34,7 @@ Files: fabio-src/raxisimage.py
 Copyright: 2013-2014 Brian R. Pauw <brian at stack.nl>
 License: GPL-3.0+
 
-File: scripts/fabio_viewer
+Files: scripts/fabio_viewer
 Copyright: 2012 Gael Goret <gael.goret at esrf.fr>
                 European Synchrotron Radiation Facility
 License: GPL-3.0+
@@ -66,7 +66,7 @@ Files: src/stdint.h
 Copyright: 2006-2008 Alexander Chemeris
 License: BSD
 
-File: fabio-src/argparse.py
+Files: fabio-src/argparse.py
 Copyright: © 2006-2009 Steven J. Bethard <steven.bethard at gmail.com>
 License: Apache-2.0
 
diff --git a/debian/python-fabio.NEWS b/debian/python-fabio.NEWS
deleted file mode 100644
index cecb1b6..0000000
--- a/debian/python-fabio.NEWS
+++ /dev/null
@@ -1,53 +0,0 @@
-Changelog
-=========
-
-From FabIO-0.1.2 to FabIO-0.1.3:
-................................
-- Fixed a memory-leak in mar345 module
-- Improved support for bruker format (writer & reader)
-- Fixed a bug in EDF headers (very long headers)
-- Provide template for new file-formats
-- Fix a bug related to PIL in new MacOSX
-- Allow binary-images to be read from end
-
-From FabIO-0.1.1 to FabIO-0.1.2:
-................................
-- Fixed a bug in fabioimage.write (impacted all writers)
-- added Sphinx documentation "python setup.py build_doc"
-- PyLint compliance of some classes (rename, ...)
-- tests from installer with "python setup.py build test"
-
-From FabIO-0.1.0 to FabIO-0.1.1:
-................................
-- Merged Mar345 image reader and writer with cython bindings (towards python3 compliance)
-- Improve CBF image writing under windows
-- Bz2, Gzip and Flat files are managed through a common way ... classes are more (python v2.5) or less (python v2.7) overloaded
-- Fast EDF reading if one assumes offsets are the same between files, same for ROIs
-
-From FabIO-0.0.8 to FabIO-0.1.0:
-................................
-- OXD reader improved and writer implemented
-- Mar345 reader improved and writer implemented
-- CBF writer implemented
-- Clean-up of the code & bug fixes
-- Move towards python3
-- Make PIL optional dependency
-
-Python3 is not yet tested but some blocking points have been identified and some fixed.
-
-From FabIO-0.0.7 to FabIO-0.0.8:
-................................
-- Support for Tiff using TiffIO module from V.A.Solé
-- Clean-up of the code & bug fixes
-
-From FabIO-0.0.6 to FabIO-0.0.7:
-................................
-- Support for multi-frames EDF files
-- Support for XML images/2D arrays used in EDNA
-- new method: fabio.open(filename) that is an alias for fabio.openimage.openimage(filename)
-
-From FabIO-0.0.4 to FabIO-0.0.6:
-................................
-- Support for CBF files from Pilatus detectors
-- Support for KCD files from Nonius Kappa CCD images
-- write EDF with their native data type (instead of uint16 by default)
diff --git a/debian/rules b/debian/rules
index 805c17e..7e64b9d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,39 +1,43 @@
 #!/usr/bin/make -f
 
+export DH_VERBOSE=1
+export PYBUILD_NAME=fabio
+
 PY2VERS = $(shell pyversions -r -v)
 
 # to build without sphinxdoc
 WITH_SPHINXDOC = $(shell if [ -x /usr/bin/dh_sphinxdoc ]; then echo "--with sphinxdoc"; fi)
 
 %:
-	dh $@ --with python2 $(WITH_SPHINXDOC)
+	dh $@ --with python2  --buildsystem=pybuild $(WITH_SPHINXDOC)
 
 override_dh_clean:
         # remove the cython generated files distributed by upstream
 	rm -f $(patsubst %.pyx,%.c,$(wildcard src/*.pyx))
-	rm -rf build/sphinx
+	rm -rf build/html
 	rm -rf *.egg-info
 	dh_clean
 
 override_dh_auto_build-indep:
 	dh_auto_build
-	# build the documentation
-	set -e -x;\
-	for py in $(PY2VERS); do \
-		env http_proxy='localhost' python$$py setup.py build_doc ;\
-	done
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_BUILD_ARGS="PYTHONPATH={build_dir} http_proxy='localhost' sphinx-build -N -bhtml doc/source build/html" dh_auto_build  # HTML generator
+
+override_dh_auto_test:
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_TEST_ARGS="PYTHONPATH={build_dir} {interpreter} test/test_all.py" dh_auto_test
 
 override_dh_install:
 	dh_numpy
-	# Install everything excluding the *_d.so debug extensions to python-foo
-	dh_install -X"*_d.so" "debian/tmp/*" -p python-fabio
+	dh_install
 
-	# Install the debug extensions to python-foo-dbg
-	dh_install "debian/tmp/usr/lib/python*/*-packages/fabio/*_d.so" -p python-fabio-dbg
+	# remove the /bin part of the -dbg package which conflict with
+	# non-dbg packages
+	rm -rf debian/python-fabio-dbg/usr/bin
 
-	# Continue with regular dh_install
-	dh_install
+override_dh_installman:
+	dh_installman -p python-fabio doc/man/fabio_viewer.1
 
 override_dh_installdocs-indep:
 	# install the documentation
-	dh_installdocs "build/sphinx/html" -p python-fabio-doc
+	dh_installdocs "build/html" -p python-fabio-doc

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

