[med-svn] [Git][med-team/pbh5tools][master] 3 commits: Use nostetest3

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / pbh5tools


Commits:
b45ab981 by Andreas Tille at 2019-12-07T08:40:21Z
Use nostetest3

- - - - -
25bd3361 by Andreas Tille at 2019-12-07T10:52:36Z
TODO: Not compatible with recent version of pbcore whic his lacking CmpH5Reader and rangeQueries

- - - - -
5505769c by Andreas Tille at 2019-12-07T11:24:31Z
Fix calls in test suite

- - - - -


3 changed files:

- debian/changelog
- debian/patches/2to3.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -12,6 +12,8 @@ pbh5tools (0.8.0+git20181212.9fa8fc4+dfsg-2) UNRELEASED; urgency=medium
     debian/patches/series.
   * Use 2to3 to convert from Python2 to Python3
     Closes: #937256
+  TODO: Not compatible with recent version of pbcore whic his lacking
+        CmpH5Reader and rangeQueries
 
  -- Andreas Tille <tille at debian.org>  Sat, 07 Dec 2019 09:23:30 +0100
 


=====================================
debian/patches/2to3.patch
=====================================
@@ -5,7 +5,7 @@ Last-Update: Sat, 07 Dec 2019 09:23:30 +0100
 
 --- a/Makefile
 +++ b/Makefile
-@@ -4,17 +4,17 @@ SHELL = /bin/bash -e
+@@ -4,26 +4,26 @@ SHELL = /bin/bash -e
  all: build install
  
  build:
@@ -27,7 +27,19 @@ Last-Update: Sat, 07 Dec 2019 09:23:30 +0100
 +	python3 setup.py develop
  
  test: examples
- 	find tests -name "*.py" | xargs nosetests -v
+-	find tests -name "*.py" | xargs nosetests -v
+-	-find tests/cram -name "*.t" | xargs cram -v
++	find tests -name "*.py" | xargs nosetests3 -v
++	-find tests/cram -name "*.t" | xargs cram3 -v
+ doc:
+ 	sphinx-apidoc -T -f -o doc src/ && cd doc && make html
+ 
+ examples:
+-	-cram -v doc/examples.t
++	-cram3 -v doc/examples.t
+ 	sed 's/^  /    /' doc/examples.t > doc/examples.md
+ 
+ example-rendered: examples
 --- a/bin/bash5tools.py
 +++ b/bin/bash5tools.py
 @@ -1,4 +1,4 @@


=====================================
debian/rules
=====================================
@@ -24,6 +24,7 @@ override_dh_install:
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	PATH=$(PATH):$(CURDIR)/`find build -name cmph5tools.py | head -n1 | xargs dirname` \
 	PYBUILD_SYSTEM=custom \
 	PYBUILD_TEST_ARGS="PATH=$(CURDIR)/build/scripts-2.7:$$PATH $(MAKE) test" \
 	  dh_auto_test



View it on GitLab: https://salsa.debian.org/med-team/pbh5tools/compare/7c969ccec60aa22eb7735e988967e18e2fbc0a0a...5505769ccdb1770f44679e60548328d09c0f3ebb

-- 
View it on GitLab: https://salsa.debian.org/med-team/pbh5tools/compare/7c969ccec60aa22eb7735e988967e18e2fbc0a0a...5505769ccdb1770f44679e60548328d09c0f3ebb
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20191207/d6922c1f/attachment-0001.html>