Merge branch 'main' into patch-1

Author: lossyrob

.flake8

@@ -1,14 +1,3 @@
 [flake8]
-max-line-length = 100
-
-## IGNORES
-
-# E126: yapf conflicts with "continuation line over-indented for hanging indent"
-
-# E127: flake8 reporting incorrect continuation line indent errors
-# on multi-line and multi-level indents
-
-# W503: flake8 reports this as incorrect, and scripts/format_code
-# changes code to it, so let format_code win.
-
-ignore = E126,E127,W503
+max-line-length = 88
+extend-ignore = E203, W503, E731, E722

.github/workflows/continuous-integration.yml

@@ -3,17 +3,19 @@ name: CI
 on:
   push:
     branches:
-      - develop
-      - master
+      - main
   pull_request:
 
 jobs:
   build:
     name: build
-    runs-on: ubuntu-latest
+    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]
     steps:
       - uses: actions/checkout@v2
 
@@ -26,16 +28,28 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.cache/pip
-          key: pip-${{ hashFiles('requirements-dev.txt') }}
-          restore-keys: pip-
+          # Cache based on OS, Python version, and dependency hash
+          key: pip-${{ runner.os }}-python${{ matrix.python-version }}-${{ hashFiles('requirements-dev.txt') }}
 
       - name: Execute linters and test suites
         run: ./scripts/cibuild
-
-
+      
       - name: Upload All coverage to Codecov
         uses: codecov/codecov-action@v1
+        # Only upload this once...
+        if: ${{ matrix.os == 'ubuntu-latest' && matrix.python-version == '3.8'}}
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage.xml
           fail_ci_if_error: false 
+  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

.style.yapf

@@ -1,15 +1,43 @@
 # Changelog
 
-## unreleased
+## [Unreleased]
 
 ### Added
 
+### Changed
+
 ### Fixed
 
