[pyresample] 09/15: Drop changed that are unrelated with the actual 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 e55b20efc8bc61d872f2d545c146b404c08e0d77
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sat Feb 27 10:59:46 2016 +0100

    Drop changed that are unrelated with the actual patch
---
 debian/patches/0003-fix-proj4-initialization.patch | 133 ---------------------
 1 file changed, 133 deletions(-)

diff --git a/debian/patches/0003-fix-proj4-initialization.patch b/debian/patches/0003-fix-proj4-initialization.patch
index f1d7d44..1d0a534 100644
--- a/debian/patches/0003-fix-proj4-initialization.patch
+++ b/debian/patches/0003-fix-proj4-initialization.patch
@@ -8,139 +8,6 @@ Subject: fix proj4 initialization
  pyresample/test/test_geometry.py     |  8 +++---
  3 files changed, 34 insertions(+), 32 deletions(-)
 
-diff --git a/pyresample/geometry.py b/pyresample/geometry.py
-index 5f1657f..28251ad 100644
---- a/pyresample/geometry.py
-+++ b/pyresample/geometry.py
-@@ -416,21 +416,21 @@ class AreaDefinition(BaseDefinition):
-     """Holds definition of an area.
- 
-     :Parameters:
--    area_id : str 
-+    area_id : str
-         ID of area
-     name : str
-         Name of area
--    proj_id : str 
-+    proj_id : str
-         ID of projection
--    proj_dict : dict 
-+    proj_dict : dict
-         Dictionary with Proj.4 parameters
--    x_size : int 
-+    x_size : int
-         x dimension in number of pixels
--    y_size : int     
--        y dimension in number of pixels    
--    area_extent : list 
-+    y_size : int
-+        y dimension in number of pixels
-+    area_extent : list
-         Area extent as a list (LL_x, LL_y, UR_x, UR_y)
--    nprocs : int, optional 
-+    nprocs : int, optional
-         Number of processor cores to be used
-     lons : numpy array, optional
-         Grid lons
-@@ -438,37 +438,37 @@ class AreaDefinition(BaseDefinition):
-         Grid lats
- 
-     :Attributes:
--    area_id : str         
-+    area_id : str
-         ID of area
-     name : str
-         Name of area
--    proj_id : str         
-+    proj_id : str
-         ID of projection
--    proj_dict : dict        
-+    proj_dict : dict
-         Dictionary with Proj.4 parameters
--    x_size : int          
-+    x_size : int
-         x dimension in number of pixels
--    y_size : int          
-+    y_size : int
-         y dimension in number of pixels
-     shape : tuple
-         Corresponding array shape as (rows, cols)
-     size : int
-         Number of points in grid
--    area_extent : tuple     
-+    area_extent : tuple
-         Area extent as a tuple (LL_x, LL_y, UR_x, UR_y)
--    area_extent_ll : tuple     
-+    area_extent_ll : tuple
-         Area extent in lons lats as a tuple (LL_lon, LL_lat, UR_lon, UR_lat)
--    pixel_size_x : float    
-+    pixel_size_x : float
-         Pixel width in projection units
--    pixel_size_y : float    
-+    pixel_size_y : float
-         Pixel height in projection units
--    pixel_upper_left : list 
-+    pixel_upper_left : list
-         Coordinates (x, y) of center of upper left pixel in projection units
--    pixel_offset_x : float 
--        x offset between projection center and upper left corner of upper 
-+    pixel_offset_x : float
-+        x offset between projection center and upper left corner of upper
-         left pixel in units of pixels.
--    pixel_offset_y : float 
--        y offset between projection center and upper left corner of upper 
-+    pixel_offset_y : float
-+        y offset between projection center and upper left corner of upper
-         left pixel in units of pixels..
- 
-     Properties:
-@@ -511,6 +511,8 @@ class AreaDefinition(BaseDefinition):
-         self.area_extent = tuple(area_extent)
- 
-         # Calculate area_extent in lon lat
-+        from pprint import pprint
-+        pprint(proj_dict)
-         proj = _spatial_mp.Proj(**proj_dict)
-         corner_lons, corner_lats = proj((area_extent[0], area_extent[2]),
-                                         (area_extent[1], area_extent[3]),
-@@ -635,7 +637,7 @@ class AreaDefinition(BaseDefinition):
-         return self.get_lonlats(nprocs=None, data_slice=(row, col))
- 
-     def get_proj_coords(self, data_slice=None, cache=False, dtype=None):
--        """Get projection coordinates of grid 
-+        """Get projection coordinates of grid
- 
-         :Parameters:
-         data_slice : slice object, optional
-@@ -643,7 +645,7 @@ class AreaDefinition(BaseDefinition):
-         cache : bool, optional
-             Store result the result. Requires data_slice to be None
- 
--        :Returns: 
-+        :Returns:
-         (target_x, target_y) : tuple of numpy arrays
-             Grids of area x- and y-coordinates in projection units
-         """
-@@ -778,8 +780,8 @@ class AreaDefinition(BaseDefinition):
-     def get_lonlats(self, nprocs=None, data_slice=None, cache=False, dtype=None):
-         """Returns lon and lat arrays of area.
- 
--        :Parameters:        
--        nprocs : int, optional 
-+        :Parameters:
-+        nprocs : int, optional
-             Number of processor cores to be used.
-             Defaults to the nprocs set when instantiating object
-         data_slice : slice object, optional
-@@ -787,7 +789,7 @@ class AreaDefinition(BaseDefinition):
-         cache : bool, optional
-             Store result the result. Requires data_slice to be None
- 
--        :Returns: 
-+        :Returns:
-         (lons, lats) : tuple of numpy arrays
-             Grids of area lons and and lats
-         """
 diff --git a/pyresample/test/test_files/areas.cfg b/pyresample/test/test_files/areas.cfg
 index 3c6ef3c..5346cb4 100644
 --- a/pyresample/test/test_files/areas.cfg

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