[Git][debian-gis-team/satpy][master] 3 commits: Improve 0002-No-setuptools-scm.patch

[Antonio Valentino]

Antonio Valentino pushed to branch master at Debian GIS Project / satpy


Commits:
f92d32c1 by Antonio Valentino at 2020-02-07T17:29:26+00:00
Improve 0002-No-setuptools-scm.patch

- - - - -
a2cbed0c by Antonio Valentino at 2020-02-07T20:50:21+00:00
Compatibility with xarray 0.15

- - - - -
2127b8a4 by Antonio Valentino at 2020-02-07T20:50:59+00:00
Set distribution to unstable

- - - - -


4 changed files:

- debian/changelog
- debian/patches/0002-No-setuptools-scm.patch
- + debian/patches/0004-xarray-0.15-compat.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,12 @@
-satpy (0.19.1-2) UNRELEASED; urgency=medium
+satpy (0.19.1-2) unstable; urgency=medium
 
   * Bump Standards-Version to 4.5.0, no changes.
+  * debian/patches:
+    - improve 0002-No-setuptools-scm.patch
+    - new 0004-xarray-0.15-compat.patch, improve compatibility
+      with xarray 0.15 (Closes: 950887)
 
- -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 25 Jan 2020 11:13:56 +0100
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Fri, 07 Feb 2020 20:50:34 +0000
 
 satpy (0.19.1-1) unstable; urgency=medium
 


=====================================
debian/patches/0002-No-setuptools-scm.patch
=====================================
@@ -6,7 +6,8 @@ Subject: No setuptools-scm
  doc/source/conf.py | 16 +++++++++++-----
  satpy/__init__.py  |  2 +-
  setup.cfg          |  8 ++++----
- 3 files changed, 16 insertions(+), 10 deletions(-)
+ setup.py           |  4 ++--
+ 4 files changed, 18 insertions(+), 12 deletions(-)
 
 diff --git a/doc/source/conf.py b/doc/source/conf.py
 index ce28c35..7e70d2b 100644
@@ -64,3 +65,25 @@ index 31de3a9..3b209a7 100644
  
  [bdist_rpm]
  requires=h5py pyresample python2-numexpr pyhdf xarray dask h5netcdf
+diff --git a/setup.py b/setup.py
+index b93b4b3..6ee51ac 100644
+--- a/setup.py
++++ b/setup.py
+@@ -36,7 +36,7 @@ try:
+     import setuptools_scm.integration
+     setuptools_scm.integration.find_files = lambda _: []
+ except ImportError:
+-    pass
++    setuptools_scm = None
+ 
+ requires = ['numpy >=1.13', 'pillow', 'pyresample >=1.11.0', 'trollsift',
+             'trollimage >1.10.1', 'pykdtree', 'six', 'pyyaml', 'xarray >=0.10.1, !=0.13.0',
+@@ -144,7 +144,7 @@ setup(name=NAME,
+                               os.path.join('etc', 'enhancements', '*.yaml'),
+                               ]},
+       zip_safe=False,
+-      use_scm_version=True,
++      use_scm_version=True if setuptools_scm is not None else False,
+       install_requires=requires,
+       tests_require=test_requires,
+       python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',


=====================================
debian/patches/0004-xarray-0.15-compat.patch
=====================================
@@ -0,0 +1,37 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Fri, 7 Feb 2020 20:41:22 +0000
+Subject: xarray 0.15 compat
+
+---
+ satpy/scene.py                           | 2 +-
+ satpy/tests/compositor_tests/__init__.py | 4 +---
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/satpy/scene.py b/satpy/scene.py
+index 3f92955..a8e6ef4 100644
+--- a/satpy/scene.py
++++ b/satpy/scene.py
+@@ -665,7 +665,7 @@ class Scene(MetadataObject):
+             except AttributeError:
+                 resolution = max(target_area.lats.resolution, target_area.lons.resolution)
+             for ds_id in ds_ids:
+-                res = self[ds_id].coarsen(boundary=boundary, side=side, func=func, **dim_kwargs)
++                res = self[ds_id].coarsen(boundary=boundary, side=side, **dim_kwargs)
+ 
+                 new_scn.datasets[ds_id] = getattr(res, func)()
+                 new_scn.datasets[ds_id].attrs['area'] = target_area
+diff --git a/satpy/tests/compositor_tests/__init__.py b/satpy/tests/compositor_tests/__init__.py
+index 479a640..6e10f81 100644
+--- a/satpy/tests/compositor_tests/__init__.py
++++ b/satpy/tests/compositor_tests/__init__.py
+@@ -263,9 +263,7 @@ class TestSunZenithCorrector(unittest.TestCase):
+         np.testing.assert_allclose(res.values, np.array([[22.401667, 22.31777], [22.437503, 22.353533]]))
+         self.assertIn('y', res.coords)
+         self.assertIn('x', res.coords)
+-        ds1 = self.ds1.copy()
+-        del ds1.coords['y']
+-        del ds1.coords['x']
++        ds1 = self.ds1.copy().drop_vars(('y', 'x'))
+         res = comp((ds1,), test_attr='test')
+         np.testing.assert_allclose(res.values, np.array([[22.401667, 22.31777], [22.437503, 22.353533]]))
+         self.assertNotIn('y', res.coords)


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 0001-Disable-extra-dependency-form-geoviews.patch
 0002-No-setuptools-scm.patch
 0003-Skip-broken-tests.patch
+0004-xarray-0.15-compat.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/compare/92fe204576df11effe9814e70821512405fe068a...2127b8a4dae2b7cc91729cf647551ec8e18e9ffd

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/compare/92fe204576df11effe9814e70821512405fe068a...2127b8a4dae2b7cc91729cf647551ec8e18e9ffd
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200207/75e51ed7/attachment-0001.html>