Require Python 3.12

Sphinx and various other packages
have started dropping support
for Python 3.10, so require
Python 3.12 and upgrade the source
code to use Python 3.12 features
where possible.

The most noticeable change for OWS
is that the override decorator is
part of typing, and the UTC alias
declared in datetime.

Author: pjonsson

.github/workflows/lint.yml

@@ -34,7 +34,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10"]
+        python-version: ["3.12"]
         lintcommand:
           - "pylint -j 2 datacube_ows --disable=C,R,W,E1136"
           - "ruff check --output-format=github"

datacube_ows/config_utils.py

@@ -11,15 +11,14 @@
 from collections.abc import Callable, Iterable, Sequence
 from importlib import import_module
 from itertools import chain
-from typing import Any, Optional, TypeAlias, cast
+from typing import Any, Optional, TypeAlias, cast, override
 from urllib.parse import urlparse
 
 import fsspec
 from babel.messages import Catalog, Message
 from datacube.model import Product
 from datacube.utils.masking import make_mask
 from flask_babel import gettext as _
-from typing_extensions import override
 from xarray import DataArray
 
 from datacube_ows.config_toolkit import deepinherit

datacube_ows/index/postgis/api.py

@@ -7,7 +7,7 @@
 import datetime
 from collections.abc import Iterable
 from threading import Lock
-from typing import Any, Literal
+from typing import Any, Literal, override
 from uuid import UUID
 
 import click
@@ -16,7 +16,6 @@
 from datacube.model import Dataset, Product, Range
 from odc.geo import CRS, Geometry
 from sqlalchemy import text
