Merge pull request #455 from duckontheweb/issues_333_334

Fix 1.0.0-rc.1 extensions and 1.0.0-beta.1 schema links

Author: Jon Duckworth

.gitignore

@@ -156,4 +156,4 @@ dmypy.json
 .pytype/
 
 # Cython debug symbols
-cython_debug/
+cython_debug/

CHANGELOG.md

@@ -33,6 +33,9 @@
   ([#402](https://github.com/stac-utils/pystac/pull/402))
 - `ExtensionManagementMixin.add_to` is now idempotent (only adds schema URI to
   `stac_extensions` once per `Item` regardless of the number of calls) ([#419](https://github.com/stac-utils/pystac/pull/419))
+- Version check for when extensions changed from short links to schema URIs
+  ([#455](https://github.com/stac-utils/pystac/pull/455))
+- Schema URI base for STAC 1.0.0-beta.1 ([#455](https://github.com/stac-utils/pystac/pull/455))
 
 ### Removed
 

pystac/validation/__init__.py

@@ -85,9 +85,9 @@ def validate_dict(
 
     stac_version_id = STACVersionID(stac_version)
 
-    # If the version is before 1.0.0-rc.1, substitute extension short IDs for
+    # If the version is before 1.0.0-rc.2, substitute extension short IDs for
     # their schemas.
-    if stac_version_id < "1.0.0-rc.1":
+    if stac_version_id < "1.0.0-rc.2":
 
         def _get_uri(ext: str) -> Optional[str]:
             return OldExtensionSchemaUriMap.get_extension_schema_uri(

pystac/validation/schema_uri_map.py

@@ -45,11 +45,11 @@ class DefaultSchemaUriMap(SchemaUriMap):
     # the schema.
     BASE_URIS: List[Tuple[STACVersionRange, Callable[[str], str]]] = [
         (
-            STACVersionRange(min_version="1.0.0-beta.1"),
+            STACVersionRange(min_version="1.0.0-beta.2"),
             lambda version: "https://schemas.stacspec.org/v{}".format(version),
         ),
         (
-            STACVersionRange(min_version="0.8.0", max_version="0.9.0"),
+            STACVersionRange(min_version="0.8.0", max_version="1.0.0-beta.1"),
             lambda version: (
                 f"https://raw.githubusercontent.com/radiantearth/stac-spec/v{version}"
             ),
@@ -96,7 +96,6 @@ def get_object_schema_uri(
 
         if object_type not in self.DEFAULT_SCHEMA_MAP:
             raise KeyError("Unknown STAC object type {}".format(object_type))
-
         uri = self.DEFAULT_SCHEMA_MAP[object_type][0]
         if not is_latest:
             if self.DEFAULT_SCHEMA_MAP[object_type][1]:
@@ -127,11 +126,11 @@ def get_base_uris(
     ) -> List[Tuple[STACVersionRange, Callable[[STACVersionID], str]]]:
         return [
             (
-                STACVersionRange(min_version="1.0.0-beta.1"),
+                STACVersionRange(min_version="1.0.0-beta.2"),
                 lambda version: f"https://schemas.stacspec.org/v{version}",
             ),
             (
-                STACVersionRange(min_version="0.8.0", max_version="0.9.0"),
+                STACVersionRange(min_version="0.8.0", max_version="1.0.0-beta.1"),
                 lambda version: (
                     "https://raw.githubusercontent.com/"
                     f"radiantearth/stac-spec/v{version}"

tests/data-files/examples/1.0.0-RC1/README.md

@@ -1,7 +1,7 @@
 {
   "id": "examples",
   "type": "Catalog",
-  "stac_version": "1.0.0-beta.2",
+  "stac_version": "1.0.0-rc.1",
   "description": "This catalog is a simple demonstration of an example catalog that is used to organize a hierarchy of collections and their items.",
   "links": [
     {

tests/data-files/examples/1.0.0-RC1/catalog.json

@@ -1,6 +1,6 @@
 {
   "type": "Collection",
-  "stac_version": "1.0.0-beta.2",
+  "stac_version": "1.0.0-rc.1",
   "stac_extensions": [],
   "id": "sentinel-2",
   "title": "Sentinel-2 MSI: MultiSpectral Instrument, Level-1C",

tests/data-files/examples/1.0.0-RC1/collection-only/collection.json

@@ -1,7 +1,7 @@
 {
   "id": "simple-collection",
   "type": "Collection",
-  "stac_version": "1.0.0-beta.2",
+  "stac_version": "1.0.0-rc.1",
   "description": "A simple collection demonstrating core catalog fields with links to a couple of items",
   "title": "Simple Example Collection",
   "providers": [

tests/data-files/examples/1.0.0-RC1/collection.json

@@ -1,5 +1,5 @@
 {
-  "stac_version": "1.0.0-beta.2",
+  "stac_version": "1.0.0-rc.1",
   "stac_extensions": [
     "eo",
     "view"

tests/data-files/examples/1.0.0-RC1/collectionless-item.json

@@ -1,5 +1,5 @@
 {
-  "stac_version": "1.0.0-beta.2",
+  "stac_version": "1.0.0-rc.1",
   "stac_extensions": [],
   "type": "Feature",
   "id": "20201211_223832_CS2",

tests/data-files/examples/1.0.0-RC1/core-item.json

@@ -1,5 +1,5 @@
 {
-  "stac_version": "1.0.0-beta.2",
+  "stac_version": "1.0.0-rc.1",
   "stac_extensions": [
     "eo",
     "projection",

tests/data-files/examples/1.0.0-RC1/extended-item.json

@@ -1,7 +1,7 @@
 {
   "id": "extensions-collection",
   "type": "Collection",
-  "stac_version": "1.0.0-beta.2",
+  "stac_version": "1.0.0-rc.1",
   "description": "A heterogenous collection containing deeper examples of various extensions",
   "links": [
     {

tests/data-files/examples/1.0.0-RC1/extensions-collection/collection.json

@@ -1,6 +1,6 @@
 {
   "type": "Feature",
-  "stac_version": "1.0.0-beta.2",
+  "stac_version": "1.0.0-rc.1",
   "id": "proj-example",
   "properties": {
     "datetime": "2018-10-01T01:08:32.033000Z",

tests/data-files/examples/1.0.0-RC1/extensions-collection/proj-example/proj-example.json

@@ -1,5 +1,5 @@
 {
-  "stac_version": "1.0.0-beta.2",
+  "stac_version": "1.0.0-rc.1",
   "stac_extensions": [],
   "type": "Feature",
   "id": "20201211_223832_CS2",