Merge ~vpa1977/ubuntu/+source/unifrac:fix_tests into ubuntu/+source/unifrac:ubuntu/devel

Proposed by Vladimir Petko
Status: Work in progress
Proposed branch: ~vpa1977/ubuntu/+source/unifrac:fix_tests
Merge into: ubuntu/+source/unifrac:ubuntu/devel
Diff against target: 61 lines (+29/-1)
4 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/patches/round_test_result.patch (+19/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
git-ubuntu import Pending
Review via email: mp+452852@code.launchpad.net

Description of the change

WIP: Add patch to round test result (autopkgtest failure)

To post a comment you must log in.

Unmerged commits

8dc959a... by Vladimir Petko

changelog

abde12b... by Vladimir Petko

update-maintainer

7349146... by Vladimir Petko

  * d/p/round_test_results.patch: relax test assertion in test_unweighted_minimal_trees.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index a452a73..5ff3745 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+unifrac (1.2-3ubuntu1) mantic; urgency=medium
7+
8+ * d/p/round_test_results.patch: relax test assertion in
9+ test_unweighted_minimal_trees (LP: #2038397).
10+
11+ -- Vladimir Petko <vladimir.petko@canonical.com> Thu, 05 Oct 2023 13:21:44 +1300
12+
13 unifrac (1.2-3) unstable; urgency=medium
14
15 * Versioned Build-Depends: python3-skbio (>= 0.5.8-3~)
16diff --git a/debian/control b/debian/control
17index 0789fe3..93975bb 100644
18--- a/debian/control
19+++ b/debian/control
20@@ -1,5 +1,6 @@
21 Source: unifrac
22-Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
23+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
24+XSBC-Original-Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
25 Uploaders: Andreas Tille <tille@debian.org>
26 Section: science
27 Testsuite: autopkgtest-pkg-python
28diff --git a/debian/patches/round_test_result.patch b/debian/patches/round_test_result.patch
29new file mode 100644
30index 0000000..0b7db3d
31--- /dev/null
32+++ b/debian/patches/round_test_result.patch
33@@ -0,0 +1,19 @@
34+Description: Round test result
35+ Relax test assertion for the floating number comparison.
36+ This issue is not reproducible with the latest upstream unifrac-tools.
37+Author: Vladimir Petko <vladimir.petko@canonical.com>
38+Bug: https://github.com/biocore/unifrac/issues/157
39+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/unifrac-tools/+bug/2038397
40+Forwarded: not-needed
41+Last-Update: 2023-10-05
42+--- a/unifrac/tests/test_api.py
43++++ b/unifrac/tests/test_api.py
44+@@ -293,7 +293,7 @@
45+ actual = self.unweighted_unifrac([1, 0], [0, 0], ['OTU1', 'OTU2'],
46+ tree)
47+ expected = 1.0
48+- self.assertEqual(actual, expected)
49++ self.assertAlmostEqual(actual, expected, places=6)
50+
51+ def test_unweighted_root_not_observed(self):
52+ # expected values computed with QIIME 1.9.1 and by hand
53diff --git a/debian/patches/series b/debian/patches/series
54index 53a044d..0a4cc18 100644
55--- a/debian/patches/series
56+++ b/debian/patches/series
57@@ -3,3 +3,4 @@
58 remove-check-for-pkg-version.patch
59 no_conda_prefix.patch
60 relax_test_conditions.patch
61+round_test_result.patch

Subscribers

People subscribed via source and target branches