[Git][debian-gis-team/satpy][upstream] New upstream version 0.11.1

[Antonio Valentino]

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


Commits:
aa57fd2a by Antonio Valentino at 2018-12-31T17:47:33Z
New upstream version 0.11.1
- - - - -


5 changed files:

- CHANGELOG.md
- satpy/composites/__init__.py
- satpy/scene.py
- satpy/tests/compositor_tests/__init__.py
- satpy/version.py


Changes:

=====================================
CHANGELOG.md
=====================================
@@ -1,3 +1,14 @@
+## Version 0.11.1 (2018/12/27)
+
+### Pull Requests Merged
+
+#### Bugs fixed
+
+* [PR 560](https://github.com/pytroll/satpy/pull/560) - Fix available_composite_ids including inline comp dependencies
+
+In this release 1 pull request was closed.
+
+
 ## Version 0.11.0 (2018/12/21)
 
 ### Issues Closed


=====================================
satpy/composites/__init__.py
=====================================
@@ -148,7 +148,7 @@ class CompositorLoader(object):
                     # Handle in-line composites
                     if 'compositor' in item:
                         # Create an unique temporary name for the composite
-                        sub_comp_name = composite_name + '_dep_{}'.format(dep_num)
+                        sub_comp_name = '_' + composite_name + '_dep_{}'.format(dep_num)
                         dep_num += 1
                         # Minimal composite config
                         sub_conf = {composite_type: {sub_comp_name: item}}


=====================================
satpy/scene.py
=====================================
@@ -341,10 +341,9 @@ class Scene(MetadataObject):
             reader_name=reader_name, composites=composites)))
 
     def available_composite_ids(self, available_datasets=None):
-        """Get names of compositors that can be generated from the available
-        datasets.
+        """Get names of compositors that can be generated from the available datasets.
 
-        :return: generator of available compositor's names
+        Returns: generator of available compositor's names
         """
         if available_datasets is None:
             available_datasets = self.available_dataset_ids(composites=False)
@@ -364,13 +363,14 @@ class Scene(MetadataObject):
         return sorted(available_comps & set(all_comps))
 
     def available_composite_names(self, available_datasets=None):
+        """All configured composites known to this Scene."""
         return sorted(set(x.name for x in self.available_composite_ids(
             available_datasets=available_datasets)))
 
     def all_composite_ids(self, sensor_names=None):
         """Get all composite IDs that are configured.
 
-        :return: generator of configured composite names
+        Returns: generator of configured composite names
         """
         if sensor_names is None:
             sensor_names = self.attrs['sensor']
@@ -378,8 +378,9 @@ class Scene(MetadataObject):
         # Note if we get compositors from the dep tree then it will include
         # modified composites which we don't want
         for sensor_name in sensor_names:
-            compositors.extend(
-                self.cpl.compositors.get(sensor_name, {}).keys())
+            sensor_comps = self.cpl.compositors.get(sensor_name, {}).keys()
+            # ignore inline compositor dependencies starting with '_'
+            compositors.extend(c for c in sensor_comps if not c.name.startswith('_'))
         return sorted(set(compositors))
 
     def all_composite_names(self, sensor_names=None):


=====================================
satpy/tests/compositor_tests/__init__.py
=====================================
@@ -472,8 +472,8 @@ class TestInlineComposites(unittest.TestCase):
         # Check that "fog" product has all its prerequisites defined
         keys = comps['visir'].keys()
         fog = [comps['visir'][dsid] for dsid in keys if "fog" == dsid.name][0]
-        self.assertEqual(fog.attrs['prerequisites'][0], 'fog_dep_0')
-        self.assertEqual(fog.attrs['prerequisites'][1], 'fog_dep_1')
+        self.assertEqual(fog.attrs['prerequisites'][0], '_fog_dep_0')
+        self.assertEqual(fog.attrs['prerequisites'][1], '_fog_dep_1')
         self.assertEqual(fog.attrs['prerequisites'][2], 10.8)
 
         # Check that the sub-composite dependencies use wavelengths


=====================================
satpy/version.py
=====================================
@@ -23,9 +23,9 @@ def get_keywords():
     # setup.py/versioneer.py will grep for the variable names, so they must
     # each be defined on a line of their own. _version.py will just call
     # get_keywords().
-    git_refnames = " (HEAD -> master, tag: v0.11.0)"
-    git_full = "2bfaf5ac8419adaff98bc707b9be9b9aae4dfd98"
-    git_date = "2018-12-21 09:01:39 -0600"
+    git_refnames = " (tag: v0.11.1)"
+    git_full = "621606d6a8f4b0506207963e9dc3a059094e1399"
+    git_date = "2018-12-27 09:26:00 -0600"
     keywords = {"refnames": git_refnames, "full": git_full, "date": git_date}
     return keywords
 



View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/commit/aa57fd2a55354d96a121d426249a56fed4044f04

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/satpy/commit/aa57fd2a55354d96a121d426249a56fed4044f04
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/20181231/8e29f340/attachment-0001.html>