Merge branch 'main' into fix/network-request-during-test

Author: matthewhanson

CHANGELOG.md

@@ -6,11 +6,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-### Developer
+### Added
 
 - Adds `--block-network` option to all test commands to ensure no network requests are made during unit tests
   [#119](https://github.com/stac-utils/pystac-client/pull/119)
 
+### Fixed
+
+- `Client.get_collections` raised an exception when API did not publish `/collections` conformance class instead of falling back to using child links
+  [#120](https://github.com/stac-utils/pystac-client/pull/120)
+
 ## [0.3.0] - 2021-09-28
 
 ### Added

pystac_client/client.py

@@ -94,7 +94,7 @@ def get_collections(self) -> Iterable[CollectionClient]:
         Return:
             Iterable[CollectionClient]: Iterator through Collections in Catalog/API
         """
-        if self._stac_io.assert_conforms_to(ConformanceClasses.COLLECTIONS):
+        if self._stac_io.conforms_to(ConformanceClasses.COLLECTIONS):
             url = self.get_self_href() + '/collections'
             for page in self._stac_io.get_pages(url):
                 if 'collections' not in page:
@@ -111,7 +111,7 @@ def get_items(self) -> Iterable["Item_Type"]:
         Return:
             Iterable[Item]:: Generator of items whose parent is this catalog.
         """
-        if self._stac_io.assert_conforms_to(ConformanceClasses.ITEM_SEARCH):
+        if self._stac_io.conforms_to(ConformanceClasses.ITEM_SEARCH):
             search = self.search()
             yield from search.get_items()
         else:
@@ -126,7 +126,7 @@ def get_all_items(self) -> Iterable["Item_Type"]:
                 catalogs or collections connected to this catalog through
                 child links.
         """
-        if self._stac_io.assert_conforms_to(ConformanceClasses.ITEM_SEARCH):
+        if self._stac_io.conforms_to(ConformanceClasses.ITEM_SEARCH):
             yield from self.get_items()
         else:
             yield from super().get_items()

pystac_client/stac_api_io.py

@@ -210,21 +210,16 @@ def get_pages(self, url, method='GET', parameters={}) -> Iterator[Dict]:
             next_link = next((link for link in page.get('links', []) if link['rel'] == 'next'),
                              None)
 
-    def assert_conforms_to(self, conformance_class: ConformanceClasses):
-        """Whether the API conforms to the given standard. This method only checks against the ``"conformsTo"``
-        property from the API landing page and does not make any additional calls to a ``/conformance`` endpoint
-        even if the API provides such an endpoint.
+    def assert_conforms_to(self, conformance_class: ConformanceClasses) -> None:
+        """Raises a :exc:`NotImplementedError` if the API does not publish the given conformance class. This method
+        only checks against the ``"conformsTo"`` property from the API landing page and does not make any additional
+        calls to a ``/conformance`` endpoint even if the API provides such an endpoint.
 
         Args:
-            key: The ``ConformanceClasses`` key to check conformance against.
-
-        Return:
-            bool: Indicates if the API conforms to the given spec or URI.
+            conformance_class: The ``ConformanceClasses`` key to check conformance against.
         """
         if not self.conforms_to(conformance_class):
             raise NotImplementedError(f"{conformance_class} not supported")
-        else:
-            return True
 
     def conforms_to(self, conformance_class: ConformanceClasses) -> bool:
         """Whether the API conforms to the given standard. This method only checks against the ``"conformsTo"``

requirements-dev.txt

@@ -7,6 +7,7 @@ pytest-cov~=2.11.1
 pytest-recording~=0.11.0
 pytest-console-scripts~=1.1.0
 recommonmark~=0.7.1
+requests-mock~=1.9.3
 Sphinx~=3.5.1
 toml~=0.10.2
 yapf==0.30.*