Étienne Mollier pushed to branch master at Debian Med / ariba
Commits: 4ffe053c by Étienne Mollier at 2022-12-14T21:27:59+01:00 adjust-bowtie2-test.patch: skip some bowtie2 tests needing refresh. - - - - - 84ec3d1a by Étienne Mollier at 2022-12-14T21:33:21+01:00 d/control: don't built for python3.11 until pysam supports it. - - - - - be065c97 by Étienne Mollier at 2022-12-14T21:41:24+01:00 ready to upload to unstable. - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/adjust-bowtie2-test.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,18 +1,19 @@ -ariba (2.14.6+ds-4) UNRELEASED; urgency=medium +ariba (2.14.6+ds-4) unstable; urgency=medium [ Andreas Tille ] * Team upload. * Fix watch file * Standards-Version: 4.6.1 (routine-update) * Add salsa-ci file (routine-update) - TODO; Bug #1021675, https://github.com/sanger-pathogens/ariba/issues/327 [ Étienne Mollier ] * mpileup-1.16.patch: add; fix mpileup calls since htslib 1.16. (Closes: #1021675, #1022508) * skip-cluster-test.patch: add; skip due to mismatched output. + * adjust-bowtie2-test.patch: skip some bowtie2 tests needing refresh. + * d/control: don't built for python3.11 until pysam supports it. - -- Étienne Mollier <[email protected]> Mon, 12 Dec 2022 22:45:05 +0100 + -- Étienne Mollier <[email protected]> Wed, 14 Dec 2022 21:34:16 +0100 ariba (2.14.6+ds-3) unstable; urgency=medium ===================================== debian/control ===================================== @@ -6,7 +6,8 @@ Priority: optional Build-Depends: debhelper-compat (= 13), dh-python, python3-biopython, - python3-all-dev, +# FIXME: bring back python3-all-dev support when python-pysam supports v3.11. + python3-dev, python3-dendropy, python3-setuptools, python3-pymummer, ===================================== debian/patches/adjust-bowtie2-test.patch ===================================== @@ -0,0 +1,35 @@ +Description: skip tests failing with new bowtie2 + Some of the test data seem to need +Author: Étienne Mollier <[email protected]> +Bug: https://github.com/sanger-pathogens/ariba/issues/329 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1021675#23 +Last-Update: 2022-12-14 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- ariba.orig/ariba/tests/mapping_test.py ++++ ariba/ariba/tests/mapping_test.py +@@ -2,6 +2,7 @@ + import os + import pysam + import pyfastaq ++import pytest + from ariba import mapping, external_progs + + modules_dir = os.path.dirname(os.path.abspath(mapping.__file__)) +@@ -41,7 +42,7 @@ + + os.unlink(tmp_ref) + +- ++ @pytest.mark.skip("Test data needs being updated.") + def test_run_bowtie2(self): + '''Test run_bowtie2 unsorted''' + self.maxDiff = None +@@ -85,6 +86,7 @@ + os.unlink(out_prefix + '.bam') + + ++ @pytest.mark.skip("Test data needs being updated.") + def test_run_bowtie2_and_sort(self): + '''Test run_bowtie2 sorted''' + ref = os.path.join(data_dir, 'mapping_test_bowtie2_ref.fa') ===================================== debian/patches/series ===================================== @@ -7,3 +7,4 @@ run-debian-spades-wrapper.patch port-to-pytest.patch mpileup-1.16.patch skip-cluster-test.patch +adjust-bowtie2-test.patch View it on GitLab: https://salsa.debian.org/med-team/ariba/-/compare/a24e5b445a8261cc29c62921e6de45053ddaa445...be065c97067ce23bc5c5151594b8bdfa68b322d2 -- View it on GitLab: https://salsa.debian.org/med-team/ariba/-/compare/a24e5b445a8261cc29c62921e6de45053ddaa445...be065c97067ce23bc5c5151594b8bdfa68b322d2 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
