Skip to content
Commits on Source (3)
Show whitespace changes
Inline Side-by-side
debian/changelog
View file @ 54d2085b
pyresample (1.12.3-3) UNRELEASED; urgency=medium
pyresample (1.12.3-3) unstable; urgency=medium
[ Bas Couwenberg ]
* Bump Standards-Version to 4.4.0, no changes.
-- Bas Couwenberg <sebastic@debian.org> Wed, 10 Jul 2019 19:02:04 +0200
[ Antonio Valentino ]
* Drop build-dependency from python-xarray (Closes: #932509).
* debian/patches:
new debian/patches/0003-Make-xarray-optional-for-testing.patch
* Set compat to 12.
-- Antonio Valentino <antonio.valentino@tiscali.it> Sat, 20 Jul 2019 18:24:38 +0000
pyresample (1.12.3-2) unstable; urgency=medium
......
debian/control
View file @ 54d2085b
......@@ -3,7 +3,7 @@ Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
Uploaders: Antonio Valentino <antonio.valentino@tiscali.it>
Section: python
Priority: optional
Build-Depends: debhelper (>= 11.0.0),
Build-Depends: debhelper (>= 12.0.0),
dh-python,
python-all-dev,
python3-all-dev,
......@@ -35,7 +35,6 @@ Build-Depends: debhelper (>= 11.0.0),
python3-scipy,
python-rasterio,
python3-rasterio,
python-xarray,
python3-xarray,
python3-dask,
cython,
......@@ -62,8 +61,7 @@ Recommends: python-cartopy,
python-matplotlib,
python-numexpr,
python-pil,
python-scipy,
python-xarray
python-scipy
Suggests: python-pyresample-doc,
python-mpltoolkits.basemap
Description: Resampling of remote sensing data in Python 2
......@@ -95,10 +93,10 @@ Recommends: python3-cartopy,
python3-matplotlib,
python3-numexpr,
python3-pil,
python3-scipy
Suggests: python-pyresample-doc,
python3-mpltoolkits.basemap,
python3-scipy,
python3-xarray
Suggests: python-pyresample-doc,
python3-mpltoolkits.basemap
Description: Resampling of remote sensing data in Python 3
Pyresample is a Python package for resampling (reprojection) of earth
observing satellite data. It handles both resampling of gridded data
......
debian/patches/0003-Make-xarray-optional-for-testing.patch 0 → 100644
View file @ 54d2085b
From: Antonio Valentino <antonio.valentino@tiscali.it>
Date: Sat, 20 Jul 2019 20:08:39 +0200
Subject: Make xarray optional for testing
---
pyresample/test/test_geometry.py | 10 ++++++++++
pyresample/test/test_kd_tree.py | 6 ++++++
setup.py | 2 +-
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/pyresample/test/test_geometry.py b/pyresample/test/test_geometry.py
index 931a13f..0ee95be 100644
--- a/pyresample/test/test_geometry.py
+++ b/pyresample/test/test_geometry.py
@@ -24,6 +24,11 @@ if sys.version_info < (2, 7):
else:
import unittest
+try:
+ import xarray
+except ImportError:
+ xarray = None
+
try:
import dask
except ImportError:
@@ -1301,6 +1306,7 @@ class TestSwathDefinition(unittest.TestCase):
self.assertFalse(
swath_def == swath_def2, 'swath_defs are not expected to be equal')
+ @unittest.skipIf(xarray is None, 'xarray is not available')
def test_compute_omerc_params(self):
"""Test omerc parameters computation."""
lats = np.array([[85.23900604248047, 62.256004333496094, 35.58000183105469],
@@ -1372,6 +1378,7 @@ class TestSwathDefinition(unittest.TestCase):
np.testing.assert_allclose(lats, [80., 80., 80., 80., 80., 80., 80.,
80., 80., 80., 80., 80.])
+ @unittest.skipIf(xarray is None, 'xarray is not available')
def test_compute_optimal_bb(self):
"""Test computing the bb area."""
import xarray as xr
@@ -1396,6 +1403,7 @@ class TestSwathDefinition(unittest.TestCase):
assert_np_dict_allclose(res.proj_dict, proj_dict)
self.assertEqual(res.shape, (6, 3))
+ @unittest.skipIf(xarray is None, 'xarray is not available')
@unittest.skipIf(not hasattr(DataArray, 'coarsen'), 'DataArray.coarsen not available')
@unittest.skipIf(not dask, 'dask not available')
def test_aggregation(self):
@@ -1415,6 +1423,7 @@ class TestSwathDefinition(unittest.TestCase):
np.testing.assert_allclose(res.lons, [[179, -179]])
np.testing.assert_allclose(res.lats, [[0.5, 0.5]], atol=2e-5)
+ @unittest.skipIf(xarray is None, 'xarray is not available')
@unittest.skipIf(not dask, 'dask not available')
def test_striding(self):
"""Test striding."""
@@ -1726,6 +1735,7 @@ class TestDynamicAreaDefinition(unittest.TestCase):
self.assertEqual(result.x_size, 395)
self.assertEqual(result.y_size, 539)
+ @unittest.skipIf(xarray is None, 'xarray is not available')
def test_freeze_with_bb(self):
"""Test freezing the area with bounding box computation."""
area = geometry.DynamicAreaDefinition('test_area', 'A test area',
diff --git a/pyresample/test/test_kd_tree.py b/pyresample/test/test_kd_tree.py
index 30108ca..1dc8f74 100644
--- a/pyresample/test/test_kd_tree.py
+++ b/pyresample/test/test_kd_tree.py
@@ -14,6 +14,11 @@ if sys.version_info < (2, 7):
else:
import unittest
+try:
+ import xarray as xr
+except ImportError:
+ xr = None
+
try:
import dask.array as da
except ImportError:
@@ -701,6 +706,7 @@ class Test(unittest.TestCase):
self.assertTrue(np.array_equal(fill_mask, expected_fill_mask))
+@unittest.skipIf(not xr, 'xarray not available')
@unittest.skipIf(not da, 'dask not available')
class TestXArrayResamplerNN(unittest.TestCase):
"""Test the XArrayResamplerNN class."""
diff --git a/setup.py b/setup.py
index 15db3f5..e7901bf 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ extras_require = {'numexpr': ['numexpr'],
'rasterio': ['rasterio'],
'dask': ['dask>=0.16.1']}
-test_requires = ['rasterio', 'xarray', 'cartopy', 'pillow', 'matplotlib', 'scipy']
+test_requires = ['rasterio', 'cartopy', 'pillow', 'matplotlib', 'scipy']
if sys.version_info < (3, 3):
test_requires.append('mock')
debian/patches/series
View file @ 54d2085b
0001-fix-proj4-initialization.patch
0002-Skip-dask-related-tests-if-dask-is-not-available.patch
0003-Make-xarray-optional-for-testing.patch