[med-svn] [python-pysam] 01/01: Merge branch 'separate-tests-package'

[Afif Elghraoui]

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

afif-guest pushed a commit to branch master
in repository python-pysam.

commit aed6cc7cf50222c73b22791ca5e77c6dc814afa7
Merge: 8fe0ebe 961595c
Author: Afif Elghraoui <afif at ghraoui.name>
Date:   Wed Jul 22 23:20:29 2015 -0700

    Merge branch 'separate-tests-package'
    
    Conflicts:
    	debian/tests/control
    Restore the separate tests package, but don't use it
    for autopkgtest yet.

 debian/control                              | 12 ++++++++++++
 debian/python-pysam-tests.README.Debian     |  8 ++++++++
 debian/python-pysam-tests.docs              |  2 ++
 debian/python-pysam-tests.install           |  1 +
 debian/python-pysam-tests.lintian-overrides |  2 ++
 debian/rules                                | 10 ++++++++--
 debian/tests/run-nose-tests                 | 21 +++++++++++++++++++++
 debian/tests/run-nose3-tests                | 10 ++++++++++
 8 files changed, 64 insertions(+), 2 deletions(-)

diff --cc debian/rules
index 05e4a0e,a6b2252..da5b0e8
--- a/debian/rules
+++ b/debian/rules
@@@ -15,8 -13,17 +16,13 @@@ export PYBUILD_TEST_ARGS={dir}/test
  %:
  	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_auto_build:
+ 	dh_auto_build
+ 	$(MAKE) -C tests/pysam_data
+ 
+ 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-pysam.git