[med-svn] [Git][med-team/python-deeptools][master] Testing now works

[Steffen Möller]

Steffen Möller pushed to branch master at Debian Med / python-deeptools


Commits:
73459d1b by Steffen Möller at 2019-08-11T10:41:25Z
Testing now works

Excluded tests is in "testskip..." file that apparently is  not skipped,
upstream knows of dependency of exlcluded patch on matplotlib version
https://github.com/deeptools/deepTools/issues/858

- - - - -


4 changed files:

- + debian/README.source
- + debian/patches/deactivateFailingPatch.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/README.source
=====================================
@@ -0,0 +1,11 @@
+Changes on source tree of deeptools
+===================================
+
+python2to3_for_executables.patch
+	The shebang line is adjusted to /usr/bin/python3
+
+deactivateFailingPatch.patch
+	Following an exchange with upstream on
+	https://github.com/deeptools/deepTools/issues/858
+	this is considered to be an artifact of version dependencies
+	of the matplotlib.


=====================================
debian/patches/deactivateFailingPatch.patch
=====================================
@@ -0,0 +1,27 @@
+Index: python-deeptools/deeptools/test/testskip_heatmapper_images.py
+===================================================================
+--- python-deeptools.orig/deeptools/test/testskip_heatmapper_images.py
++++ python-deeptools/deeptools/test/testskip_heatmapper_images.py
+@@ -69,14 +69,14 @@ def test_plotHeatmap_multiple_colors_mut
+     os.remove(outfile.name)
+ 
+ 
+-def test_plotHeatmap_multiple_colormap_no_boxes():
+-    outfile = NamedTemporaryFile(suffix='.png', prefix='plotHeatmap_test_', delete=False)
+-    args = "-m {}/master_multi.mat.gz --colorMap Reds binary terrain --boxAroundHeatmaps no " \
+-           "--outFileName {}".format(ROOT, outfile.name).split()
+-    deeptools.plotHeatmap.main(args)
+-    res = compare_images(ROOT + '/heatmap_master_multi_colormap_no_box.png', outfile.name, tolerance)
+-    assert res is None, res
+-    os.remove(outfile.name)
++#def test_plotHeatmap_multiple_colormap_no_boxes():
++#    outfile = NamedTemporaryFile(suffix='.png', prefix='plotHeatmap_test_', delete=False)
++#    args = "-m {}/master_multi.mat.gz --colorMap Reds binary terrain --boxAroundHeatmaps no " \
++#           "--outFileName {}".format(ROOT, outfile.name).split()
++#    deeptools.plotHeatmap.main(args)
++#    res = compare_images(ROOT + '/heatmap_master_multi_colormap_no_box.png', outfile.name, tolerance)
++#    assert res is None, res
++#    os.remove(outfile.name)
+ 
+ 
+ def test_plotHeatmap_interpolation():


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 python2to3_for_executables.patch
+deactivateFailingPatch.patch


=====================================
debian/rules
=====================================
@@ -6,12 +6,10 @@ export PYBUILD_NAME=deeptools
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
-#override_dh_auto_test:
-#	 PYTHONPATH=$(CURDIR)/debian/python3-deeptools/usr/lib/python3/dist-packages:/usr/lib/python3/dist-packages nosetests3 -x
-
 override_dh_auto_test:
-	 #python3 -m unittest discover -v
-	 PYTHONPATH=$(CURDIR) nosetests3 -x -v -s deeptools
+	ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+		PYTHONPATH=$(CURDIR) nosetests3 -x -v -s deeptools
+	endif
 
 override_dh_auto_clean:
 	dh_auto_clean



View it on GitLab: https://salsa.debian.org/med-team/python-deeptools/commit/73459d1ba3b09ef1d5007b657177651043b50648

-- 
View it on GitLab: https://salsa.debian.org/med-team/python-deeptools/commit/73459d1ba3b09ef1d5007b657177651043b50648
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/20190811/9c91eb92/attachment-0001.html>