Merge branch 'main' into upgrade-github-actions-automatically

Author: Jon Duckworth

.github/dependabot.yml

@@ -6,3 +6,7 @@ updates:
       interval: daily
     commit-message:
       prefix: build(deps)
+  - package-ecosystem: pip
+    directory: /
+    schedule:
+      interval: daily

.github/workflows/continuous-integration.yml

@@ -7,15 +7,22 @@ on:
   pull_request:
 
 jobs:
-  build:
-    name: build
+  test:
+    name: test
     runs-on: ${{ matrix.os }}
     strategy:
       # Allow other matrix jobs to complete if 1 fails
       fail-fast: false
       matrix:
-        python-version: ["3.6", "3.7", "3.8"]
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        python-version:
+          - "3.6"
+          - "3.7"
+          - "3.8"
+        os:
+          - ubuntu-latest
+          - windows-latest
+          - macos-latest
+
     steps:
       - uses: actions/checkout@v2
 
@@ -24,15 +31,38 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Cache dependencies
+      - name: Cache dependencies (Linux)
+        if: startsWith(runner.os, 'Linux')
         uses: actions/cache@v2
         with:
           path: ~/.cache/pip
           # Cache based on OS, Python version, and dependency hash
-          key: pip-${{ runner.os }}-python${{ matrix.python-version }}-${{ hashFiles('requirements-dev.txt') }}
+          key: test-${{ runner.os }}-python${{ matrix.python-version }}-${{ hashFiles('requirements-test.txt') }}
+      
+      - name: Cache dependencies (macOS)
+        if: startsWith(runner.os, 'macOS')
+        uses: actions/cache@v2
+        with:
+          path: ~/Library/Caches/pip
+          # Cache based on OS, Python version, and dependency hash
+          key: test-${{ runner.os }}-python${{ matrix.python-version }}-${{ hashFiles('requirements-test.txt') }}
+          
+      - name: Cache dependencies (Windows)
+        if: startsWith(runner.os, 'Windows')
+        uses: actions/cache@v2
+        with:
+          path: ~\AppData\Local\pip\Cache
+          # Cache based on OS, Python version, and dependency hash
+          key: pip-${{ runner.os }}-python${{ matrix.python-version }}-${{ hashFiles('requirements-test.txt') }}
+      
+      - name: Install dependencies
+        run: |
+          pip install -r requirements-test.txt
+          pip install -e ".[validation]"
 
-      - name: Execute linters and test suites
-        run: ./scripts/cibuild
+      - name: Execute test suite
+        run: ./scripts/test
+        shell: bash
 
       - name: Upload All coverage to Codecov
         uses: codecov/codecov-action@v1
@@ -42,14 +72,50 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage.xml
           fail_ci_if_error: false 
-  vanilla:
+  lint:
     runs-on: ubuntu-latest
+    strategy:
+      # Allow other matrix jobs to complete if 1 fails
+      fail-fast: false
+      matrix:
+        python-version:
+          - "3.6"
+          - "3.7"
+          - "3.8"
+
     steps:
       - uses: actions/checkout@v2
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          # Cache based on OS, Python version, and dependency hash
+          key: lint-${{ runner.os }}-python${{ matrix.python-version }}-${{ hashFiles('requirements-test.txt') }}
+      
+      - name: Install dependencies
+        run: |
+          pip install -r requirements-test.txt
+
+      - name: Execute linters & type checkers
+        run: ./scripts/lint
+
+  vanilla:
+    runs-on: ubuntu-latest
+    steps:  
+      - uses: actions/checkout@v2
+      
       - uses: actions/setup-python@v2
         with:
           python-version: "3.8"
+
       - name: Install without orjson
         run: pip install '.[validation]'
+      
       - name: Run unittests
         run: python -m unittest discover tests

.gitignore

@@ -1,3 +1,4 @@
+tmp*
 *.pyc
 *.egg-info
 build/

CHANGELOG.md

@@ -4,12 +4,22 @@
 
 ### Added
 
