pyupgrade to 3.10

.pre-commit-config.yaml

@@ -3,11 +3,11 @@
 
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
+    rev: v3.17.0
     hooks:
       - id: pyupgrade
         args:
-          - "--py39-plus"
+          - "--py310-plus"
 
   - repo: local
     hooks:

CHANGELOG.md

@@ -4,7 +4,7 @@
 
 ### Added
 
-- Add netCDF to pystac.media_type ([#1386](https://github.com/stac-utils/pystac/pull/1386)) 
+- Add netCDF to pystac.media_type ([#1386](https://github.com/stac-utils/pystac/pull/1386))
 - Add convenience method for accessing pystac_client ([#1365](https://github.com/stac-utils/pystac/pull/1365))
 
 ### Changed
@@ -20,7 +20,7 @@
 
 ### Removed
 
-- Python 3.9 ([#1384](https://github.com/stac-utils/pystac/pull/1384))
+- Python 3.9 ([#1384](https://github.com/stac-utils/pystac/pull/1384), [#1388](https://github.com/stac-utils/pystac/pull/1388))
 
 ## [v1.10.1] - 2024-05-03
 

pyproject.toml

@@ -49,7 +49,7 @@ test = [
     "html5lib~=1.1",
     "jinja2<4.0",
     "jsonschema~=4.18",
-    "mypy~=1.2",
+    "mypy~=1.11",
     "orjson~=3.8",
     "pre-commit~=3.2",
     "pytest-cov~=5.0",
@@ -104,7 +104,7 @@ max-line-length = 88
 
 [tool.ruff]
 line-length = 88
-select = ["E", "F", "I"]
+lint.select = ["E", "F", "I"]
 
 [tool.pytest.ini_options]
 filterwarnings = ["error"]

pystac/__init__.py

@@ -2,6 +2,7 @@
 """
 PySTAC is a library for working with SpatioTemporal Asset Catalogs (STACs)
 """
+
 __all__ = [
     "__version__",
     "TemplateError",
@@ -44,7 +45,7 @@
 
 import os
 import warnings
-from typing import Any, Optional
+from typing import Any
 
 from pystac.errors import (
     TemplateError,
@@ -136,7 +137,7 @@
 )
 
 
-def read_file(href: HREF, stac_io: Optional[StacIO] = None) -> STACObject:
+def read_file(href: HREF, stac_io: StacIO | None = None) -> STACObject:
     """Reads a STAC object from a file.
 
     This method will return either a Catalog, a Collection, or an Item based on what
@@ -168,8 +169,8 @@ def read_file(href: HREF, stac_io: Optional[StacIO] = None) -> STACObject:
 def write_file(
     obj: STACObject,
     include_self_link: bool = True,
-    dest_href: Optional[HREF] = None,
-    stac_io: Optional[StacIO] = None,
+    dest_href: HREF | None = None,
+    stac_io: StacIO | None = None,
 ) -> None:
     """Writes a STACObject to a file.
 
@@ -202,9 +203,9 @@ def write_file(
 
 def read_dict(
     d: dict[str, Any],
-    href: Optional[str] = None,
-    root: Optional[Catalog] = None,
-    stac_io: Optional[StacIO] = None,
+    href: str | None = None,
+    root: Catalog | None = None,
+    stac_io: StacIO | None = None,
 ) -> STACObject:
     """Reads a :class:`~STACObject` or :class:`~ItemCollection` from a JSON-like dict
     representing a serialized STAC object.

pystac/catalog.py

@@ -2,13 +2,12 @@
 
 import os
 import warnings
-from collections.abc import Iterable, Iterator
+from collections.abc import Callable, Iterable, Iterator
 from copy import deepcopy
 from itertools import chain
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     TypeVar,
     Union,
     cast,

pystac/errors.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional, Union
+from typing import Any
 
 
 class TemplateError(Exception):
@@ -28,7 +28,7 @@ def __init__(
         self,
         bad_dict: dict[str, Any],
         expected: type,
-        extra_message: Optional[str] = "",
+        extra_message: str | None = "",
     ):
         """
         Construct an exception with an appropriate error message from bad_dict and the
@@ -88,9 +88,7 @@ class RequiredPropertyMissing(Exception):
         prop: The property that is missing
     """
 
-    def __init__(
-        self, obj: Union[str, Any], prop: str, msg: Optional[str] = None
-    ) -> None:
+    def __init__(self, obj: str | Any, prop: str, msg: str | None = None) -> None:
         msg = msg or f"{repr(obj)} does not have required property {prop}"
         super().__init__(msg)
 
@@ -109,7 +107,7 @@ class STACValidationError(Exception):
             the ``jsonschema.ValidationError``.
     """
 
-    def __init__(self, message: str, source: Optional[Any] = None):
+    def __init__(self, message: str, source: Any | None = None):
         super().__init__(message)
         self.source = source
 

pystac/extensions/mgrs.py

@@ -2,7 +2,7 @@
 
 import re
 from re import Pattern
-from typing import Any, Literal, Optional, Union
+from typing import Any, Literal, Union
 
 import pystac
 from pystac.extensions.base import ExtensionManagementMixin, PropertiesExtension
@@ -132,7 +132,7 @@ def validated_grid_square(v: str) -> str:
     return v
 
 
-def validated_utm_zone(v: Optional[int]) -> Optional[int]:
+def validated_utm_zone(v: int | None) -> int | None:
     if v is not None and not isinstance(v, int):
         raise ValueError("Invalid MGRS utm zone: must be None or int")
     if v is not None and v not in UTM_ZONES:
@@ -175,7 +175,7 @@ def apply(
         self,
         latitude_band: str,
         grid_square: str,
-        utm_zone: Optional[int] = None,
+        utm_zone: int | None = None,
     ) -> None:
         """Applies MGRS extension properties to the extended Item.
 
@@ -189,7 +189,7 @@ def apply(
         self.utm_zone = validated_utm_zone(utm_zone)
 
     @property
-    def latitude_band(self) -> Optional[str]:
+    def latitude_band(self) -> str | None:
         """Get or sets the latitude band of the datasource."""
         return self._get_property(LATITUDE_BAND_PROP, str)
 
@@ -200,7 +200,7 @@ def latitude_band(self, v: str) -> None:
         )
 
     @property
-    def grid_square(self) -> Optional[str]:
+    def grid_square(self) -> str | None:
         """Get or sets the latitude band of the datasource."""
         return self._get_property(GRID_SQUARE_PROP, str)
 
@@ -211,12 +211,12 @@ def grid_square(self, v: str) -> None:
         )
 
     @property
-    def utm_zone(self) -> Optional[int]:
+    def utm_zone(self) -> int | None:
         """Get or sets the latitude band of the datasource."""
         return self._get_property(UTM_ZONE_PROP, int)
 
     @utm_zone.setter
-    def utm_zone(self, v: Optional[int]) -> None:
+    def utm_zone(self, v: int | None) -> None:
         self._set_property(UTM_ZONE_PROP, validated_utm_zone(v), pop_if_none=True)
 
     @classmethod

pystac/extensions/version.py

@@ -429,7 +429,7 @@ def get_object_links(self, so: STACObject) -> list[str] | None:
 
 
 @contextmanager
-def ignore_deprecated() -> Generator[None, None, None]:
+def ignore_deprecated() -> Generator[None]:
     """Context manager for suppressing the :class:`pystac.DeprecatedWarning`
     when creating a deprecated :class:`~pystac.Item` or :class:`~pystac.Collection`
     from a dictionary."""

pystac/layout.py

@@ -5,8 +5,9 @@
 import warnings
 from abc import ABC, abstractmethod
 from collections import OrderedDict
+from collections.abc import Callable
 from string import Formatter
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
 
 import pystac
 from pystac.utils import is_file_path

pystac/provider.py

@@ -1,5 +1,5 @@
 from html import escape
-from typing import Any, Optional
+from typing import Any
 
 from pystac.html.jinja_env import get_jinja_env
 from pystac.utils import StringEnum
@@ -36,16 +36,16 @@ class Provider:
     name: str
     """The name of the organization or the individual."""
 
-    description: Optional[str]
+    description: str | None
     """Optional multi-line description to add further provider
     information such as processing details for processors and producers,
     hosting details for hosts or basic contact information."""
 
-    roles: Optional[list[ProviderRole]]
+    roles: list[ProviderRole] | None
     """Optional roles of the provider. Any of
     licensor, producer, processor or host."""
 
-    url: Optional[str]
+    url: str | None
     """Optional homepage on which the provider describes the dataset
     and publishes contact information."""
 
@@ -56,10 +56,10 @@ class Provider:
     def __init__(
         self,
         name: str,
-        description: Optional[str] = None,
-        roles: Optional[list[ProviderRole]] = None,
-        url: Optional[str] = None,
-        extra_fields: Optional[dict[str, Any]] = None,
+        description: str | None = None,
+        roles: list[ProviderRole] | None = None,
+        url: str | None = None,
+        extra_fields: dict[str, Any] | None = None,
     ):
         self.name = name
         self.description = description

pystac/serialization/common_properties.py

@@ -1,5 +1,5 @@
 from collections.abc import Iterable
-from typing import Any, Optional, Union, cast
+from typing import Any, cast
 
 import pystac
 from pystac.cache import CollectionCache
@@ -9,8 +9,8 @@
 
 def merge_common_properties(
     item_dict: dict[str, Any],
-    collection_cache: Optional[CollectionCache] = None,
-    json_href: Optional[str] = None,
+    collection_cache: CollectionCache | None = None,
+    json_href: str | None = None,
 ) -> bool:
     """Merges Collection properties into an Item.
 
@@ -29,8 +29,8 @@ def merge_common_properties(
     """
     properties_merged = False
 
-    collection: Optional[Union[pystac.Collection, dict[str, Any]]] = None
-    collection_href: Optional[str] = None
+    collection: pystac.Collection | dict[str, Any] | None = None
+    collection_href: str | None = None
 
     stac_version = item_dict.get("stac_version")
 
@@ -79,7 +79,7 @@ def merge_common_properties(
                     collection = pystac.StacIO.default().read_json(collection_href)
 
     if collection is not None:
-        collection_props: Optional[dict[str, Any]] = None
+        collection_props: dict[str, Any] | None = None
         if isinstance(collection, pystac.Collection):
             collection_id = collection.id
             collection_props = collection.extra_fields.get("properties")

pystac/serialization/migrate.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Callable
 from copy import deepcopy
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
 
 import pystac
 from pystac.serialization.identify import (

pystac/stac_io.py

@@ -4,7 +4,8 @@
 import logging
 import os
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, Any, Callable
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any
 from urllib.error import HTTPError
 from urllib.request import Request, urlopen
 

pystac/stac_object.py

@@ -1,12 +1,11 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from html import escape
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     TypeVar,
     cast,
 )

pystac/utils.py

@@ -3,11 +3,11 @@
 import os
 import posixpath
 import warnings
+from collections.abc import Callable
 from datetime import datetime, timezone
 from enum import Enum
 from typing import (
     Any,
-    Callable,
     TypeVar,
     Union,
     cast,