[med-svn] r16989 - trunk/packages/python-biom-format/trunk/debian

[Andreas Tille]

Author: tille
Date: 2014-05-21 15:41:55 +0000 (Wed, 21 May 2014)
New Revision: 16989

Modified:
   trunk/packages/python-biom-format/trunk/debian/control
   trunk/packages/python-biom-format/trunk/debian/copyright
   trunk/packages/python-biom-format/trunk/debian/rules
Log:
Delete autogenerated *.c files and recreate them using CYTHON; create documentation thanks to a patch from Jakub Wilk (thanks Jakukb)


Modified: trunk/packages/python-biom-format/trunk/debian/control
===================================================================
--- trunk/packages/python-biom-format/trunk/debian/control	2014-05-21 13:15:59 UTC (rev 16988)
+++ trunk/packages/python-biom-format/trunk/debian/control	2014-05-21 15:41:55 UTC (rev 16989)
@@ -6,8 +6,10 @@
 Build-Depends: debhelper (>= 9),
                dh-python,
                dh-linktree,
+               cython,
                python-dev,
                python-numpy,
+               python-scipy,
                help2man,
                python-dateutil,
                python-cogent,

Modified: trunk/packages/python-biom-format/trunk/debian/copyright
===================================================================
--- trunk/packages/python-biom-format/trunk/debian/copyright	2014-05-21 13:15:59 UTC (rev 16988)
+++ trunk/packages/python-biom-format/trunk/debian/copyright	2014-05-21 15:41:55 UTC (rev 16989)
@@ -5,6 +5,7 @@
 Files-Excluded:
     doc/_build
     *.so
+    biom/*.c
     *.egg-info
 
 Files: *

Modified: trunk/packages/python-biom-format/trunk/debian/rules
===================================================================
--- trunk/packages/python-biom-format/trunk/debian/rules	2014-05-21 13:15:59 UTC (rev 16988)
+++ trunk/packages/python-biom-format/trunk/debian/rules	2014-05-21 15:41:55 UTC (rev 16989)
@@ -12,21 +12,22 @@
 #MIN_CYTHONVER := 0.17~beta1-2
 #NO_CYTHON := $(shell if dpkg --compare-versions $(CYTHONVER) lt $(MIN_CYTHONVER) ; then echo 0 ; else echo 1 ; fi)
 
-# linux-x86_64
-pybuilddir := $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)-$(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
+export PYBUILD_TEST_NOSE = 1
 
+pyrun = DEB_BUILD_OPTIONS= pybuild -s custom -p $(shell pyversions -dv) --test --test-args
+
 %:
 	dh $@ --with python2 --buildsystem=pybuild --with linktree
 
 override_dh_auto_build:
-	dh_auto_build
-	make --directory=doc singlehtml
-	env PYTHONPATH=. pyqi make-bash-completion \
+	USE_CYTHON=true dh_auto_build
+	$(pyrun) 'make --directory=doc singlehtml'
+	$(pyrun) 'pyqi make-bash-completion \
 	    --command-config-module biom.interfaces.optparse.config \
-	    --driver-name biom -o debian/bash-completion
+	    --driver-name biom -o debian/bash-completion'
 
 override_dh_installman:
-	make --directory=doc make man
+	$(pyrun) 'make --directory=doc man'
 	dh_installman
 
 override_dh_auto_clean:
@@ -44,16 +45,6 @@
 	#   "This script no longer exists. ..."
 	rm -f $(bindir)/*.py
 
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	set -e -x;\
-	for pyv in `pyversions -dv` ; do \
-	    cd build/; \
-	    ln -s ../python-code/tests; \
-	    env PYTHONPATH=lib.$(pybuilddir)-$${pyv} nosetests ; \
-	done
-endif
-
 get-orig-source:
 	# . debian/get-orig-source
 	mkdir -p ../tarballs