Antonio Valentino pushed to branch master at Debian GIS Project / pyresample
Commits: 3759a38d by Antonio Valentino at 2020-01-23T07:49:53+00:00 Porjection name compatibility - - - - - b4d6d34b by Antonio Valentino at 2020-01-23T07:50:18+00:00 Set distribution to unstable - - - - - 10 changed files: - debian/changelog - debian/patches/0002-Skip-dask-related-tests-if-dask-is-not-available.patch → debian/patches/0001-Skip-dask-related-tests-if-dask-is-not-available.patch - − debian/patches/0001-fix-proj4-initialization.patch - debian/patches/0003-Make-xarray-optional-for-testing.patch → debian/patches/0002-Make-xarray-optional-for-testing.patch - debian/patches/0004-Detect-broken-basemap.patch → debian/patches/0003-Detect-broken-basemap.patch - debian/patches/0005-Comapt-with-dask-1.0.patch → debian/patches/0004-Comapt-with-dask-1.0.patch - debian/patches/0006-Skip-test-on-deprecatet-basemap.patch → debian/patches/0005-Skip-test-on-deprecatet-basemap.patch - debian/patches/0007-Fix-tests-on-i386.patch → debian/patches/0006-Fix-tests-on-i386.patch - + debian/patches/0007-Projection-names-compatibility.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +pyresample (1.14.0-3) unstable; urgency=medium + + * debian/patches: + - drop 0001-fix-proj4-initialization.patch,no longer necessary + - renumber all patches + - new 0007-Projection-names-compatibility.patch (CLoses: 949274) + + -- Antonio Valentino <[email protected]> Thu, 23 Jan 2020 07:50:04 +0000 + pyresample (1.14.0-2) unstable; urgency=medium * debian/patches: ===================================== debian/patches/0002-Skip-dask-related-tests-if-dask-is-not-available.patch → debian/patches/0001-Skip-dask-related-tests-if-dask-is-not-available.patch ===================================== @@ -9,7 +9,7 @@ Subject: Skip dask-related tests if dask is not available 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/pyresample/test/test_geometry.py b/pyresample/test/test_geometry.py -index 7ecb008..23f5df9 100644 +index 295951f..50efd00 100644 --- a/pyresample/test/test_geometry.py +++ b/pyresample/test/test_geometry.py @@ -9,7 +9,8 @@ import numpy as np ===================================== debian/patches/0001-fix-proj4-initialization.patch deleted ===================================== @@ -1,62 +0,0 @@ -From: Antonio Valentino <[email protected]> -Date: Sat, 18 Jul 2015 10:33:21 +0000 -Subject: fix proj4 initialization - ---- - pyresample/test/test_files/areas.cfg | 2 +- - pyresample/test/test_geometry.py | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/pyresample/test/test_files/areas.cfg b/pyresample/test/test_files/areas.cfg -index 063264d..620e665 100644 ---- a/pyresample/test/test_files/areas.cfg -+++ b/pyresample/test/test_files/areas.cfg -@@ -28,7 +28,7 @@ REGION: ease_nh { - REGION: pc_world { - NAME: Plate Carree world map - PCS_ID: pc_world -- PCS_DEF: proj=eqc -+ PCS_DEF: proj=eqc, ellps=WGS84 - XSIZE: 640 - YSIZE: 480 - AREA_EXTENT: (-20037508.342789244, -10018754.171394622, 20037508.342789244, 10018754.171394622) -diff --git a/pyresample/test/test_geometry.py b/pyresample/test/test_geometry.py -index 295951f..7ecb008 100644 ---- a/pyresample/test/test_geometry.py -+++ b/pyresample/test/test_geometry.py -@@ -559,7 +559,7 @@ class Test(unittest.TestCase): - swath_def = geometry.SwathDefinition(lons, lats) - filter_area = geometry.AreaDefinition('test', 'test', 'test', - {'proj': 'eqc', 'lon_0': 0.0, -- 'lat_0': 0.0}, -+ 'lat_0': 0.0, 'ellps': 'WGS84'}, - 8, 8, - (-20037508.34, -10018754.17, 20037508.34, 10018754.17)) - filter = np.array([[1, 1, 1, 1, 0, 0, 0, 0], -@@ -584,7 +584,7 @@ class Test(unittest.TestCase): - data = np.array([1, 2, 3, 4]) - filter_area = geometry.AreaDefinition('test', 'test', 'test', - {'proj': 'eqc', 'lon_0': 0.0, -- 'lat_0': 0.0}, -+ 'lat_0': 0.0, 'ellps': 'WGS84'}, - 8, 8, - (-20037508.34, -10018754.17, 20037508.34, 10018754.17)) - filter = np.array([[1, 1, 1, 1, 0, 0, 0, 0], -@@ -619,7 +619,7 @@ class Test(unittest.TestCase): - data = np.dstack((data1, data2, data3)) - filter_area = geometry.AreaDefinition('test', 'test', 'test', - {'proj': 'eqc', 'lon_0': 0.0, -- 'lat_0': 0.0}, -+ 'lat_0': 0.0, 'ellps': 'WGS84'}, - 8, 8, - (-20037508.34, -10018754.17, 20037508.34, 10018754.17)) - filter = np.array([[1, 1, 1, 1, 0, 0, 0, 0], -@@ -688,7 +688,7 @@ class Test(unittest.TestCase): - - def test_latlong_area(self): - area_def = geometry.AreaDefinition('', '', '', -- {'proj': 'latlong'}, -+ {'proj': 'latlong', 'ellps': 'WGS84'}, - 360, 180, - [-180, -90, 180, 90]) - lons, lats = area_def.get_lonlats() ===================================== debian/patches/0003-Make-xarray-optional-for-testing.patch → debian/patches/0002-Make-xarray-optional-for-testing.patch ===================================== @@ -9,7 +9,7 @@ Subject: Make xarray optional for testing 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pyresample/test/test_geometry.py b/pyresample/test/test_geometry.py -index 23f5df9..4ac94d5 100644 +index 50efd00..42d9269 100644 --- a/pyresample/test/test_geometry.py +++ b/pyresample/test/test_geometry.py @@ -24,6 +24,11 @@ if sys.version_info < (2, 7): ===================================== debian/patches/0004-Detect-broken-basemap.patch → debian/patches/0003-Detect-broken-basemap.patch ===================================== ===================================== debian/patches/0005-Comapt-with-dask-1.0.patch → debian/patches/0004-Comapt-with-dask-1.0.patch ===================================== ===================================== debian/patches/0006-Skip-test-on-deprecatet-basemap.patch → debian/patches/0005-Skip-test-on-deprecatet-basemap.patch ===================================== ===================================== debian/patches/0007-Fix-tests-on-i386.patch → debian/patches/0006-Fix-tests-on-i386.patch ===================================== ===================================== debian/patches/0007-Projection-names-compatibility.patch ===================================== @@ -0,0 +1,26 @@ +From: Antonio Valentino <[email protected]> +Date: Thu, 23 Jan 2020 07:46:17 +0000 +Subject: Projection names compatibility + +--- + pyresample/test/test_utils.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/pyresample/test/test_utils.py b/pyresample/test/test_utils.py +index 93104a4..9945fbb 100644 +--- a/pyresample/test/test_utils.py ++++ b/pyresample/test/test_utils.py +@@ -474,7 +474,12 @@ class TestMisc(unittest.TestCase): + crs = CRS(init='epsg:3857') + source = tmptiff(crs=crs) + area_def = utils._rasterio.get_area_def_from_raster(source) +- self.assertEqual(area_def.proj_id, 'WGS 84 / Pseudo-Mercator') ++ #self.assertEqual(area_def.proj_id, 'WGS 84 / Pseudo-Mercator') ++ epsg3857_names = ( ++ 'WGS_1984_Web_Mercator_Auxiliary_Sphere', ++ 'WGS 84 / Pseudo-Mercator', ++ ) ++ self.assertIn(area_def.proj_id, epsg3857_names) + + def test_get_area_def_from_raster_rotated_value_err(self): + from pyresample import utils ===================================== debian/patches/series ===================================== @@ -1,7 +1,7 @@ -0001-fix-proj4-initialization.patch -0002-Skip-dask-related-tests-if-dask-is-not-available.patch -0003-Make-xarray-optional-for-testing.patch -0004-Detect-broken-basemap.patch -0005-Comapt-with-dask-1.0.patch -0006-Skip-test-on-deprecatet-basemap.patch -0007-Fix-tests-on-i386.patch +0001-Skip-dask-related-tests-if-dask-is-not-available.patch +0002-Make-xarray-optional-for-testing.patch +0003-Detect-broken-basemap.patch +0004-Comapt-with-dask-1.0.patch +0005-Skip-test-on-deprecatet-basemap.patch +0006-Fix-tests-on-i386.patch +0007-Projection-names-compatibility.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/pyresample/compare/b72fa321a0c205053a735ca7ad13a991180ba994...b4d6d34bc8cf798781b861ee53553ce6f2772814 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/pyresample/compare/b72fa321a0c205053a735ca7ad13a991180ba994...b4d6d34bc8cf798781b861ee53553ce6f2772814 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