+- Reading json without orjson ([#348](https://github.com/stac-utils/pystac/pull/348))
+
+### Remove
+
+## [1.0.0-beta.1]
+
+### Added
+
+- Added type annotations across the library ([#309](https://github.com/stac-utils/pystac/pull/309))
+- Added assets to collections ([#309](https://github.com/stac-utils/pystac/pull/309))
+- `item_assets` extension ([#309](https://github.com/stac-utils/pystac/pull/309))
+- `datacube` extension ([#309](https://github.com/stac-utils/pystac/pull/309))
+- Added specific errors: `ExtensionAlreadyExistsError`, `ExtensionTypeError`, and `RequiredPropertyMissing`; moved custom exceptions to `pystac.errors` ([#309](https://github.com/stac-utils/pystac/pull/309))
+
+### Fixed
+
+- Validation checks in a few tests ([#346](https://github.com/stac-utils/pystac/pull/346))
+
 ### Changed
 
+- API change: The extension API changed significantly. See ([#309](https://github.com/stac-utils/pystac/pull/309)) for more details.
+- API change: Refactored the global STAC_IO object to an instance-specific `StacIO` implementation. STAC_IO is deprecated and will be removed next release. ([#309](https://github.com/stac-utils/pystac/pull/309))
+- Asset.get_absolute_href returns None if no absolute href can be inferred (previously the relative href that was passed in was returned) ([#309](https://github.com/stac-utils/pystac/pull/309))
+
 ### Removed
 
+- Removed `properties` from Collections ([#309](https://github.com/stac-utils/pystac/pull/309))
+- Removed `LinkMixin`, and implemented those methods on `STACObject` directly. STACObject was the only class using LinkMixin and this should not effect users ([#309](https://github.com/stac-utils/pystac/pull/309)
+- Removed `single-file-stac` extension; this extension is being removed in favor of ItemCollection usage ([#309](https://github.com/stac-utils/pystac/pull/309)
+
 ## [v0.5.6]
 
 ### Added
@@ -271,18 +299,19 @@ use `Band.create`
 
 Initial release.
 
-[Unreleased]: <https://github.com/stac-utils/pystac/compare/v0.5.6...main>
+[Unreleased]: <https://github.com/stac-utils/pystac/compare/v1.0.0-beta.1..main>
+[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>
 [v0.5.5]: <https://github.com/stac-utils/pystac/compare/v0.5.4..v0.5.5>
 [v0.5.4]: <https://github.com/stac-utils/pystac/compare/v0.5.3..v0.5.4>
-[v0.5.3]: <https://github.com/stac-utils/pystac/compare/v0.5.2...v0.5.3>
-[v0.5.2]: <https://github.com/stac-utils/pystac/compare/v0.5.1...v0.5.2>
-[v0.5.1]: <https://github.com/stac-utils/pystac/compare/v0.5.0...v0.5.1>
-[v0.5.0]: <https://github.com/stac-utils/pystac/compare/v0.4.0...v0.5.0>
-[v0.4.0]: <https://github.com/stac-utils/pystac/compare/v0.3.4...v0.4.0>
-[v0.3.4]: <https://github.com/stac-utils/pystac/compare/v0.3.3...v0.3.4>
-[v0.3.3]: <https://github.com/stac-utils/pystac/compare/v0.3.2...v0.3.3>
-[v0.3.2]: <https://github.com/stac-utils/pystac/compare/v0.3.1...v0.3.2>
-[v0.3.1]: <https://github.com/stac-utils/pystac/compare/v0.3.0...v0.3.1>
+[v0.5.3]: <https://github.com/stac-utils/pystac/compare/v0.5.2..v0.5.3>
+[v0.5.2]: <https://github.com/stac-utils/pystac/compare/v0.5.1..v0.5.2>
+[v0.5.1]: <https://github.com/stac-utils/pystac/compare/v0.5.0..v0.5.1>
+[v0.5.0]: <https://github.com/stac-utils/pystac/compare/v0.4.0..v0.5.0>
+[v0.4.0]: <https://github.com/stac-utils/pystac/compare/v0.3.4..v0.4.0>
+[v0.3.4]: <https://github.com/stac-utils/pystac/compare/v0.3.3..v0.3.4>
+[v0.3.3]: <https://github.com/stac-utils/pystac/compare/v0.3.2..v0.3.3>
+[v0.3.2]: <https://github.com/stac-utils/pystac/compare/v0.3.1..v0.3.2>
+[v0.3.1]: <https://github.com/stac-utils/pystac/compare/v0.3.0..v0.3.1>
 [v0.3.0]: <https://github.com/stac-utils/pystac/tree/v0.3.0>
 

CHANGELOG.md

@@ -1,15 +1,13 @@
-This software is licensed under the Apache 2 license, quoted below.
+Copyright 2019, 2020, 2021 the authors
 
-Copyright 2020 Azavea [http://www.azavea.com]
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
-
-    [http://www.apache.org/licenses/LICENSE-2.0]
+    http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations under
-the License.
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

LICENSE

@@ -44,7 +44,8 @@ The table below shows the corresponding versions between pystac and STAC:
 
 | pystac | STAC  |
 | ------ | ----- |
-| 0.5.x  | 1.0.x |
+| 1.x    | 1.0.x |
+| 0.5.x  | 1.0.0-beta.* |
 | 0.4.x  | 0.9.x |
 | 0.3.x  | 0.8.x |
 
@@ -114,6 +115,14 @@ To build and develop the documentation locally, make sure sphinx is available (w
 > make livehtml
 ```
 
+> Note: You will see some warnings along the lines of
+> ```
+> WARNING: duplicate object description of pystac.Collection.id,
+> other instance in api, use :noindex: for one of them
+> ```
+> for some of the
+> classes. This is expected due to [sphinx-doc/sphinx#8664](https://github.com/sphinx-doc/sphinx/issues/8664).
+
 Use 'make' without arguments to see a list of available commands.
 
 __Note__: `nbsphinx` requires that a local `pystac` is installed; use `pip install -e .`.