This is an automated email from the git hooks/post-receive script. a_valentino-guest pushed a commit to branch master in repository pycoast.
commit e0d141b9b679206500f8414b684c3e589579f1c9 Author: Antonio Valentino <[email protected]> Date: Sun Jun 4 15:42:14 2017 +0000 Refresh all patches --- debian/changelog | 1 + ...tests.patch => 0001-Skip-offending-tests.patch} | 46 ++++++++-------------- ...patch => 0002-Skip-tests-that-use-shapes.patch} | 8 ++-- debian/patches/series | 4 +- 4 files changed, 23 insertions(+), 36 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1642a3f..c1d7239 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ pycoast (0.6.1+dfsg-1) UNRELEASED; urgency=medium - update copyright date * debian/patches - drop patch 0001-Skip-test-in-ContourWriterAGG.patch, merged upstream + - refresh and renumber remainimg patches -- Antonio Valentino <[email protected]> Sun, 04 Jun 2017 15:27:23 +0000 diff --git a/debian/patches/0002-Skip-offending-tests.patch b/debian/patches/0001-Skip-offending-tests.patch similarity index 55% rename from debian/patches/0002-Skip-offending-tests.patch rename to debian/patches/0001-Skip-offending-tests.patch index de1acee..b78dadd 100644 --- a/debian/patches/0002-Skip-offending-tests.patch +++ b/debian/patches/0001-Skip-offending-tests.patch @@ -4,37 +4,30 @@ Subject: Skip offending tests See also https://github.com/pytroll/pycoast/issues/4 --- - pycoast/tests/test_pycoast.py | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) + pycoast/tests/test_pycoast.py | 5 +++++ + 1 file changed, 5 insertions(+) diff --git a/pycoast/tests/test_pycoast.py b/pycoast/tests/test_pycoast.py -index 98e61bf..6cd0230 100644 +index 8d8fb8b..62c3716 100644 --- a/pycoast/tests/test_pycoast.py +++ b/pycoast/tests/test_pycoast.py -@@ -1,5 +1,5 @@ - # pycoast, Writing of coastlines, borders and rivers to images in Python --# -+# - # Copyright (C) 2011 Esben S. Nielsen - # - # This program is free software: you can redistribute it and/or modify -@@ -131,6 +131,7 @@ class TestPIL(TestPycoast): - res = np.array(img) - self.failUnless(fft_metric(geos_data, res), 'Writing of geos contours failed') +@@ -140,6 +140,7 @@ class TestPIL(TestPycoast): + self.failUnless( + fft_metric(geos_data, res), 'Writing of geos contours failed') + @unittest.skip('invalid dataset: grid_europe.png') def test_grid(self): grid_img = Image.open(os.path.join(os.path.dirname(__file__), 'grid_europe.png')) -@@ -165,6 +166,7 @@ class TestPIL(TestPycoast): - res = np.array(img) - self.failUnless(fft_metric(geos_data, res), 'Writing of geos contours failed') +@@ -183,6 +184,7 @@ class TestPIL(TestPycoast): + self.failUnless( + fft_metric(geos_data, res), 'Writing of geos contours failed') + @unittest.skip('invalid dataset: grid_europe.png') def test_grid_file(self): grid_img = Image.open(os.path.join(os.path.dirname(__file__), 'grid_europe.png')) -@@ -184,6 +186,7 @@ class TestPIL(TestPycoast): +@@ -206,6 +208,7 @@ class TestPIL(TestPycoast): res = np.array(img) self.failUnless(fft_metric(grid_data, res), 'Writing of grid failed') @@ -42,26 +35,19 @@ index 98e61bf..6cd0230 100644 def test_dateline_cross(self): dl_img = Image.open(os.path.join(os.path.dirname(__file__), 'dateline_cross.png')) -@@ -205,6 +208,7 @@ class TestPIL(TestPycoast): - res = np.array(img) - self.failUnless(fft_metric(dl_data, res), 'Writing of dateline crossing data failed') +@@ -231,6 +234,7 @@ class TestPIL(TestPycoast): + self.failUnless(fft_metric(dl_data, res), + 'Writing of dateline crossing data failed') + @unittest.skip('invalid dataset: dateline_boundary_cross.png') def test_dateline_boundary_cross(self): dl_img = Image.open(os.path.join(os.path.dirname(__file__), 'dateline_boundary_cross.png')) -@@ -226,6 +230,7 @@ class TestPIL(TestPycoast): - res = np.array(img) - self.failUnless(fft_metric(dl_data, res), 'Writing of dateline boundary crossing data failed') +@@ -257,6 +261,7 @@ class TestPIL(TestPycoast): + self.failUnless(fft_metric(dl_data, res), + 'Writing of dateline boundary crossing data failed') + @unittest.skip('invalid dataset: grid_nh.png') def test_grid_nh(self): grid_img = Image.open(os.path.join(os.path.dirname(__file__), 'grid_nh.png')) -@@ -534,4 +539,4 @@ def suite(): - mysuite.addTest(loader.loadTestsFromTestCase(TestPIL)) - mysuite.addTest(loader.loadTestsFromTestCase(TestPILAGG)) - -- return mysuite -\ No newline at end of file -+ return mysuite diff --git a/debian/patches/0003-Skip-tests-that-use-shapes.patch b/debian/patches/0002-Skip-tests-that-use-shapes.patch similarity index 75% rename from debian/patches/0003-Skip-tests-that-use-shapes.patch rename to debian/patches/0002-Skip-tests-that-use-shapes.patch index a7e36ea..759e8fb 100644 --- a/debian/patches/0003-Skip-tests-that-use-shapes.patch +++ b/debian/patches/0002-Skip-tests-that-use-shapes.patch @@ -7,12 +7,12 @@ Subject: Skip tests that use shapes 1 file changed, 1 insertion(+) diff --git a/pycoast/tests/test_pycoast.py b/pycoast/tests/test_pycoast.py -index 6cd0230..12ab9e8 100644 +index 62c3716..34603ab 100644 --- a/pycoast/tests/test_pycoast.py +++ b/pycoast/tests/test_pycoast.py -@@ -281,6 +281,7 @@ class TestPIL(TestPycoast): - res = np.array(img) - self.failUnless(fft_metric(grid_data, res), 'Writing of nh polygons failed') +@@ -322,6 +322,7 @@ class TestPIL(TestPycoast): + self.failUnless(fft_metric(grid_data, res), + 'Writing of nh polygons failed') + @unittest.skip('dataset not available: test_data/shapes/Metareas.shp') def test_add_shapefile_shapes(self): diff --git a/debian/patches/series b/debian/patches/series index 05f27ea..e231207 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ -0002-Skip-offending-tests.patch -0003-Skip-tests-that-use-shapes.patch +0001-Skip-offending-tests.patch +0002-Skip-tests-that-use-shapes.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycoast.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
