This is an automated email from the git hooks/post-receive script. a_valentino-guest pushed a commit to branch master in repository pyresample.
commit e2418e9e10cc786add68c6bb26bfd7d2f3f74d28 Author: Antonio Valentino <[email protected]> Date: Sat Oct 29 07:33:47 2016 +0000 Drop 0003-fix-tests-for-mips.patch --- debian/changelog | 2 ++ debian/patches/0003-fix-tests-for-mips.patch | 39 ---------------------------- debian/patches/series | 1 - 3 files changed, 2 insertions(+), 40 deletions(-) diff --git a/debian/changelog b/debian/changelog index de22723..4471de2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ pyresample (1.2.6-1) UNRELEASED; urgency=medium * New upstream release + * debian/patches + - drop 0003-fix-tests-for-mips.patch: applied upstream -- Antonio Valentino <[email protected]> Sat, 29 Oct 2016 07:31:45 +0000 diff --git a/debian/patches/0003-fix-tests-for-mips.patch b/debian/patches/0003-fix-tests-for-mips.patch deleted file mode 100644 index 8c3f8fc..0000000 --- a/debian/patches/0003-fix-tests-for-mips.patch +++ /dev/null @@ -1,39 +0,0 @@ -Description: Fix test_custom_uncert and test_gauss_uncert for mips*. -Author: Daniel Knezevic <[email protected]> -Bug-Debian: https://bugs.debian.org/836733 -Bug: https://github.com/pytroll/pyresample/issues/43 -Forwarded: https://github.com/pytroll/pyresample/pull/46 -Appplied-Upstream: https://github.com/pytroll/pyresample/commit/0188c7feba2a020418c09cca2fbc65a4bc09931f - ---- a/pyresample/test/test_kd_tree.py -+++ b/pyresample/test/test_kd_tree.py -@@ -75,10 +75,10 @@ class Test(unittest.TestCase): - res, stddev, count = kd_tree.resample_gauss(self.tswath, self.tdata, - self.tgrid, 100000, sigma, - with_uncert=True) -- self.assertFalse( -- len(w) != 1, 'Failed to create neighbour warning') -- self.assertFalse(('Searching' not in str( -- w[0].message)), 'Failed to create correct neighbour warning') -+ self.assertTrue( -+ len(w) > 0, 'Failed to create neighbour warning') -+ self.assertTrue((any('Searching' in str(_w.message) for _w in w)), -+ 'Failed to create correct neighbour warning') - - expected_res = 2.20206560694 - expected_stddev = 0.707115076173 -@@ -98,10 +98,10 @@ class Test(unittest.TestCase): - res, stddev, counts = kd_tree.resample_custom(self.tswath, - self.tdata, self.tgrid, - 100000, wf, with_uncert=True) -- self.assertFalse( -- len(w) != 1, 'Failed to create neighbour warning') -- self.assertFalse(('Searching' not in str( -- w[0].message)), 'Failed to create correct neighbour warning') -+ self.assertTrue( -+ len(w) > 0, 'Failed to create neighbour warning') -+ self.assertTrue((any('Searching' in str(_w.message) for _w in w)), -+ 'Failed to create correct neighbour warning') - - self.assertAlmostEqual(res[0], 2.32193149, 5, - 'Failed to calculate custom weighting with uncertainty') diff --git a/debian/patches/series b/debian/patches/series index 4cd1fc0..b939e25 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 0001-fix-doc-build.patch 0002-fix-proj4-initialization.patch -0003-fix-tests-for-mips.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pyresample.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
