[pycoast] 05/10: Refresh all patches

[Antonio Valentino]

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 23fdba2193d41a0fa7bbeab7b501c2a67f585cca
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Fri Aug 18 14:54:31 2017 +0000

    Refresh all patches
---
 debian/changelog                                   |  3 ++
 debian/patches/0001-Skip-offending-tests.patch     | 53 ----------------------
 ...patch => 0001-Skip-tests-that-use-shapes.patch} |  6 +--
 debian/patches/series                              |  3 +-
 4 files changed, 7 insertions(+), 58 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f936abc..b823fa5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ pycoast (1.0.0+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release
   * debian/control
     - standard version bumped to 4.0.0 (no change)
+  * debian/patches
+    - drop 0001-Skip-offending-tests.patch (no longer necessary)
+    - refresh and renumber remaining patches
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Fri, 18 Aug 2017 14:47:16 +0000
 
diff --git a/debian/patches/0001-Skip-offending-tests.patch b/debian/patches/0001-Skip-offending-tests.patch
deleted file mode 100644
index b78dadd..0000000
--- a/debian/patches/0001-Skip-offending-tests.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Sun, 3 Jul 2016 10:21:52 +0000
-Subject: Skip offending tests
-
-See also https://github.com/pytroll/pycoast/issues/4
----
- 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 8d8fb8b..62c3716 100644
---- a/pycoast/tests/test_pycoast.py
-+++ b/pycoast/tests/test_pycoast.py
-@@ -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'))
-@@ -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'))
-@@ -206,6 +208,7 @@ class TestPIL(TestPycoast):
-         res = np.array(img)
-         self.failUnless(fft_metric(grid_data, res), 'Writing of grid failed')
- 
-+    @unittest.skip('invalid dataset: dateline_cross.png')
-     def test_dateline_cross(self):
-         dl_img = Image.open(os.path.join(os.path.dirname(__file__),
-                                          'dateline_cross.png'))
-@@ -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'))
-@@ -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'))
diff --git a/debian/patches/0002-Skip-tests-that-use-shapes.patch b/debian/patches/0001-Skip-tests-that-use-shapes.patch
similarity index 83%
rename from debian/patches/0002-Skip-tests-that-use-shapes.patch
rename to debian/patches/0001-Skip-tests-that-use-shapes.patch
index 759e8fb..16bc0fc 100644
--- a/debian/patches/0002-Skip-tests-that-use-shapes.patch
+++ b/debian/patches/0001-Skip-tests-that-use-shapes.patch
@@ -7,11 +7,11 @@ 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 62c3716..34603ab 100644
+index 9cc8348..463c7bf 100644
 --- a/pycoast/tests/test_pycoast.py
 +++ b/pycoast/tests/test_pycoast.py
-@@ -322,6 +322,7 @@ class TestPIL(TestPycoast):
-         self.failUnless(fft_metric(grid_data, res),
+@@ -317,6 +317,7 @@ class TestPIL(TestPycoast):
+         self.assertTrue(fft_metric(grid_data, res),
                          'Writing of nh polygons failed')
  
 +    @unittest.skip('dataset not available: test_data/shapes/Metareas.shp')
diff --git a/debian/patches/series b/debian/patches/series
index e231207..5eed5f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-Skip-offending-tests.patch
-0002-Skip-tests-that-use-shapes.patch
+0001-Skip-tests-that-use-shapes.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycoast.git