[python-mpop] 09/10: New patch: fix_missing_trollsift.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 python-mpop.

commit 0a160416e1b1d34cabc609cd87d89d4b1b9178e6
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sat Feb 6 13:35:25 2016 +0100

    New patch: fix_missing_trollsift.patch
---
 debian/changelog                           |  7 +++++--
 debian/patches/fix_missing_trollsift.patch | 25 +++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 54789f8..63af1e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,11 @@ python-mpop (1.2.1-1) UNRELEASED; urgency=medium
     . standard version bumped to 3.9.7 (no change)
     - fix Vcs-* URLs
     - update dependencies
-  * New patch fix_intersphinx_inventory_path.patch to avoid internet
-    access when generating sphinx doc
+  * New patches:
+    - fix_intersphinx_inventory_path.patch: avoid internet access when
+      generating sphinx doc
+    - fix_missing_trollsift.patch: skip tests on the PPSReader if the
+      trollsift module is not installed
 
  -- Antonio Valentino <antonio.valentino at tiscali.it>  Sun, 22 Mar 2015 18:32:19 +0000
 
diff --git a/debian/patches/fix_missing_trollsift.patch b/debian/patches/fix_missing_trollsift.patch
new file mode 100644
index 0000000..7a2218d
--- /dev/null
+++ b/debian/patches/fix_missing_trollsift.patch
@@ -0,0 +1,25 @@
+Index: python-mpop/mpop/tests/test_nc_pps_l2.py
+===================================================================
+--- python-mpop.orig/mpop/tests/test_nc_pps_l2.py
++++ python-mpop/mpop/tests/test_nc_pps_l2.py
+@@ -23,7 +23,10 @@
+ """Unit testing the pps level-2 netCDF reader
+ """
+ import unittest
+-from mpop.satin.nc_pps_l2 import PPSReader
++try:
++    from mpop.satin.nc_pps_l2 import PPSReader
++except ImportError:
++    PPSReader = None
+ 
+ CTTH_TESTFILE_LOCAL_1 = '/path/to/my/products/S_NWC_CTTH_noaa19_33897_20150906T1240015Z_20150906T1240598Z.nc'
+ CT_TESTFILE_LOCAL_1 = '/path/to/my/products/S_NWC_CT_noaa19_33897_20150906T1240015Z_20150906T1240598Z.nc'
+@@ -41,6 +44,7 @@ CT_TESTFILE_EARS_2 = '/path/to/my/produc
+ CMA_TESTFILE_EARS_2 = '/path/to/my/products/W_XX-EUMETSAT-Darmstadt,SING+LEV+SAT,METOPB+CMA_C_EUMS_20150914093200_15510.nc.bz2'
+ 
+ 
++ at unittest.skipIf(PPSReader is None, 'trollsift not available')
+ class TestPPSReader(unittest.TestCase):
+ 
+     """Class for testing the PPSReader reader class.
+
diff --git a/debian/patches/series b/debian/patches/series
index b330964..31c3dce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix-config-path.patch
 fix_intersphinx_inventory_path.patch
+fix_missing_trollsift.patch

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