yapf formatting

Author: lossyrob

pystac/asset.py

@@ -8,6 +8,7 @@
     from pystac.collection import Collection as Collection_Type
     from pystac.item import Item as Item_Type
 
+
 class Asset:
     """An object that contains a link to data associated with an Item or Collection that
     can be downloaded or streamed.

pystac/collection.py

@@ -545,7 +545,7 @@ def to_dict(self, include_self_link: bool = True) -> Dict[str, Any]:
         if not self.summaries.is_empty():
             d['summaries'] = self.summaries.to_dict()
         if any(self.assets):
-            d['assets'] = {k: v.to_dict() for k, v in self.assets.items() }
+            d['assets'] = {k: v.to_dict() for k, v in self.assets.items()}
 
         return d
 

pystac/errors.py

@@ -16,6 +16,7 @@ class STACTypeError(Exception):
     """
     pass
 
+
 class RequiredPropertyMissing(Exception):
     """ This error is raised when a required value was expected
     to be there but was missing or None. This will happen, for example,
@@ -31,8 +32,6 @@ class RequiredPropertyMissing(Exception):
     def __init__(self,
                  obj: Union[str, Any],
                  prop: str,
-                 msg: Optional[str] = None,
-                 *args: Any,
-                 **kwargs: Any) -> None:
+                 msg: Optional[str] = None) -> None:
         msg = msg or f"{repr(obj)} does not have required property {prop}"
-        super().__init__(msg, *args, **kwargs)
+        super().__init__(msg)

pystac/extensions/base.py

@@ -13,7 +13,7 @@ def __init__(self, collection: ps.Collection) -> None:
         self.summaries = collection.summaries
 
     def _set_summary(self, prop_key: str, v: Optional[Union[List[Any], ps.RangeSummary[Any],
-                                                   Dict[str, Any]]]) -> None:
+                                                            Dict[str, Any]]]) -> None:
         if v is None:
             self.summaries.remove(prop_key)
         else:
@@ -27,7 +27,7 @@ class PropertiesExtension(ABC):
     properties: Dict[str, Any]
     additional_read_properties: Optional[Iterable[Dict[str, Any]]] = None
 
-    def _get_property(self, prop_name: str, typ: Type[P] = Any) -> Optional[P]:
+    def _get_property(self, prop_name: str, typ: Type[P] = Type[Any]) -> Optional[P]:
         result: Optional[typ] = self.properties.get(prop_name)
         if result is not None:
             return result

pystac/extensions/datacube.py

@@ -194,7 +194,6 @@ def reference_system(self, v: Optional[Union[str, float, Dict[str, Any]]]) -> No
             self.properties[DIM_REF_SYS_PROP] = v
 
 
-
 class TemporalDimension(Dimension):
     @property
     def extent(self) -> Optional[List[Optional[str]]]:
@@ -324,6 +323,7 @@ def ext(obj: T) -> "DatacubeExtension[T]":
         else:
             raise ExtensionException(f"Datacube extension does not apply to type {type(obj)}")
 
+
 class CollectionDatacubeExtension(DatacubeExtension[ps.Collection]):
     def __init__(self, collection: ps.Collection):
         self.collection = collection
@@ -332,6 +332,7 @@ def __init__(self, collection: ps.Collection):
     def __repr__(self) -> str:
         return '<CollectionDatacubeExtension Item id={}>'.format(self.collection.id)
 
+
 class ItemDatacubeExtension(DatacubeExtension[ps.Item]):
     def __init__(self, item: ps.Item):
         self.item = item
@@ -340,6 +341,7 @@ def __init__(self, item: ps.Item):
     def __repr__(self) -> str:
         return '<ItemDatacubeExtension Item id={}>'.format(self.item.id)
 
+
 class AssetDatacubeExtension(DatacubeExtension[ps.Asset]):
     def __init__(self, asset: ps.Asset):
         self.asset_href = asset.href
@@ -350,9 +352,12 @@ def __init__(self, asset: ps.Asset):
     def __repr__(self) -> str:
         return '<AssetDatacubeExtension Item id={}>'.format(self.asset_href)
 
+
 class DatacubeExtensionHooks(ExtensionHooks):
     schema_uri: str = SCHEMA_URI
     prev_extension_ids: Set[str] = set(['datacube'])
-    stac_object_types: Set[ps.STACObjectType] = set([ps.STACObjectType.COLLECTION, ps.STACObjectType.ITEM])
+    stac_object_types: Set[ps.STACObjectType] = set(
+        [ps.STACObjectType.COLLECTION, ps.STACObjectType.ITEM])
+
 
-DATACUBE_EXTENSION_HOOKS = DatacubeExtensionHooks()
+DATACUBE_EXTENSION_HOOKS = DatacubeExtensionHooks()

pystac/extensions/hooks.py

@@ -42,7 +42,7 @@ def get_object_links(self, obj: "STACObject_Type") -> Optional[List[str]]:
         return None
 
     def migrate(self, obj: Dict[str, Any], version: STACVersionID,
-                      info: STACJSONDescription) -> None:
+                info: STACJSONDescription) -> None:
         """Migrate a STAC Object in dict format from a previous version.
         The base implementation will update the stac_extensions to the latest
         schema ID. This method will only be called for STAC objects that have been
