Merge branch 'main' into 1.0

Author: duckontheweb

.github/workflows/continuous-integration.yml

@@ -44,7 +44,7 @@ jobs:
         # wheel.
         if: ${{ startsWith(matrix.python-version, '3.10')}}
         with:
-          toolchain: nightly
+          toolchain: nightly-2021-04-27
           override: true
           default: true
           profile: minimal
@@ -120,7 +120,7 @@ jobs:
         run: coverage xml --fail-under 0
 
       - name: Upload All coverage to Codecov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v2.0.2
         if: ${{ env.GITHUB_REPOSITORY }} == 'stac-utils/pystac'
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

CHANGELOG.md

@@ -483,7 +483,8 @@ use `Band.create`
 
 Initial release.
 
-[Unreleased]: <https://github.com/stac-utils/pystac/compare/v1.0.1..main>
+[Unreleased]: <https://github.com/stac-utils/pystac/compare/v1.1.0..main>
+[v1.1.0]: <https://github.com/stac-utils/pystac/compare/v1.0.1..v1.1.0>
 [v1.0.1]: <https://github.com/stac-utils/pystac/compare/v1.0.0..v1.0.1>
 [v1.0.0]: <https://github.com/stac-utils/pystac/compare/v1.0.0-rc.3..v1.0.0>
 [v1.0.0-rc.3]: <https://github.com/stac-utils/pystac/compare/v1.0.0-rc.2..v1.0.0-rc.3>

docs/api.rst

@@ -346,10 +346,10 @@ VerticalSpatialDimension
    :show-inheritance:
    :inherited-members:
 
-TemporalSpatialDimension
+TemporalDimension
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. autoclass:: pystac.extensions.datacube.TemporalSpatialDimension
+.. autoclass:: pystac.extensions.datacube.TemporalDimension
    :members:
    :show-inheritance:
    :inherited-members:

pystac/catalog.py

@@ -29,7 +29,7 @@
     identify_stac_object,
     migrate_to_latest,
 )
-from pystac.utils import is_absolute_href, make_absolute_href
+from pystac.utils import is_absolute_href, make_absolute_href, make_relative_href
 
 if TYPE_CHECKING:
     from pystac.item import Asset as Asset_Type, Item as Item_Type
