Merge branch 'develop' of github.com:stac-utils/pystac into remove_link_type

Author: matthewhanson

.codespellignore

@@ -0,0 +1 @@
+filetest

.github/pull_request_template.md

@@ -0,0 +1,12 @@
+**Related Issue(s):** #
+
+
+**Description:**
+
+
+**PR Checklist:**
+
+- [ ] Code is formatted (run `scripts/format`)
+- [ ] Tests pass (run `scripts/test`)
+- [ ] This PR maintains or improves overall codebase code coverage.
+- [ ] Changes are added to the [CHANGELOG](https://github.com/stac-utils/pystac/blob/develop/CHANGELOG.md). See [the docs](https://pystac.readthedocs.io/en/latest/contributing.html#changelog) for information about adding to the changelog.

CHANGELOG.md

@@ -1,6 +1,22 @@
 # Changelog
 
-## [unreleased]
+## unreleased
+
+### Added
+
+### Fixed
+
+- Fixed error when accessing the statistics attribute of the pointcloud extension when no statistics were defined ([#282](https://github.com/stac-utils/pystac/pull/282))
+
+### Changed
+
+### Removed
+
+## [v0.5.5]
+
+### Added
+
+- Added support for STAC file extension ([#270](https://github.com/stac-utils/pystac/pull/270))
 
 ### Fixed
 
@@ -10,6 +26,7 @@
 ### Changed
 
 - Subclass relevant classes from `enum.Enum`. This allows iterating over the class' contents. The `__str__` method is overwritten so this should not break backwards compatibility. ([#261](https://github.com/stac-utils/pystac/pull/261))
+- Extract method to correctly handle setting properties in Item/Asset for ItemExtensions ([#272](https://github.com/stac-utils/pystac/pull/272))
 
 ## [v0.5.4]
 

docs/contributing.rst

@@ -57,3 +57,19 @@ To format code:
    > yapf -ipr tests
 
 You can also run the ``./scripts/test`` script to check flake8 and yapf.
+
+CHANGELOG
+^^^^^^^^^
+
+PySTAC maintains a `changelog  <https://github.com/stac-utils/pystac/blob/develop/CHANGELOG.md>`_
+to track changes between releases. All PRs should make a changelog entry unless
+the change is trivial (e.g. fixing typos) or is entirely invisible to users who may
+be upgrading versions (e.g. an improvement to the CI system).
+
+For changelog entries, please link to the PR of that change. This needs to happen in a few steps:
+
+- Make a PR to PySTAC with your changes
+- Record the link to the PR
+- Push an additional commit to your branch with the changelog entry with the link to the PR.
+
+For more information on changelogs and how to write a good entry, see `keep a changelog <https://keepachangelog.com/en/1.0.0/>`_

pystac/__init__.py

@@ -41,6 +41,7 @@ class STACError(Exception):
 import pystac.extensions.timestamps
 import pystac.extensions.version
 import pystac.extensions.view
+import pystac.extensions.file
 
 STAC_EXTENSIONS = extensions.base.RegisteredSTACExtensions([
     extensions.eo.EO_EXTENSION_DEFINITION, extensions.label.LABEL_EXTENSION_DEFINITION,
@@ -49,7 +50,8 @@ class STACError(Exception):
     extensions.sat.SAT_EXTENSION_DEFINITION, extensions.scientific.SCIENTIFIC_EXTENSION_DEFINITION,
     extensions.single_file_stac.SFS_EXTENSION_DEFINITION,
     extensions.timestamps.TIMESTAMPS_EXTENSION_DEFINITION,
-    extensions.version.VERSION_EXTENSION_DEFINITION, extensions.view.VIEW_EXTENSION_DEFINITION
+    extensions.version.VERSION_EXTENSION_DEFINITION, extensions.view.VIEW_EXTENSION_DEFINITION,
+    extensions.file.FILE_EXTENSION_DEFINITION
 ])
 
 

pystac/catalog.py

@@ -381,7 +381,7 @@ def to_dict(self, include_self_link=True):
         if self.title is not None:
             d['title'] = self.title
 
-        return deepcopy(d)
+        return d
 
     def clone(self):
         clone = Catalog(id=self.id,

pystac/collection.py

@@ -107,7 +107,7 @@ def to_dict(self, include_self_link=True):
         if self.summaries is not None:
             d['summaries'] = self.summaries
 
-        return deepcopy(d)
+        return d
 
     def clone(self):
         clone = Collection(id=self.id,
@@ -213,7 +213,7 @@ def to_dict(self):
         """
         d = {'spatial': self.spatial.to_dict(), 'temporal': self.temporal.to_dict()}
 
-        return deepcopy(d)
+        return d
 
     def clone(self):
         """Clones this object.
@@ -315,7 +315,7 @@ def to_dict(self):
             dict: A serializion of the SpatialExtent that can be written out as JSON.
         """
         d = {'bbox': self.bboxes}
-        return deepcopy(d)
+        return d
 
     def clone(self):
         """Clones this object.
@@ -418,7 +418,7 @@ def to_dict(self):
             encoded_intervals.append([start, end])
 
         d = {'interval': encoded_intervals}
-        return deepcopy(d)
+        return d
 
     def clone(self):
         """Clones this object.
@@ -505,7 +505,7 @@ def to_dict(self):
         if self.url is not None:
             d['url'] = self.url
 
-        return deepcopy(d)
+        return d
 
     @staticmethod
     def from_dict(d):

pystac/extensions/__init__.py

@@ -29,3 +29,4 @@ def __str__(self):
     TIMESTAMPS = 'timestamps'
     VERSION = 'version'
     VIEW = 'view'
+    FILE = 'file'

pystac/extensions/base.py

@@ -121,6 +121,30 @@ def enable_extension(cls, stac_object):
         """
         pass
 
+    def _set_property(self, key, value, asset):
+        '''
+        Set an Item or an Asset property.
+
+        If an Asset is supplied, sets the property on the Asset.
+        Otherwise sets the Item's value.
+
+        If the passed value to set is None, the property key is removed from
+        the dictionary of properties.
+
+        It's recommended to use this method from extensions, instead of implementing
+        the logic for that in the corresponding subclasses.
+
+        Args:
+            key (str): The name of the property
+            value (Object): the value to set
+            asset: The Asset to modify. If None, the property will be set in the Item
+        '''
+        target = self.item.properties if asset is None else asset.properties
+        if value is None:
+            target.pop(key, None)
+        else:
+            target[key] = value
+
 
 class RegisteredSTACExtensions:
     def __init__(self, extension_definitions):

pystac/extensions/eo.py

@@ -85,10 +85,7 @@ def set_bands(self, bands, asset=None):
         Otherwise sets the Item's value.
         """
         band_dicts = [b.to_dict() for b in bands]
-        if asset is not None:
-            asset.properties['eo:bands'] = band_dicts
-        else:
-            self.item.properties['eo:bands'] = band_dicts
+        self._set_property('eo:bands', band_dicts, asset)
 
     @property
     def cloud_cover(self):
@@ -124,10 +121,7 @@ def set_cloud_cover(self, cloud_cover, asset=None):
         If an Asset is supplied, sets the property on the Asset.
         Otherwise sets the Item's value.
         """
-        if asset is None:
-            self.item.properties['eo:cloud_cover'] = cloud_cover
-        else:
-            asset.properties['eo:cloud_cover'] = cloud_cover
+        self._set_property('eo:cloud_cover', cloud_cover, asset)
 
     def __repr__(self):
         return '<EOItemExt Item id={}>'.format(self.item.id)