[Python-modules-commits] r34238 - in packages/pywavelets/trunk/debian (changelog control rules)

[eriol-guest at users.alioth.debian.org]

    Date: Monday, September 14, 2015 @ 00:40:04
  Author: eriol-guest
Revision: 34238

Switch packaging to pybuild

Modified:
  packages/pywavelets/trunk/debian/changelog
  packages/pywavelets/trunk/debian/control
  packages/pywavelets/trunk/debian/rules

Modified: packages/pywavelets/trunk/debian/changelog
===================================================================
--- packages/pywavelets/trunk/debian/changelog	2015-09-13 19:24:10 UTC (rev 34237)
+++ packages/pywavelets/trunk/debian/changelog	2015-09-14 00:40:04 UTC (rev 34238)
@@ -1,17 +1,21 @@
 pywavelets (0.3.0-1) UNRELEASED; urgency=medium
 
-  * New upstream release.
+  * New upstream release (Closes: #796767).
+  * Switch packaging to pybuild.
   * debian/compat
     - Bump debhelper compatibility level to 9.
   * debian/control
     - Bump debhelper B-D to (>= 9).
+    - Add dh-python and python-nose to B-D.
   * debian/patches/01-get_version_from_source.patch
     - Grab version from the source code instead of importing pywt to build
       documentation at package build time.
+  * debian/rules
+    - Rewrite from scratch using pybuild.
   * debian/watch
     - Use pypi.debian.net redirector.
 
- -- Daniele Tricoli <eriol at mornie.org>  Sun, 13 Sep 2015 21:23:05 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Mon, 14 Sep 2015 02:35:05 +0200
 
 pywavelets (0.2.2-2) unstable; urgency=low
 

Modified: packages/pywavelets/trunk/debian/control
===================================================================
--- packages/pywavelets/trunk/debian/control	2015-09-13 19:24:10 UTC (rev 34237)
+++ packages/pywavelets/trunk/debian/control	2015-09-14 00:40:04 UTC (rev 34238)
@@ -5,8 +5,10 @@
 Priority: optional
 Build-Depends:
  cython (>=0.16),
+ dh-python,
  debhelper (>= 9),
  python-all-dev (>=2.6.6-3),
+ python-nose,
  python-numpy (>= 1:0.9.8-2),
  python-setuptools (>= 0.6b3-1~),
  python-sphinx (>= 1.0.7+dfsg)

Modified: packages/pywavelets/trunk/debian/rules
===================================================================
--- packages/pywavelets/trunk/debian/rules	2015-09-13 19:24:10 UTC (rev 34237)
+++ packages/pywavelets/trunk/debian/rules	2015-09-14 00:40:04 UTC (rev 34238)
@@ -1,82 +1,18 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
-
+export PYBUILD_NAME=pywt
 export PYTHONWARNINGS=d
 
-export CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
-export CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
-export LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+%:
+	dh $@ --with python2 --buildsystem=pybuild
 
-PYVERS = $(shell pyversions -vr)
-PACKAGE_NAME = python-pywt
-MODULE_NAME = PyWavelets
+override_dh_auto_test:
 
-TESTS = \
-	test_doc.py \
-	test_perfect_reconstruction.py \
-	test_regression.py
-
-pythonpath = $$(_py_=$(strip $(1)); _py_=$${_py_\#python}; ls -d $(CURDIR)/build/lib.*-$${_py_})
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -rf build doc/build src/_pywt.[ch]
-	rm -rf $(MODULE_NAME).egg-info
-	find . -name '*\.py[co]' -delete
-	dh_clean install-stamp install-ext-* build-stamp build-ext-* build-docs
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep:
-build-stamp: build-docs $(PYVERS:%=build-ext-%)
-	touch $@
-
-build-docs:
-	make -C doc html
-	touch $@
-
-build-ext-%:
-	dh_testdir
-	python$* setup.py build
-
-ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
-	set -e; \
-	cd tests; \
-	for test in $(TESTS); do \
-		PYTHONPATH=$(call pythonpath,python$*) python$* $$test; \
-	done
+override_dh_auto_install:
+	dh_auto_install
+	# Unfortunately, we need to run tests after install because numpy does not
+	# let you run them from the source directory.
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_TEST_ARGS="{interpreter} -c \"import sys ; sys.path.insert(0, '{destdir}/usr/lib/python{version}/dist-packages/') ; import pywt ; pywt.test()\"" dh_auto_test
 endif
-
-	touch $@
-
-install: install-stamp
-install-stamp: build-stamp $(PYVERS:%=install-ext-%)
-install-ext-%:
-	python$* setup.py install \
-		--root $(CURDIR)/debian/$(PACKAGE_NAME) --install-layout=deb
-
-binary-indep:
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs CHANGES.txt
-	dh_installdocs
-	dh_sphinxdoc
-	dh_link usr/share/doc/python-pywt/copyright usr/share/doc/python-pywt/html/_downloads/COPYING.txt
-	dh_installexamples -a
-	dh_python2 -a
-	dh_strip -a
-	dh_compress -X.py -Xobjects.inv -X.txt
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps -a
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-
-.PHONY: clean binary-indep binary-arch binary