Add migration for pydantic 2.0

stac-utils · Jul 8, 2021 · c5257aa · c5257aa
1 parent 33a662f
commit c5257aa
Show file tree

Hide file tree

Showing 13 changed files with 223 additions and 191 deletions.
diff --git a/scripts/ingest_joplin.py b/scripts/ingest_joplin.py
@@ -4,6 +4,8 @@
 from pathlib import Path
 from urllib.parse import urljoin
 
+from stac_pydantic import Collection
+
 import requests
 
 workingdir = Path(__file__).parent.absolute()

diff --git a/stac_fastapi/pgstac/stac_fastapi/pgstac/models/links.py b/stac_fastapi/pgstac/stac_fastapi/pgstac/models/links.py
@@ -4,8 +4,7 @@
 from urllib.parse import ParseResult, parse_qs, unquote, urlencode, urljoin, urlparse
 
 import attr
-from stac_pydantic.api.extensions.paging import PaginationLink
-from stac_pydantic.links import Link, Relations
+from stac_pydantic.links import Link, Relations, PaginationLink
 from stac_pydantic.shared import MimeTypes
 from starlette.requests import Request
 

diff --git a/stac_fastapi/pgstac/tests/data/joplin/collection.json b/stac_fastapi/pgstac/tests/data/joplin/collection.json
@@ -1,9 +1,10 @@
 {
     "id": "joplin",
     "description": "This imagery was acquired by the NOAA Remote Sensing Division to support NOAA national security and emergency response requirements. In addition, it will be used for ongoing research efforts for testing and developing standards for airborne digital imagery. Individual images have been combined into a larger mosaic and tiled for distribution. The approximate ground sample distance (GSD) for each pixel is 35 cm (1.14 feet).",
-    "stac_version": "1.0.0-beta.2",
+    "stac_version": "1.0.0",
     "license": "public-domain",
     "links": [],
+    "type": "collection",
     "extent": {
         "spatial": {
             "bbox": [