@@ -60,6 +60,7 @@ def migrate(self, obj: Dict[str, Any], version: STACVersionID,
                     obj['stac_extensions'].append(self.schema_uri)
                 break
 
+
 class RegisteredExtensionHooks:
     def __init__(self, hooks: Iterable[ExtensionHooks]):
         self.hooks = dict([(e.schema_uri, e) for e in hooks])
@@ -88,7 +89,7 @@ def get_extended_object_links(self, obj: "STACObject_Type") -> List[str]:
         return result or []
 
     def migrate(self, obj: Dict[str, Any], version: STACVersionID,
-                    info: STACJSONDescription) -> None:
+                info: STACJSONDescription) -> None:
         for hooks in self.hooks.values():
             if info.object_type in hooks._get_stac_object_types():
                 hooks.migrate(obj, version, info)

pystac/extensions/item_assets.py

@@ -106,6 +106,7 @@ def get_schema_uri(cls) -> str:
     def ext(cls, collection: ps.Collection) -> "ItemAssetsExtension":
         return cls(collection)
 
+
 class ItemAssetsExtensionHooks(ExtensionHooks):
     schema_uri: str = SCHEMA_URI
     prev_extension_ids: Set[str] = set(['asset', 'item-assets'])
@@ -122,4 +123,5 @@ def migrate(self, obj: Dict[str, Any], version: STACVersionID,
 
         super().migrate(obj, version, info)
 
-ITEM_ASSETS_EXTENSION_HOOKS = ItemAssetsExtensionHooks()
+
+ITEM_ASSETS_EXTENSION_HOOKS = ItemAssetsExtensionHooks()

pystac/extensions/pointcloud.py

@@ -522,4 +522,5 @@ class PointcloudExtensionHooks(ExtensionHooks):
     prev_extension_ids: Set[str] = set(['pointcloud'])
     stac_object_types: Set[ps.STACObjectType] = set([ps.STACObjectType.ITEM])
 
-POINTCLOUD_EXTENSION_HOOKS = PointcloudExtensionHooks()
+
+POINTCLOUD_EXTENSION_HOOKS = PointcloudExtensionHooks()

pystac/extensions/projection.py

@@ -175,7 +175,6 @@ def bbox(self) -> Optional[List[float]]:
     def bbox(self, v: Optional[List[float]]) -> None:
         self._set_property(BBOX_PROP, v)
 
-
     @property
     def centroid(self) -> Optional[Dict[str, float]]:
         """Get or sets coordinates representing the centroid of the item in the asset data CRS.
@@ -248,6 +247,7 @@ def ext(obj: T) -> "ProjectionExtension[T]":
         else:
             raise ExtensionException(f"File extension does not apply to type {type(obj)}")
 
+
 class ItemProjectionExtension(ProjectionExtension[ps.Item]):
     def __init__(self, item: ps.Item):
         self.item = item
@@ -267,10 +267,11 @@ def __init__(self, asset: ps.Asset):
     def __repr__(self) -> str:
         return '<AssetProjectionExtension Asset href={}>'.format(self.asset_href)
 
+
 class ProjectionExtensionHooks(ExtensionHooks):
     schema_uri: str = SCHEMA_URI
     prev_extension_ids: Set[str] = set(['proj', 'projection'])
     stac_object_types: Set[ps.STACObjectType] = set([ps.STACObjectType.ITEM])
 
 
-PROJECTION_EXTENSION_HOOKS = ProjectionExtensionHooks()
+PROJECTION_EXTENSION_HOOKS = ProjectionExtensionHooks()

pystac/item.py

@@ -811,7 +811,7 @@ def to_dict(self, include_self_link: bool = True) -> Dict[str, Any]:
         if not include_self_link:
             links = [x for x in links if x.rel != 'self']
 
-        assets = {k: v.to_dict() for k, v in self.assets.items() }
+        assets = {k: v.to_dict() for k, v in self.assets.items()}
 
         if self.datetime is not None:
             self.properties['datetime'] = datetime_to_str(self.datetime)

pystac/serialization/identify.py

@@ -356,7 +356,6 @@ def identify_stac_object(json_dict: Dict[str, Any]) -> STACJSONDescription:
         # code translates the short name IDs used pre-1.0.0-RC1 to the
         # relevant extension schema uri identifier.
 
-
     if not version_range.is_single_version():
         # Final Checks
 

pystac/utils.py

@@ -232,11 +232,12 @@ def get_opt(option: Optional[T]) -> T:
         raise ValueError("Cannot get value from None")
     return option
 
+
 def get_required(option: Optional[T], obj: Union[str, Any], prop: str) -> T:
     """ Retrieves an optional value that comes from a required property.
     If the option is None, throws an RequiredPropertyError with
     the given obj and property
     """
     if option is None:
         raise RequiredPropertyMissing(obj, prop)
-    return option
+    return option

tests/__init__.py

@@ -1,6 +1,7 @@
 import logging
 import sys
 
+
 def setup_logging(level: int) -> None:
     for package in ["pystac", "tests"]:
         logger = logging.getLogger(package)
@@ -13,4 +14,5 @@ def setup_logging(level: int) -> None:
         ch.setFormatter(formatter)
         logger.addHandler(ch)
 
+
 setup_logging(logging.INFO)

tests/data-files/change_stac_version.py

@@ -11,6 +11,7 @@
 
 TARGET_VERSION = ps.get_stac_version()
 
+
 def migrate(path: str) -> None:
     try:
         with open(path) as f:
@@ -23,19 +24,16 @@ def migrate(path: str) -> None:
         cur_ver = stac_json['stac_version']
         #if not cur_ver == TARGET_VERSION:
         if True:
-            print('  - Migrating {} from {} to {}...'.format(
-                path, cur_ver, TARGET_VERSION))
+            print('  - Migrating {} from {} to {}...'.format(path, cur_ver, TARGET_VERSION))
             obj = ps.read_dict(stac_json, href=path)
             migrated = obj.to_dict(include_self_link=False)
             with open(path, 'w') as f:
-               json.dump(migrated, f, indent=2)
+                json.dump(migrated, f, indent=2)
 
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Process some integers.')
-    parser.add_argument('--file',
-                        metavar='FILE',
-                        help='Only migrate this specific file.')
+    parser.add_argument('--file', metavar='FILE', help='Only migrate this specific file.')
 
     args = parser.parse_args()
 
@@ -59,4 +57,4 @@ def migrate(path: str) -> None:
                 for fname in files:
                     if fname.endswith('.json'):
                         path = os.path.join(root, fname)
-                        migrate(path)
+                        migrate(path)

tests/extensions/test_custom.py

@@ -10,7 +10,6 @@
 from pystac.extensions.base import ExtensionManagementMixin, PropertiesExtension, SummariesExtension
 from pystac.extensions.hooks import ExtensionHooks
 
-
 T = TypeVar('T', ps.Catalog, ps.Collection, ps.Item, ps.Asset)
 
 SCHEMA_URI = "https://example.com/v2.0/custom-schema.json"
@@ -95,6 +94,7 @@ def __init__(self, asset: ps.Asset) -> None:
                 self.additional_read_properties = [asset.owner.extra_fields]
         super().__init__(None)
 
+
 class SummariesCustomExtension(SummariesExtension):
     @property
     def test_prop(self) -> Optional[RangeSummary[str]]:
@@ -114,7 +114,8 @@ class CustomExtensionHooks(ExtensionHooks):
     def get_object_links(self, obj: ps.STACObject) -> Optional[List[str]]:
         return [TEST_LINK_REL]
 
-    def migrate(self, obj: Dict[str, Any], version: STACVersionID, info: STACJSONDescription) -> None:
+    def migrate(self, obj: Dict[str, Any], version: STACVersionID,
+                info: STACJSONDescription) -> None:
         if version < "1.0.0-rc2" and info.object_type == ps.STACObjectType.ITEM:
             if 'test:old-prop-name' in obj['properties']:
                 obj['properties'][TEST_PROP] = obj['properties']['test:old-prop-name']
@@ -131,4 +132,4 @@ def tearDown(self) -> None:
     # TODO: Test custom extensions and extension hooks
 
     def test_migrates(self):
-        pass
+        pass

tests/extensions/test_file.py

@@ -39,7 +39,8 @@ def test_asset_checksum(self):
         asset = item.assets["thumbnail"]
 
         # Get
-        self.assertEqual("90e40210f52acd32b09769d3b1871b420789456c", FileExtension.ext(asset).checksum)
+        self.assertEqual("90e40210f52acd32b09769d3b1871b420789456c",
+                         FileExtension.ext(asset).checksum)
 
         # Set
         new_checksum = "90e40210163700a8a6501eccd00b6d3b44ddaed0"
@@ -80,4 +81,5 @@ def test_migrates_old_checksum(self):
 
         self.assertTrue(FileExtension.has_extension(item))
         self.assertEqual(
-            FileExtension.ext(item.assets['noises']).checksum, "90e40210a30d1711e81a4b11ef67b28744321659")
+            FileExtension.ext(item.assets['noises']).checksum,
+            "90e40210a30d1711e81a4b11ef67b28744321659")

tests/extensions/test_pointcloud.py

@@ -26,12 +26,13 @@ def test_apply(self):
         self.assertFalse(PointcloudExtension.has_extension(item))
 
         PointcloudExtension.add_to(item)
-        PointcloudExtension.ext(item).apply(1000, 'lidar', 'laszip',
-                                   [PointcloudSchema({
-                                       'name': 'X',
-                                       'size': 8,
-                                       'type': 'floating'
-                                   })])
+        PointcloudExtension.ext(item).apply(
+            1000, 'lidar', 'laszip',
+            [PointcloudSchema({
+                'name': 'X',
+                'size': 8,
+                'type': 'floating'
+            })])
         self.assertTrue(PointcloudExtension.has_extension(item))
 
     def test_validate_pointcloud(self):
@@ -57,8 +58,8 @@ def test_count(self):
         # Ensure setting bad count fails validation
 
         with self.assertRaises(ps.STACValidationError):
-           PointcloudExtension.ext(pc_item).count = 'not_an_int'  # type:ignore
-           pc_item.validate()
+            PointcloudExtension.ext(pc_item).count = 'not_an_int'  # type:ignore
+            pc_item.validate()
 
     def test_type(self):
         pc_item = ps.Item.from_file(self.example_uri)