-from typing_extensions import override
 
 from datacube_ows.index.api import (
     AbortRun,
@@ -63,7 +62,7 @@ def _check_perms(self, dc: Datacube, group: Literal["manage", "admin"]) -> None:
         if get_driver_name(dc.index) == "psycopg":
             from psycopg.errors import ProgrammingError
         else:
-            from psycopg2.errors import ProgrammingError
+            from psycopg2.errors import ProgrammingError  # type:ignore[no-redef]
         try:
             with get_sqlconn(dc) as conn:
                 conn.execute(text(f"set role odc_{group}"))
@@ -142,10 +141,7 @@ def normalise_to_dtr(
                     tmax = st + datetime.timedelta(seconds=1)
                 elif isinstance(t, datetime.date):
                     st = datetime.datetime(
-                        unnorm.year,
-                        unnorm.month,
-                        unnorm.day,
-                        tzinfo=datetime.timezone.utc,
+                        unnorm.year, unnorm.month, unnorm.day, tzinfo=datetime.UTC
                     )
                     tmax = st + datetime.timedelta(days=1)
                 else:

datacube_ows/index/postgis/product_ranges.py

@@ -7,7 +7,7 @@
 import logging
 import math
 from collections.abc import Callable
-from datetime import date, datetime, timezone
+from datetime import UTC, date, datetime
 
 import click
 import datacube
@@ -80,7 +80,7 @@ def create_range_entry(
             if get_driver_name(layer.dc.index) == "psycopg":
                 from psycopg.types.json import Json
             else:
-                from psycopg2.extras import Json
+                from psycopg2.extras import Json  # type:ignore[no-redef]
             # insert empty row if one does not already exist
             conn.execute(
                 text("""
@@ -94,7 +94,7 @@ def create_range_entry(
                     "p_layer": layer.name,
                     "empty": Json(""),
                     "meta": Json(meta.as_json()),
-                    "now": datetime.now(tz=timezone.utc),
+                    "now": datetime.now(tz=UTC),
                 },
             )
 
@@ -125,7 +125,7 @@ def create_range_entry(
                     dt1, dt2, ll, lu = result
                     lon = (ll + lu) / 2
                     dt = dt1 + (dt2 - dt1) / 2
-                    dt = dt.astimezone(timezone.utc)
+                    dt = dt.astimezone(UTC)
 
                     solar_day = datacube.api.query._convert_to_solar_time(
                         dt, lon

datacube_ows/index/postgres/api.py

@@ -6,15 +6,14 @@
 
 from collections.abc import Iterable
 from threading import Lock
-from typing import Literal, cast
+from typing import Literal, cast, override
 from uuid import UUID
 
 import click
 from datacube import Datacube
 from datacube.model import Dataset, Product
 from odc.geo import CRS, Geometry
 from sqlalchemy import text
-from typing_extensions import override
 
 from datacube_ows.index.api import (
     InsufficientDbPrivileges,
@@ -60,7 +59,7 @@ def _check_perms(self, dc: Datacube, group: Literal["manage", "admin"]) -> None:
         if get_driver_name(dc.index) == "psycopg":
             from psycopg.errors import ProgrammingError
         else:
-            from psycopg2.errors import ProgrammingError
+            from psycopg2.errors import ProgrammingError  # type:ignore[no-redef]
         try:
             with get_sqlconn(dc) as conn:
                 conn.execute(text(f"set role agdc_{group}"))

datacube_ows/index/postgres/mv_index.py

@@ -129,9 +129,7 @@ def mv_search(
                     )
                 )
             elif isinstance(t, datetime.date):
-                st = datetime.datetime(
-                    t.year, t.month, t.day, tzinfo=datetime.timezone.utc
-                )
+                st = datetime.datetime(t.year, t.month, t.day, tzinfo=datetime.UTC)
                 tmax = st + datetime.timedelta(days=1)
                 or_clauses.append(
                     and_(

datacube_ows/index/postgres/product_ranges.py

@@ -7,7 +7,7 @@
 import logging
 import math
 from collections.abc import Callable
-from datetime import date, datetime, timezone
+from datetime import UTC, date, datetime
 from typing import cast
 
 import datacube
@@ -84,7 +84,7 @@ def create_range_entry(
             if get_driver_name(layer.dc.index) == "psycopg":
                 from psycopg.types.json import Json
             else:
-                from psycopg2.extras import Json
+                from psycopg2.extras import Json  # type:ignore[no-redef]
             # insert empty row if one does not already exist
             conn.execute(
                 text("""
@@ -98,7 +98,7 @@ def create_range_entry(
                     "p_layer": layer.name,
                     "empty": Json(""),
                     "meta": Json(meta.as_json()),
-                    "now": datetime.now(tz=timezone.utc),
+                    "now": datetime.now(tz=UTC),
                 },
             )
 
@@ -144,7 +144,7 @@ def create_range_entry(
                 for result in results:
                     dt1, dt2, lon = result
                     dt = dt1 + (dt2 - dt1) / 2
-                    dt = dt.astimezone(timezone.utc)
+                    dt = dt.astimezone(UTC)
 
                     solar_day = datacube.api.query._convert_to_solar_time(
                         dt, lon

datacube_ows/index/sql.py

@@ -109,7 +109,10 @@ def run_sql_statement(
     if get_driver_name(idx) == "psycopg":
         from psycopg.errors import DuplicateObject, InsufficientPrivilege
     else:
-        from psycopg2.errors import DuplicateObject, InsufficientPrivilege
+        from psycopg2.errors import (  # type:ignore[no-redef]
+            DuplicateObject,
+            InsufficientPrivilege,
+        )
 
     try:
         result = conn.execute(sqlalchemy.text(sql))

datacube_ows/loading.py

@@ -8,7 +8,7 @@
 import logging
 from collections import OrderedDict
 from collections.abc import Iterable, Mapping
-from typing import cast
+from typing import cast, override
 from uuid import UUID
 
 import datacube
@@ -20,7 +20,6 @@
 from odc.geo.geobox import GeoBox
 from odc.geo.geom import Geometry
 from odc.geo.warp import Resampling
-from typing_extensions import override
 
 from datacube_ows.ogc_exceptions import WMSException
 from datacube_ows.ows_configuration import OWSNamedLayer

datacube_ows/ogc_exceptions.py

@@ -5,11 +5,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import traceback as tb
+from typing import override
 
 from flask import render_template
 from ows.common.types import OWSException, Version
 from ows.common.v20.encoders import xml_encode_exception_report
-from typing_extensions import override
 
 from datacube_ows.http_utils import resp_headers