+### Changed
+
+### Fixed
+
+### Removed
+
+## [1.0.0-beta.3]
+
+### Added
+
+- Summaries for View Geometry, Projection, and Scientific extensions ([#372](https://github.com/stac-utils/pystac/pull/372))
 - Raster extension support ([#364](https://github.com/stac-utils/pystac/issues/364))
 - solar_illumination field in eo extension ([#356](https://github.com/stac-utils/pystac/issues/356))
 - Added `Link.canonical` static method for creating links with "canonical" rel type ([#351](https://github.com/stac-utils/pystac/pull/351))
 - Added `RelType` enum containing common `rel` values ([#351](https://github.com/stac-utils/pystac/pull/351))
-
-### Changed
+- Added support for summaries ([#264](https://github.com/stac-utils/pystac/pull/264))
 
 ### Fixed
 
@@ -324,7 +334,8 @@ use `Band.create`
 
 Initial release.
 
-[Unreleased]: <https://github.com/stac-utils/pystac/compare/v1.0.0-beta.2..main>
+[Unreleased]: <https://github.com/stac-utils/pystac/compare/v1.0.0-beta.3..main>
+[v1.0.0-beta.3]: <https://github.com/stac-utils/pystac/compare/v1.0.0-beta.2..v1.0.0-beta.3>
 [v1.0.0-beta.2]: <https://github.com/stac-utils/pystac/compare/v1.0.0-beta.1..v1.0.0-beta.2>
 [v1.0.0-beta.1]: <https://github.com/stac-utils/pystac/compare/v0.5.6..v1.0.0-beta.1>
 [v0.5.6]: <https://github.com/stac-utils/pystac/compare/v0.5.5..v0.5.6>

README.md

@@ -2,7 +2,7 @@
 ![Build Status](https://github.com/stac-utils/pystac/workflows/CI/badge.svg?branch=develop)
 [![PyPI version](https://badge.fury.io/py/pystac.svg)](https://badge.fury.io/py/pystac)
 [![Documentation](https://readthedocs.org/projects/pystac/badge/?version=latest)](https://pystac.readthedocs.io/en/latest/)
-[![codecov](https://codecov.io/gh/stac-utils/pystac/branch/develop/graph/badge.svg)](https://codecov.io/gh/stac-utils/pystac)
+[![codecov](https://codecov.io/gh/stac-utils/pystac/branch/main/graph/badge.svg)](https://codecov.io/gh/stac-utils/pystac)
 [![Gitter chat](https://badges.gitter.im/azavea/pystac.svg)](https://gitter.im/azavea/pystac)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 

docs/api.rst

@@ -350,17 +350,63 @@ PointcloudItemExt
 Projection Extension
 --------------------
 
-Implements the `Projection Extension <https://github.com/radiantearth/stac-spec/tree/v1.0.0-beta.2/extensions/projection>`_.
+These classes are representations of the :stac-ext:`Projection Extension Spec
+<projection>`.
 
-ProjectionItemExt
-~~~~~~~~~~~~~~~~~
+ProjectionExtension
+~~~~~~~~~~~~~~~~~~~
 
-**TEMPORARILY REMOVED**
+.. autoclass:: pystac.extensions.projection.ProjectionExtension
+   :members:
+   :show-inheritance:
 
-.. .. autoclass:: pystac.extensions.projection.ProjectionItemExt
-..    :members:
-..    :undoc-members:
-..    :show-inheritance:
+ItemProjectionExtension
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. autoclass:: pystac.extensions.projection.ItemProjectionExtension
+   :members:
+   :show-inheritance:
+
+AssetProjectionExtension
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. autoclass:: pystac.extensions.projection.AssetProjectionExtension
+   :members:
+   :show-inheritance:
+
+Scientific Extension
+--------------------
+
+These classes are representations of the :stac-ext:`Scientific Extension Spec
+<scientific>`.
+
+Publication
+~~~~~~~~~~~
+
+.. autoclass:: pystac.extensions.scientific.Publication
+   :members:
+   :show-inheritance:
+
+ScientificExtension
+~~~~~~~~~~~~~~~~~~~
+
+.. autoclass:: pystac.extensions.scientific.ScientificExtension
+   :members:
+   :show-inheritance:
+
+CollectionScientificExtension
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. autoclass:: pystac.extensions.scientific.CollectionScientificExtension
+   :members:
+   :show-inheritance:
+
+ItemScientificExtension
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. autoclass:: pystac.extensions.scientific.ItemScientificExtension
+   :members:
+   :show-inheritance:
 
 Timestamps Extension
 --------------------
@@ -462,17 +508,29 @@ VersionItemExt
 View Geometry Extension
 -----------------------
 
-Implements the :stac-ext:`View Geometry Extension <view>`.
+These classes are representations of the :stac-ext:`View Geometry Extension Spec
+<view>`.
 
-ViewItemExt
-~~~~~~~~~~~
+ViewExtension
+~~~~~~~~~~~~~
 
-**TEMPORARILY REMOVED**
+.. autoclass:: pystac.extensions.view.ViewExtension
+   :members:
+   :show-inheritance:
 
-.. .. autoclass:: pystac.extensions.view.ViewItemExt
-..    :members:
-..    :undoc-members:
-..    :show-inheritance:
+ItemViewExtension
+~~~~~~~~~~~~~~~~~
+
+.. autoclass:: pystac.extensions.view.ItemViewExtension
+   :members:
+   :show-inheritance:
+
+AssetViewExtension
+~~~~~~~~~~~~~~~~~~
+
+.. autoclass:: pystac.extensions.view.AssetViewExtension
+   :members:
+   :show-inheritance:
 
 Serialization
 -------------

mypy.ini

@@ -1,4 +1,9 @@
 [mypy]
+disallow_any_generics = True
 disallow_untyped_defs = True
 ignore_missing_imports = True
+no_implicit_optional = True
 show_error_codes = True
+warn_redundant_casts = True
+warn_return_any = True
+warn_unused_ignores = True

pystac/__init__.py

@@ -4,36 +4,36 @@
 
 # flake8: noqa
 from pystac.errors import (
-    STACError,  # type:ignore
-    STACTypeError,  # type:ignore
-    ExtensionAlreadyExistsError,  # type:ignore
-    ExtensionTypeError,  # type:ignore
-    RequiredPropertyMissing,  # type:ignore
-    STACValidationError,  #  type:ignore
+    STACError,
+    STACTypeError,
+    ExtensionAlreadyExistsError,
+    ExtensionTypeError,
+    RequiredPropertyMissing,
+    STACValidationError,
 )
 
 from typing import Any, Dict, Optional
 from pystac.version import (
     __version__,
-    get_stac_version,  # type:ignore
-    set_stac_version,  # type:ignore
+    get_stac_version,
+    set_stac_version,
 )
-from pystac.media_type import MediaType  # type:ignore
-from pystac.rel_type import RelType  # type: ignore
-from pystac.stac_io import StacIO  # type:ignore
-from pystac.stac_object import STACObject, STACObjectType  # type:ignore
-from pystac.link import Link, HIERARCHICAL_LINKS  # type:ignore
-from pystac.catalog import Catalog, CatalogType  # type:ignore
+from pystac.media_type import MediaType
+from pystac.rel_type import RelType
+from pystac.stac_io import StacIO
+from pystac.stac_object import STACObject, STACObjectType
+from pystac.link import Link, HIERARCHICAL_LINKS
+from pystac.catalog import Catalog, CatalogType
 from pystac.collection import (
-    Collection,  # type:ignore
-    Extent,  # type:ignore
-    SpatialExtent,  # type:ignore
-    TemporalExtent,  # type:ignore
-    Provider,  # type:ignore
-    Summaries,  # type:ignore
-    RangeSummary,  # type:ignore
+    Collection,
+    Extent,
+    SpatialExtent,
+    TemporalExtent,
+    Provider,
+    Summaries,
 )
-from pystac.item import Item, Asset, CommonMetadata  # type:ignore
+from pystac.summaries import RangeSummary
+from pystac.item import Item, Asset, CommonMetadata
 
 import pystac.validation
 

pystac/catalog.py

@@ -798,7 +798,7 @@ def map_items(
             to the item_mapper function.
         """
 
-        new_cat = cast(Catalog, self.full_copy())
+        new_cat = self.full_copy()
 
         def process_catalog(catalog: Catalog) -> None:
             for child in catalog.get_children():