[pyresample] 10/15: Remove patch for skipping basemap tests

[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 a075d4d0ed991af2d2f449269ffcebccb4aaa335
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sat Feb 27 11:03:39 2016 +0100

    Remove patch for skipping basemap tests
---
 debian/changelog                             |  6 ++-
 debian/patches/0001-skip-basemap-tests.patch | 56 ----------------------------
 debian/patches/series                        |  1 -
 3 files changed, 4 insertions(+), 59 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index efa7b27..7811d36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,10 +6,12 @@ pyresample (1.1.5-1) unstable; urgency=medium
     - standard version bumped to 3.9.7 (no change)
     - updated VCS URL
     - update build dependencies
-  * Refresh all patches
+  * debian/patches
+    - removed path for skipping basemap tests (no longer necessary)
+    - refresh remaining patches
   * watch file updated 
 
- -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 27 Feb 2016 09:36:51 +0000
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 27 Feb 2016 11:01:23 +0100
 
 pyresample (1.1.3-1) unstable; urgency=medium
 
diff --git a/debian/patches/0001-skip-basemap-tests.patch b/debian/patches/0001-skip-basemap-tests.patch
deleted file mode 100644
index 2603503..0000000
--- a/debian/patches/0001-skip-basemap-tests.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Antonio Valentino <antonio.valentino at tiscali.it>
-Date: Sat, 11 Jul 2015 20:57:24 +0200
-Subject: skip basemap tests
-
----
- pyresample/test/test_plot.py | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/pyresample/test/test_plot.py b/pyresample/test/test_plot.py
-index f2cd261..6de7fec 100644
---- a/pyresample/test/test_plot.py
-+++ b/pyresample/test/test_plot.py
-@@ -11,6 +11,11 @@ try:
- except ImportError:
-     pass  # Postpone fail to individual tests
- 
-+try:
-+    from mpl_toolkits.basemap import Basemap
-+except ImportError:
-+    Basemap = None
-+
- 
- def tmp(f):
-     f.tmp = True
-@@ -40,6 +45,7 @@ class Test(unittest.TestCase):
-         self.assertAlmostEqual(b, 6356752.3142451793,
-                                msg='Failed to get semi-minor axis of ellipsis')
- 
-+    @unittest.skipIf(not Basemap, "basemap not available")
-     def test_area_def2basemap(self):
-         area_def = utils.parse_area_file(os.path.join(os.path.dirname(__file__),
-                                                       'test_files', 'areas.cfg'), 'ease_sh')[0]
-@@ -48,6 +54,7 @@ class Test(unittest.TestCase):
-                         bmap.rmajor == 6371228.0,
-                         'Failed to create Basemap object')
- 
-+    @unittest.skipIf(not Basemap, "basemap not available")
-     def test_plate_carreeplot(self):
-         area_def = utils.parse_area_file(os.path.join(os.path.dirname(__file__),
-                                                       'test_files', 'areas.cfg'), 'pc_world')[0]
-@@ -58,6 +65,7 @@ class Test(unittest.TestCase):
-         plt = plot._get_quicklook(area_def, result, num_meridians=0,
-                                   num_parallels=0)
- 
-+    @unittest.skipIf(not Basemap, "basemap not available")
-     def test_easeplot(self):
-         area_def = utils.parse_area_file(os.path.join(os.path.dirname(__file__),
-                                                       'test_files', 'areas.cfg'), 'ease_sh')[0]
-@@ -67,6 +75,7 @@ class Test(unittest.TestCase):
-                                           fill_value=None)
-         plt = plot._get_quicklook(area_def, result)
- 
-+    @unittest.skipIf(not Basemap, "basemap not available")
-     def test_orthoplot(self):
-         area_def = utils.parse_area_file(os.path.join(os.path.dirname(__file__),
-                                                       'test_files', 'areas.cfg'), 'ortho')[0]
diff --git a/debian/patches/series b/debian/patches/series
index 217142d..4d9e78c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-0001-skip-basemap-tests.patch
 0002-fix-doc-build.patch
 0003-fix-proj4-initialization.patch

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