Merge pull request #2504 from pjonsson/require-py-312

pyproject: require Python 3.12

Author: SpacemanPaul

.pre-commit-config.yaml

@@ -36,10 +36,6 @@ repos:
       rev: v2.4.2
       hooks:
       - id: codespell
-        # Add tomli as a dependency for Python 3.10 to read config from pyproject.toml
-        # This can be removed when we no longer support 3.10
-        additional_dependencies:
-          - tomli
         files: ^.*\.py$
     - repo: https://github.com/Lucas-C/pre-commit-hooks
       rev: v1.5.6

datacube/api/core.py

@@ -11,7 +11,7 @@
 import warnings
 from collections.abc import Mapping
 from itertools import groupby
-from typing import Any, Literal, TypeAlias, cast
+from typing import Any, Literal, TypeAlias, cast, override
 
 import deprecat
 import numpy
@@ -21,7 +21,6 @@
 from odc.geo.geobox import GeoBox, GeoboxTiles
 from odc.geo.geom import bbox_union, box, intersects
 from odc.geo.xr import xr_coords
-from typing_extensions import override
 from xarray.core.coordinates import DataArrayCoordinates
 
 from datacube.cfg import ODCConfig

datacube/api/grid_workflow.py

@@ -6,12 +6,11 @@
 
 import logging
 from collections import OrderedDict
-from typing import Literal
+from typing import Literal, override
 
 import pandas as pd
 import xarray as xr
 from odc.geo.geom import intersects
-from typing_extensions import override
 
 from datacube.utils import DatacubeException
 

datacube/api/query.py

@@ -13,14 +13,13 @@
 import logging
 import math
 import warnings
-from typing import Any, Literal
+from typing import Any, Literal, override
 
 import numpy as np
 import pandas
 from odc.geo import Geometry
 from odc.geo.geom import lonlat_bounds, mid_longitude
 from pandas import to_datetime as pandas_to_datetime
-from typing_extensions import override
 
 from ..index import extract_geom_from_query, strip_all_spatial_fields_from_query
 from ..model import Range
@@ -304,7 +303,7 @@ def _values_to_search(**kwargs) -> dict:
     return search
 
 
-def _time_to_search_dims(time_range) -> Range:
+def _time_to_search_dims(time_range) -> Range | datetime.datetime:
     with warnings.catch_warnings():
         warnings.simplefilter("ignore", UserWarning)
         tr_start, tr_end = time_range, time_range
@@ -372,7 +371,7 @@ def solar_day(dataset: Dataset, longitude: float | None = None) -> np.datetime64
         raise ValueError(
             f"Cannot compute solar_day: dataset '{dataset.id}' is missing center time"
         )
-    utc = dataset.center_time.astimezone(datetime.timezone.utc)
+    utc = dataset.center_time.astimezone(datetime.UTC)
 
     if longitude is None:
         _lon = _ds_mid_longitude(dataset)

datacube/cfg/opt.py

@@ -6,11 +6,9 @@
 
 import os
 import warnings
-from typing import Any
+from typing import Any, override
 from urllib.parse import quote_plus, urlparse
 
-from typing_extensions import override
-
 from ..migration import ODC2DeprecationWarning
 from .exceptions import ConfigException
 from .utils import check_valid_option

datacube/drivers/common_psql/_perms.py

@@ -8,10 +8,10 @@
 import logging
 from abc import ABCMeta, abstractmethod
 from enum import Enum, EnumMeta
+from typing import Self
 
 from sqlalchemy import text
 from sqlalchemy.exc import ProgrammingError
-from typing_extensions import Self
 
 from ._utils import escape_pg_identifier
 

datacube/drivers/netcdf/writer.py

@@ -11,7 +11,7 @@
 import logging
 import numbers
 from collections import namedtuple
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from typing import Any
 
 import numpy
@@ -32,7 +32,6 @@
     import numpy as np
     from xarray import DataArray
 
-UTC: timezone = timezone.utc
 
 Variable = namedtuple("Variable", ("dtype", "nodata", "dims", "units"))
 _LOG: logging.Logger = logging.getLogger(__name__)

datacube/drivers/postgis/_api.py

@@ -16,7 +16,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any
+from typing import Any, override
 from typing import cast as type_cast
 
 from odc.geo import CRS, Geometry
@@ -35,7 +35,6 @@
 from sqlalchemy.dialects.postgresql import INTERVAL, insert
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm import Session
-from typing_extensions import override
 
 from datacube.drivers.common_psql import (
     catch_generator_timeout,

datacube/drivers/postgis/_connections.py

@@ -18,11 +18,10 @@
 import logging
 import re
 from contextlib import contextmanager
-from typing import Any
+from typing import Any, override
 
 from odc.geo import CRS
 from sqlalchemy import create_engine, event
-from typing_extensions import override
 
 import datacube
 from datacube.drivers.common_psql import catch_timeout

datacube/drivers/postgis/_core.py

@@ -10,13 +10,13 @@
 
 import logging
 import os
+from typing import Self, override
 
 from alembic import command, config
 from alembic.migration import MigrationContext
 from alembic.runtime.environment import EnvironmentContext
 from alembic.script import ScriptDirectory
 from sqlalchemy import MetaData, text
-from typing_extensions import Self, override
 
 from datacube.drivers.common_psql import (
     UserRoleBase,