diff --git a/debian/changelog b/debian/changelog index cd9e5bda553fa3ebfe771d793025427896776faf..f3a8116e46dce9e64fc5c0105d23c125bf2b80c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,12 +6,15 @@ scikit-learn (0.16.1-2) unstable; urgency=medium - properly dropped python-support, debian/rules was already using dh_ helpers (Closes: #786185) * debian/patches - Picked up from usptream 2 fixes: - - changeset_190fe7347cfd6fab67f37c7535c4fa9b8f0870de.diff - FIX Include PyFuncDistance attributes while pickling. - - changeset_5e502596460014ed3adebe61e8189a60e72d3623.diff - Fix signature not compatible with previous declaration - (Closes: #791615) + - Picked up from usptream 2 fixes: + - changeset_190fe7347cfd6fab67f37c7535c4fa9b8f0870de.diff + FIX Include PyFuncDistance attributes while pickling. + - changeset_5e502596460014ed3adebe61e8189a60e72d3623.diff + Fix signature not compatible with previous declaration + (Closes: #791615) + - deb_skip_some_tests_on_arm + fixed it up (missing nose imports). Thanks Logan Rosen! + (Closes: #773862) -- Yaroslav Halchenko <debian@onerussian.com> Fri, 10 Jul 2015 23:26:48 -0400 diff --git a/debian/patches/deb_skip_some_tests_on_arm b/debian/patches/deb_skip_some_tests_on_arm index 8c12abbf8909909b65eda8697d03f12f9f654ac6..762954480d1443e81df2f1be6131aba8c0c10173 100644 --- a/debian/patches/deb_skip_some_tests_on_arm +++ b/debian/patches/deb_skip_some_tests_on_arm @@ -6,21 +6,20 @@ in_warning_message = 'divide by zero' + import platform + if platform.uname()[4].startswith('armv'): -+ raise nose.SkipTest("no warning gets issued on armel") ++ raise SkipTest("no warning gets issued on armel") + tfidf = assert_warns_message(RuntimeWarning, in_warning_message, tr.fit_transform, X).toarray() if not numpy_provides_div0_warning: -diff --git a/sklearn/metrics/tests/test_ranking.py b/sklearn/metrics/tests/test_ranking.py -index 40ce6f6..8328716 100644 --- a/sklearn/metrics/tests/test_ranking.py +++ b/sklearn/metrics/tests/test_ranking.py -@@ -543,6 +543,9 @@ def test_precision_recall_curve_toydata(): +@@ -540,6 +540,10 @@ def test_precision_recall_curve_toydata( y_true = [0, 0] y_score = [0.25, 0.75] + import platform + if platform.uname()[4].startswith('armv'): ++ import nose + raise nose.SkipTest("no precision-related exceptions get issued on armel") assert_raises(Exception, precision_recall_curve, y_true, y_score) assert_raises(Exception, average_precision_score, y_true, y_score)