Revert "Revamp packaging of test data"

This reverts commit 6ec8aab49e14011687ef1b84b22db675b78ec1d5.

Conflicts:
	debian/control
	debian/python-pysam-tests.lintian-overrides
	debian/rules

Restore python-pysam-data test package.

diff --git a/debian/control b/debian/control
index 0bca2d497739b0ec4144288ae7ac86dc0c36c275..aaa38a064e681c5bff355b52109db492a3dc7fb5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -45,3 +45,15 @@ Description: interface for the SAM/BAM sequence alignment and mapping format (Py
  for tabix.
  .
  This package installs the module for Python 3.
+
+Package: python-pysam-tests
+Architecture: all
+Enhances: python-pysam
+Depends: ${misc:Depends},
+Description: interface for the SAM/BAM sequence alignment and mapping format (test data)
+ Pysam is a Python module for reading and manipulating Samfiles. It's a
+ lightweight wrapper of the samtools C-API. Pysam also includes an interface
+ for tabix.
+ .
+ This package contains the data provided by upstream to run the pysam
+ test suite.

diff --git a/debian/python-pysam-tests.README.Debian b/debian/python-pysam-tests.README.Debian
new file mode 100644 (file)
index 0000000..0c7ed43
--- /dev/null
+++ b/debian/python-pysam-tests.README.Debian
@@ -0,0 +1,8 @@
+Pysam for Debian
+================
+
+To verify whether your python-pysam and python3-pysam modules are working
+correctly you can run the test suite manually by running the scripts
+run-nose-tests and run-nose3-tests in this directory.
+
+ -- Jorge Soares <j.s.soares@gmail.com>  Fri, 28 Nov 2014 14:29:40 +0100

diff --git a/debian/python-pysam-tests.docs b/debian/python-pysam-tests.docs
new file mode 100644 (file)
index 0000000..8e41b76
--- /dev/null
+++ b/debian/python-pysam-tests.docs
@@ -0,0 +1,2 @@
+debian/tests/run-nose-tests
+debian/tests/run-nose3-tests

diff --git a/debian/python-pysam-tests.install b/debian/python-pysam-tests.install
new file mode 100644 (file)
index 0000000..a99a578
--- /dev/null
+++ b/debian/python-pysam-tests.install
@@ -0,0 +1 @@
+tests  usr/share/doc/python-pysam

diff --git a/debian/python-pysam-tests.lintian-overrides b/debian/python-pysam-tests.lintian-overrides
new file mode 100644 (file)
index 0000000..61c0327
--- /dev/null
+++ b/debian/python-pysam-tests.lintian-overrides
@@ -0,0 +1,2 @@
+# Upstream-provided gzip file is independent of the build process
+package-contains-timestamped-gzip usr/share/doc/python-pysam/tests/pysam_data/ex1.sam.gz

diff --git a/debian/rules b/debian/rules
index 5f45fc36ed80b31d9ae67d5bf6bb930ffa9cc118..238d38551bc256c86f2f660068380e9eb2667559 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
 export PYBUILD_NAME=pysam
 
 DEBPKGNAME := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
+TESTPKG    := $(DEBPKGNAME)-tests
 
 HTSLIBDIR  := /usr/lib/$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export HTSLIB_LIBRARY_DIR=$(HTSLIBDIR)
@@ -12,8 +13,13 @@ export HTSLIB_INCLUDE_DIR=/usr/include
 %:
        LC_ALL=C.UTF-8 dh $@ --with python2,python3 --buildsystem=pybuild
 
-# Testing and building the test data are handled by autopkgtest,
-# but debian/rules must be able to clean up after it.
+override_dh_install:
+       dh_install -Xtest.gtf.gz
+
+override_dh_auto_test:
+#nothing to test until pysam is installed.
+#test package is provided for both Python versions
+
 override_dh_auto_clean:
        dh_auto_clean
        $(MAKE) -C tests/pysam_data clean

diff --git a/debian/tests/run-nose-tests b/debian/tests/run-nose-tests
index 94fece952d6de785d9f221b3c52c6b1b49bc9647..d517f26f6db963459f4be3880b6a2ac05f5873d0 100755 (executable)
--- a/debian/tests/run-nose-tests
+++ b/debian/tests/run-nose-tests
@@ -8,4 +8,3 @@ cp -ra /usr/share/doc/python-pysam/tests/* $ADTTMP
 nosetests --nocapture
 cd
 rm -rf $ADTTMP
-

diff --git a/debian/tests/run-nose3-tests b/debian/tests/run-nose3-tests
index 299a33adf91c69095f69584cd89c5963c576fa5c..ffa0b1218782208a2f65360eb126bf88d60d8226 100755 (executable)
--- a/debian/tests/run-nose3-tests
+++ b/debian/tests/run-nose3-tests
@@ -8,4 +8,3 @@ cp -ra /usr/share/doc/python-pysam/tests/* $ADTTMP
 nosetests3 --nocapture
 cd
 rm -rf $ADTTMP
-