[med-svn] [khmer] 05/06: add new dependencies

[Michael Crusoe]

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

misterc-guest pushed a commit to branch experimental-2.1
in repository khmer.

commit bd9815981ff3cf4059501ea934fdc9051d18cd05
Author: Michael R. Crusoe <michael.crusoe at gmail.com>
Date:   Mon Feb 20 02:03:23 2017 -0800

    add new dependencies
---
 debian/control                | 3 ++-
 debian/patches/series         | 2 +-
 debian/patches/silence-mt-bug | 2 +-
 debian/rules                  | 4 ++--
 debian/tests/control          | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 47547c8..165df68 100644
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,10 @@ Build-Depends: debhelper (>= 9),
                python3-all-dev (>= 3.3),
                python3-setuptools (>= 3.3),
                python3-screed,
-               python3-nose,
                python3-sphinx,
                python3-sphinxcontrib.autoprogram,
+               python3-pytest,
+               python3-pytest-runner,
                zlib1g-dev,
                libbz2-dev,
                asciidoctor
diff --git a/debian/patches/series b/debian/patches/series
index 95db57b..8112bd4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,4 @@ disable_google_analytics
 get_version
 install-prefix
 cpython-bug-empty-exceptions
-silence-mt-bug
+#silence-mt-bug
diff --git a/debian/patches/silence-mt-bug b/debian/patches/silence-mt-bug
index 98e2006..f1fa13d 100644
--- a/debian/patches/silence-mt-bug
+++ b/debian/patches/silence-mt-bug
@@ -6,7 +6,7 @@ Author: Michael R. Crusoe <crusoe at ucdavis.edu>
          assert line == '255,2,98,1.0', line
  
  
-+ at attr('known_failing')
++ at pytest.mark.known_failing
  def test_abundance_dist_threaded():
      infile = utils.copy_test_data('test-abund-read-2.fa')
      outfile = utils.get_temp_filename('test.dist')
diff --git a/debian/rules b/debian/rules
index a4ffaa5..e24d02b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,8 +26,8 @@ override_dh_auto_test:
 	dh_auto_install
 	PYBUILD_SYSTEM=custom \
 	    PYBUILD_TEST_ARGS="cd {dir}; export PATH={destdir}/usr/lib/khmer/bin:$$PATH ; \
-	    cd {build_dir}; {interpreter} -m nose --attr \
-	    '!known_failing,!jenkins,!huge'" dh_auto_test
+	    cd {build_dir}; {interpreter} -m pytest \
+	    -m 'not known_failing and not jenkins and not huge'" dh_auto_test
 
 
 override_dh_auto_clean:
diff --git a/debian/tests/control b/debian/tests/control
index 809fd67..1ae4079 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,4 @@
 Tests: run-unit-test
        test-liboxli-dev
-Depends: khmer,python3-nose,build-essential,pkg-config,zlib1g-dev,libbz2-dev,liboxli-dev
+Depends: khmer,python3-pytest,python3-pytest-runner,build-essential,pkg-config,zlib1g-dev,libbz2-dev,liboxli-dev
 Restrictions: allow-stderr

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