@@ -705,16 +705,22 @@ def generate_subcatalogs(
 
         return result
 
-    def save(self, catalog_type: Optional[CatalogType] = None) -> None:
+    def save(
+        self,
+        catalog_type: Optional[CatalogType] = None,
+        dest_href: Optional[str] = None,
+    ) -> None:
         """Save this catalog and all it's children/item to files determined by the object's
-        self link HREF.
+        self link HREF or a specified path.
 
         Args:
             catalog_type : The catalog type that dictates the structure of
                 the catalog to save. Use a member of :class:`~pystac.CatalogType`.
                 If not supplied, the catalog_type of this catalog will be used.
                 If that attribute is not set, an exception will be raised.
-
+            dest_href : The location where the catalog is to be saved.
+                If not supplied, the catalog's self link HREF is used to determine
+                the location of the catalog file and children's files.
         Note:
             If the catalog type is ``CatalogType.ABSOLUTE_PUBLISHED``,
             all self links will be included, and hierarchical links be absolute URLs.
@@ -724,6 +730,7 @@ def save(self, catalog_type: Optional[CatalogType] = None) -> None:
             If the catalog  type is ``CatalogType.SELF_CONTAINED``, no self links will
             be included and hierarchical links will be relative URLs.
         """
+
         root = self.get_root()
         if root is None:
             raise Exception("There is no root catalog")
@@ -735,13 +742,27 @@ def save(self, catalog_type: Optional[CatalogType] = None) -> None:
 
         for child_link in self.get_child_links():
             if child_link.is_resolved():
-                cast(Catalog, child_link.target).save()
+                child = cast(Catalog, child_link.target)
+                if dest_href is not None:
+                    rel_href = make_relative_href(child.self_href, self.self_href)
+                    child_dest_href = make_absolute_href(
+                        rel_href, dest_href, start_is_dir=True
+                    )
+                    child.save(dest_href=child_dest_href)
+                else:
+                    child.save()
 
         for item_link in self.get_item_links():
             if item_link.is_resolved():
-                cast(pystac.Item, item_link.target).save_object(
-                    include_self_link=items_include_self_link
-                )
+                item = cast(pystac.Item, item_link.target)
+                if dest_href is not None:
+                    rel_href = make_relative_href(item.self_href, self.self_href)
+                    item_dest_href = make_absolute_href(
+                        rel_href, dest_href, start_is_dir=True
+                    )
+                    item.save_object(include_self_link=True, dest_href=item_dest_href)
+                else:
+                    item.save_object(include_self_link=items_include_self_link)
 
         include_self_link = False
         # include a self link if this is the root catalog
@@ -753,7 +774,15 @@ def save(self, catalog_type: Optional[CatalogType] = None) -> None:
             if root_link and root_link.get_absolute_href() == self.get_self_href():
                 include_self_link = True
 
-        self.save_object(include_self_link=include_self_link)
+        catalog_dest_href = None
+        if dest_href is not None:
+            rel_href = make_relative_href(self.self_href, self.self_href)
+            catalog_dest_href = make_absolute_href(
+                rel_href, dest_href, start_is_dir=True
+            )
+        self.save_object(
+            include_self_link=include_self_link, dest_href=catalog_dest_href
+        )
         if catalog_type is not None:
             self.catalog_type = catalog_type
 

pystac/py.typed

@@ -1,7 +1,7 @@
 import os
 from typing import Optional
 
-__version__ = "1.0.1"
+__version__ = "1.1.0"
 """Library version"""
 
 

pystac/version.py

@@ -1,5 +1,5 @@
 ipython==7.25.0
-Sphinx==4.1.1
+Sphinx==4.1.2
 sphinxcontrib-fulltoc==1.2.0
 nbsphinx==0.8.6
 

requirements-docs.txt

@@ -1,12 +1,12 @@
 mypy==0.910
 flake8==3.9.2
-black==21.6b0
+black==21.7b0
 
 codespell==2.1.0
 
 jsonschema==3.2.0
 coverage==5.5
-doc8==0.8.1
+doc8==0.9.0
 
 types-python-dateutil==0.1.4
 types-orjson==0.1.1

requirements-test.txt

@@ -20,8 +20,8 @@
     author_email="stac@radiant.earth",
     url="https://github.com/stac-utils/pystac",
     packages=find_packages(),
+    package_data={"": ["py.typed"]},
     py_modules=[splitext(basename(path))[0] for path in glob("pystac/*.py")],
-    include_package_data=False,
     python_requires=">=3.7",
     install_requires=[
         "python-dateutil>=2.7.0",

setup.py

@@ -318,6 +318,20 @@ def test_save_uses_previous_catalog_type(self) -> None:
             cat2 = pystac.Catalog.from_file(href)
             self.assertEqual(cat2.catalog_type, CatalogType.SELF_CONTAINED)
 
+    def test_save_to_provided_href(self) -> None:
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            catalog = TestCases.test_case_1()
+            href = "http://test.com"
+            folder = os.path.join(tmp_dir, "cat")
+            catalog.normalize_hrefs(href)
+            catalog.save(catalog_type=CatalogType.ABSOLUTE_PUBLISHED, dest_href=folder)
+
+            catalog_path = os.path.join(folder, "catalog.json")
+            self.assertTrue(os.path.exists(catalog_path))
+            result_cat = Catalog.from_file(catalog_path)
+            for link in result_cat.get_child_links():
+                self.assertTrue(cast(str, link.target).startswith(href))
+
     def test_clone_uses_previous_catalog_type(self) -> None:
         catalog = TestCases.test_case_1()
         assert catalog.catalog_type == CatalogType.SELF_CONTAINED