Merge remote-tracking branch 'upstream/main'

# Conflicts:
#	CHANGELOG.md
#	pystac/extensions/mlm.py

Author: jonas-hurst

.github/workflows/continuous-integration.yml

@@ -32,7 +32,7 @@ jobs:
           - windows-latest
           - macos-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: astral-sh/setup-uv@v6
         with:
           python-version: ${{ matrix.python-version }}
@@ -55,7 +55,7 @@ jobs:
     name: coverage
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: astral-sh/setup-uv@v6
       - name: Install with dependencies
         run: uv sync --all-extras
@@ -84,7 +84,7 @@ jobs:
   without-orjson:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: astral-sh/setup-uv@v6
       - name: Sync
         run: uv sync
@@ -99,7 +99,7 @@ jobs:
     # appropriate for CI on Github actions.
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-python@v5
         with:
           python-version: "3.10"
@@ -116,7 +116,7 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: astral-sh/setup-uv@v6
       - name: Install pandoc
         run: sudo apt-get install pandoc

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
       id-token: write
     if: ${{ github.repository }} == 'stac-utils/pystac'
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up Python 3.x
         uses: actions/setup-python@v5
         with:

CHANGELOG.md

@@ -10,6 +10,10 @@
 
 ### Fixed
 
+- More permissive collection extent deserialization ([#1559](https://github.com/stac-utils/pystac/pull/1559))
+- Type of `proj:code` setter ([#1560](https://github.com/stac-utils/pystac/pull/1560))
+- Use `urllib3` to fix parsing non-ascii in urls ([#1566](https://github.com/stac-utils/pystac/pull/1566))
+- Some return types and other **mypy** nits ([#1569](https://github.com/stac-utils/pystac/pull/1569))
 - `extensions.mlm` various fixes [#1556](https://github.com/stac-utils/pystac/pull/1556)
   - Fixed ResizeType typos `interpolation-nearest` and `interpolation-linear` 
   - Fixed displaying the correct property in error message for `ResultStructure.data_type` 

README.md

@@ -35,7 +35,8 @@ python -m pip install 'pystac[orjson]'
 ```
 
 If you would like to use a custom `RetryStacIO` class for automatically retrying
-network requests when reading with PySTAC, you'll need
+network requests when reading with PySTAC, or if you have non-ASCII characters in
+your urls you'll need
 [`urllib3`](https://urllib3.readthedocs.io/en/stable/):
 
 ```shell

pyproject.toml

@@ -55,6 +55,7 @@ dev = [
     "types-python-dateutil>=2.9.0.20241003",
     "types-requests>=2.32.0.20250328",
     "types-urllib3>=1.26.25.14",
+    "urllib3>=2.3.0",
     "virtualenv>=20.26.6",
 ]
 docs = [

pystac/collection.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import warnings
-from collections.abc import Iterable
+from collections.abc import Iterable, Sequence
 from copy import deepcopy
 from datetime import datetime, timezone
 from typing import (
@@ -71,7 +71,7 @@ class SpatialExtent:
 
     def __init__(
         self,
-        bboxes: Bboxes | list[float | int],
+        bboxes: Bboxes | Sequence[float | int],
         extra_fields: dict[str, Any] | None = None,
     ) -> None:
         if not isinstance(bboxes, list):
@@ -199,7 +199,7 @@ class TemporalExtent:
 
     def __init__(
         self,
-        intervals: TemporalIntervals | list[datetime | None],
+        intervals: TemporalIntervals | Sequence[datetime | None],
         extra_fields: dict[str, Any] | None = None,
     ):
         if not isinstance(intervals, list):
@@ -652,7 +652,17 @@ def from_dict(
         id = d.pop("id")
         description = d.pop("description")
         license = d.pop("license")
-        extent = Extent.from_dict(d.pop("extent"))
+        if extent_dict := d.pop("extent", None):
+            extent = Extent.from_dict(extent_dict)
+        else:
+            warnings.warn(
+                "Collection is missing extent, setting default spatial and "
+                "temporal extents"
+            )
+            extent = Extent(
+                spatial=SpatialExtent([-90, -180, 90, 180]),
+                temporal=TemporalExtent([None, None]),
+            )
         title = d.pop("title", None)
         stac_extensions = d.pop("stac_extensions", None)
         keywords = d.pop("keywords", None)

pystac/extensions/classification.py

@@ -155,7 +155,7 @@ def value(self) -> int:
         Returns:
             int
         """
-        return get_required(self.properties.get("value"), self, "value")
+        return cast(int, get_required(self.properties.get("value"), self, "value"))
 
     @value.setter
     def value(self, v: int) -> None:
@@ -184,7 +184,7 @@ def name(self) -> str:
         Returns:
             Optional[str]
         """
-        return get_required(self.properties.get("name"), self, "name")
+        return cast(str, get_required(self.properties.get("name"), self, "name"))
 
     @name.setter
     def name(self, v: str) -> None:
@@ -200,7 +200,7 @@ def title(self) -> str | None:
         return self.properties.get("title")
 
     @title.setter
-    def title(self, v: str) -> None:
+    def title(self, v: str | None) -> None:
         if v is not None:
             self.properties["title"] = v
         else:
@@ -392,7 +392,7 @@ def offset(self) -> int:
         Returns:
             int
         """
-        return get_required(self.properties.get("offset"), self, "offset")
+        return cast(int, get_required(self.properties.get("offset"), self, "offset"))
 
     @offset.setter
     def offset(self, v: int) -> None:
@@ -405,7 +405,7 @@ def length(self) -> int:
         Returns:
             int
         """
-        return get_required(self.properties.get("length"), self, "length")
+        return cast(int, get_required(self.properties.get("length"), self, "length"))
 
     @length.setter
     def length(self, v: int) -> None:

pystac/extensions/datacube.py

@@ -88,8 +88,11 @@ def dim_type(self) -> DimensionType | str:
         <datacube#temporal-dimension-object>`. May be an arbitrary string for
         :stac-ext:`Additional Dimension Objects
         <datacube#additional-dimension-object>`."""
-        return get_required(
-            self.properties.get(DIM_TYPE_PROP), "cube:dimension", DIM_TYPE_PROP
+        return cast(
+            str,
+            get_required(
+                self.properties.get(DIM_TYPE_PROP), "cube:dimension", DIM_TYPE_PROP
+            ),
         )
 
     @dim_type.setter
@@ -198,8 +201,11 @@ class HorizontalSpatialDimension(SpatialDimension):
     @property
     def axis(self) -> HorizontalSpatialDimensionAxis:
         """Axis of the spatial dimension. Must be one of ``"x"`` or ``"y"``."""
-        return get_required(
-            self.properties.get(DIM_AXIS_PROP), "cube:dimension", DIM_AXIS_PROP
+        return cast(
+            HorizontalSpatialDimensionAxis,
+            get_required(
+                self.properties.get(DIM_AXIS_PROP), "cube:dimension", DIM_AXIS_PROP
+            ),
         )
 
     @axis.setter
@@ -211,8 +217,11 @@ class VerticalSpatialDimension(SpatialDimension):
     @property
     def axis(self) -> VerticalSpatialDimensionAxis:
         """Axis of the spatial dimension. Must be ``"z"``."""
-        return get_required(
-            self.properties.get(DIM_AXIS_PROP), "cube:dimension", DIM_AXIS_PROP
+        return cast(
+            VerticalSpatialDimensionAxis,
+            get_required(
+                self.properties.get(DIM_AXIS_PROP), "cube:dimension", DIM_AXIS_PROP
+            ),
         )
 
     @axis.setter
@@ -453,8 +462,11 @@ def dimensions(self, v: list[str]) -> None:
     @property
     def var_type(self) -> VariableType | str:
         """Type of the variable, either ``data`` or ``auxiliary``"""
-        return get_required(
-            self.properties.get(VAR_TYPE_PROP), "cube:variable", VAR_TYPE_PROP
+        return cast(
+            str,
+            get_required(
+                self.properties.get(VAR_TYPE_PROP), "cube:variable", VAR_TYPE_PROP
+            ),
         )
 
     @var_type.setter

pystac/extensions/eo.py

@@ -134,7 +134,7 @@ def name(self) -> str:
         Returns:
             str
         """
-        return get_required(self.properties.get("name"), self, "name")
+        return cast(str, get_required(self.properties.get("name"), self, "name"))
 
     @name.setter
     def name(self, v: str) -> None:

pystac/extensions/file.py

@@ -90,7 +90,7 @@ def values(self, v: list[Any]) -> None:
     @property
     def summary(self) -> str:
         """Gets or sets the short description of the value(s)."""
-        return get_required(self.properties.get("summary"), self, "summary")
+        return cast(str, get_required(self.properties.get("summary"), self, "summary"))
 
     @summary.setter
     def summary(self, v: str) -> None: