[pyresample] 02/02: Remove unnecessary patch

[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 pyresample.

commit cbdfb4e678adb81c5cf212810a25bfba045aa512
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sat Jul 16 11:10:40 2016 +0000

    Remove unnecessary patch
---
 debian/changelog                                   |  3 ++
 ...ix-doc-build.patch => 0001-fix-doc-build.patch} |  0
 ...n.patch => 0002-fix-proj4-initialization.patch} |  0
 .../{0004-Use-cmath.patch => 0003-Use-cmath.patch} |  0
 debian/patches/0003-skip-nearest-resize-test.patch | 58 ----------------------
 debian/patches/series                              |  7 ++-
 6 files changed, 6 insertions(+), 62 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ddc6ec1..ef5a988 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ pyresample (1.2.4-3) UNRELEASED; urgency=medium
 
   * debian/control
     - remove non necessary (build) dependency from scipy
+  * debian/parches
+    - drop 0003-skip-nearest-resize-test.patch (no longer necessary)
+    - refresh and renumber remanining patches
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 16 Jul 2016 10:41:05 +0000
 
diff --git a/debian/patches/0002-fix-doc-build.patch b/debian/patches/0001-fix-doc-build.patch
similarity index 100%
rename from debian/patches/0002-fix-doc-build.patch
rename to debian/patches/0001-fix-doc-build.patch
diff --git a/debian/patches/0003-fix-proj4-initialization.patch b/debian/patches/0002-fix-proj4-initialization.patch
similarity index 100%
rename from debian/patches/0003-fix-proj4-initialization.patch
rename to debian/patches/0002-fix-proj4-initialization.patch
diff --git a/debian/patches/0004-Use-cmath.patch b/debian/patches/0003-Use-cmath.patch
similarity index 100%
rename from debian/patches/0004-Use-cmath.patch
rename to debian/patches/0003-Use-cmath.patch
diff --git a/debian/patches/0003-skip-nearest-resize-test.patch b/debian/patches/0003-skip-nearest-resize-test.patch
deleted file mode 100644
index 73df7c9..0000000
--- a/debian/patches/0003-skip-nearest-resize-test.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Sat, 27 Feb 2016 12:11:41 +0100
-Subject: skip python3 offending tests
-
----
- pyresample/test/test_image.py   | 2 ++
- pyresample/test/test_kd_tree.py | 6 ++++++
- 2 files changed, 8 insertions(+)
-
-diff --git a/pyresample/test/test_image.py b/pyresample/test/test_image.py
-index 8342583..4959291 100644
---- a/pyresample/test/test_image.py
-+++ b/pyresample/test/test_image.py
-@@ -1,4 +1,5 @@
- import os
-+import sys
- import unittest
- 
- import numpy
-@@ -135,6 +136,7 @@ class Test(unittest.TestCase):
-         self.assertAlmostEqual(cross_sum, expected,
-                                msg='ImageContainer resampling nearest neighbour failed')
- 
-+    @unittest.skipIf(sys.version_info >= (3,0,0), 'stalls')
-     def test_nearest_resize(self):
-         data = numpy.fromfunction(lambda y, x: y * x * 10 ** -6, (3712, 3712))
-         msg_con = image.ImageContainerNearest(
-diff --git a/pyresample/test/test_kd_tree.py b/pyresample/test/test_kd_tree.py
-index bb0da0f..8cbe9c4 100644
---- a/pyresample/test/test_kd_tree.py
-+++ b/pyresample/test/test_kd_tree.py
-@@ -257,6 +257,8 @@ class Test(unittest.TestCase):
-         self.assertEqual(cross_sum, expected,
-                          msg='Grid remapping nearest failed')
- 
-+    @unittest.skipIf(kd_tree.kd_tree_name != 'pykdtree',
-+                     'access to pykdtree specific attributes')
-     def test_nearest_mp(self):
-         data = numpy.fromfunction(lambda y, x: y * x, (50, 10))
-         lons = numpy.fromfunction(lambda y, x: 3 + x, (50, 10))
-@@ -436,6 +438,8 @@ class Test(unittest.TestCase):
-         self.assertAlmostEqual(cross_sum_counts, expected_counts,
-                                msg='Swath multi channel resampling gauss failed on counts')
- 
-+    @unittest.skipIf(kd_tree.kd_tree_name != 'pykdtree',
-+                     'access to pykdtree specific attributes')
-     def test_gauss_multi_mp(self):
-         data = numpy.fromfunction(lambda y, x: (y + x) * 10 ** -6, (5000, 100))
-         lons = numpy.fromfunction(
-@@ -466,6 +470,8 @@ class Test(unittest.TestCase):
-         self.assertAlmostEqual(cross_sum, expected,
-                                msg='Swath multi channel resampling gauss failed')
- 
-+    @unittest.skipIf(kd_tree.kd_tree_name != 'pykdtree',
-+                     'access to pykdtree specific attributes')
-     def test_gauss_multi_mp_segments(self):
-         data = numpy.fromfunction(lambda y, x: (y + x) * 10 ** -6, (5000, 100))
-         lons = numpy.fromfunction(
diff --git a/debian/patches/series b/debian/patches/series
index 1c9ec7c..7727eff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0002-fix-doc-build.patch
-0003-fix-proj4-initialization.patch
-0003-skip-nearest-resize-test.patch
-0004-Use-cmath.patch
+0001-fix-doc-build.patch
+0002-fix-proj4-initialization.patch
+0003-Use-cmath.patch

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