Drop Python 3.9 support and refresh vulnerable deps (#429)

erichare · web-flow · commit 951dcb3b2f9a · 2026-06-26T08:56:50.000-07:00
* Drop Python 3.9 support and refresh vulnerable deps

* fix: single line import of Any
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,7 +11,7 @@ on:
 
 env:
   PYTHON_VERSION: "3.12"
-  LEAST_PYTHON_VERSION: "3.9"
+  LEAST_PYTHON_VERSION: "3.10"
   UV_FROZEN: "true"
   UV_NO_SYNC: "true"
 
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -30,7 +30,6 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.9"
           - "3.10"
           - "3.11"
           - "3.12.7"  # to ensure the 'no ssl reuse' route is tested
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,7 @@
 main
 ====
+Supported Python versions are now 3.10 to 3.14:
+    - removal of Python 3.9 [Breaking change w.r.t. 2.2]
 `AstraDatabaseAdmin`: support for listing PCU Groups.
     - Added `PCUGroupDescriptor`/`PCUGroupTypeDescriptor`/`PCUGroupTypeDetailsDescriptor` classes.
     - Added `[async_]list_pcu_groups` method.
@@ -20,8 +22,8 @@ Bugfix: faulty normalization of empty/null indexing targets for `CollectionDefin
 maintenance: integration testing gets an embedding provider switcher logic
 maintenance: integration tests use the latest HCD (2.0.6) and a recent Data API build (1.0.46)
 maintenance: integration tests have configurable page size for find pagination
+maintenance: bump idna (3.10->3.18) and pygments (2.19.2->2.20.0) in uv.lock to clear Dependabot alerts.
 maintenance: base and vectorize integration tests fail fast unless all non-system keyspaces in the target database are free of collections, tables and UDTs (set `TOLERATE_POPULATED_DATABASE=yes` for intentional narrow local runs)
-maintenance: bump idna (3.10->3.18) and pygments (2.19.2->2.20.0) in uv.lock to clear Dependabot alerts (remaining alerts require dropping Python 3.9)
 
 
 v 2.2.1
diff --git a/DEVELOPING.md b/DEVELOPING.md
@@ -46,7 +46,7 @@ Steps:
 
 - Export variables as in one of the `tests/env_templates/*.base.template` examples.
 - Export variables as in the `tests/env_templates/env.vectorize-minimal.template` example.
-- Run: `uv venv --python ">=3.9,<3.15" && uv run pytest tests/base`
+- Run: `uv venv --python ">=3.10,<3.15" && uv run pytest tests/base`
 
 ### All available tests/targets
 
diff --git a/astrapy/data/cursors/farr_cursor.py b/astrapy/data/cursors/farr_cursor.py
@@ -14,10 +14,10 @@
 
 from __future__ import annotations
 
-from collections.abc import Awaitable
+from collections.abc import Awaitable, Callable
 from copy import deepcopy
 from inspect import iscoroutinefunction
-from typing import Any, Callable, Generic, cast
+from typing import Any, Generic, cast
 
 from astrapy import AsyncCollection, Collection
 from astrapy.constants import (
diff --git a/astrapy/data/cursors/find_cursor.py b/astrapy/data/cursors/find_cursor.py
@@ -14,10 +14,10 @@
 
 from __future__ import annotations
 
-from collections.abc import Awaitable
+from collections.abc import Awaitable, Callable
 from copy import deepcopy
 from inspect import iscoroutinefunction
-from typing import Any, Callable, Generic, cast
+from typing import Any, Generic, cast
 
 from astrapy import AsyncCollection, AsyncTable, Collection, Table
 from astrapy.constants import (
diff --git a/astrapy/data/info/table_descriptor/table_altering.py b/astrapy/data/info/table_descriptor/table_altering.py
@@ -16,7 +16,7 @@
 
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
-from typing import Any, TypeVar, Union, cast
+from typing import Any, TypeVar, cast
 
 from astrapy.data.info.table_descriptor.table_columns import (
     TableColumnTypeDescriptor,
@@ -273,7 +273,7 @@ def _from_dict(cls, raw_dict: dict[str, Any]) -> AlterTableAddVectorize:
             )
         return AlterTableAddVectorize(
             columns=cast(
-                dict[str, Union[VectorServiceOptions, dict[str, Any]]],
+                dict[str, VectorServiceOptions | dict[str, Any]],
                 _columns,
             )
         )
diff --git a/astrapy/data/utils/collection_converters.py b/astrapy/data/utils/collection_converters.py
@@ -84,7 +84,7 @@ def preprocess_collection_payload_value(
 
     if options.unroll_iterables_to_lists:
         _value = ensure_unrolled_if_iterable(_value)
-    if isinstance(_value, (dict, DataAPIMap)):
+    if isinstance(_value, dict | DataAPIMap):
         return {
             k: preprocess_collection_payload_value(path + [k], v, options=options)
             for k, v in _value.items()
diff --git a/astrapy/data/utils/distinct_extractors.py b/astrapy/data/utils/distinct_extractors.py
@@ -16,20 +16,16 @@
 
 import hashlib
 import json
-from collections.abc import Iterable
-from typing import (
-    Any,
-    Callable,
-    Optional,
-)
+from collections.abc import Callable, Iterable
+from typing import Any
 
 from astrapy.data.utils.collection_converters import preprocess_collection_payload_value
 from astrapy.data.utils.table_converters import preprocess_table_payload_value
 from astrapy.data_types import DataAPIMap, DataAPISet
 from astrapy.utils.api_options import FullSerdesOptions
 from astrapy.utils.document_paths import unescape_field_path
 
-IndexPairType = tuple[Optional[str], Optional[int]]
+IndexPairType = tuple[str | None, int | None]
 
 ERROR_NO_EMPTY_SAFE_KEYSTART = (
     "The 'key' parameter for distinct cannot be empty or start with a list index."
@@ -80,7 +76,7 @@ def _extract_with_key_blocks(
         key_blocks: list[IndexPairType], value: Any
     ) -> Iterable[Any]:
         if key_blocks == []:
-            if isinstance(value, (list, set, DataAPISet)):
+            if isinstance(value, list | set | DataAPISet):
                 for item in value:
                     yield item
             else:
@@ -91,13 +87,13 @@ def _extract_with_key_blocks(
             rest_key_blocks = key_blocks[1:]
             key_block = key_blocks[0]
             k_str, k_int = key_block
-            if isinstance(value, (dict, DataAPIMap)):
+            if isinstance(value, dict | DataAPIMap):
                 if k_str is not None and k_str in value:
                     new_value = value[k_str]
                     for item in _extract_with_key_blocks(rest_key_blocks, new_value):
                         yield item
                 return
-            elif isinstance(value, (list, set, DataAPISet)):
+            elif isinstance(value, list | set | DataAPISet):
                 _list_value = list(value)
                 if k_int is not None:
                     if len(_list_value) > k_int:
diff --git a/astrapy/data/utils/table_converters.py b/astrapy/data/utils/table_converters.py
@@ -22,7 +22,8 @@
 import json
 import logging
 import math
-from typing import Any, Callable, Generic, cast
+from collections.abc import Callable
+from typing import Any, Generic, cast
 
 from astrapy.constants import ROW, MapEncodingMode
 from astrapy.data.info.table_descriptor.table_columns import (
@@ -117,7 +118,7 @@ def _tpostprocessor_int(raw_value: Any) -> int | None:
         def _tpostprocessor_float(raw_value: Any) -> float | None:
             if raw_value is None:
                 return None
-            elif isinstance(raw_value, (str, decimal.Decimal)):
+            elif isinstance(raw_value, str | decimal.Decimal):
                 return float(raw_value)
             # just a float already
             return cast(float, raw_value)
@@ -668,7 +669,7 @@ def preprocess_table_payload_value(
             )
             for udt_k, udt_v in udt_dict.items()
         }
-    elif isinstance(value, (dict, DataAPIMap)):
+    elif isinstance(value, dict | DataAPIMap):
         # This is a nesting structure (but not the dict-wrapper for UDTs)
         maps_can_become_tuples: bool
         if options.encode_maps_as_lists_in_tables == MapEncodingMode.NEVER:
@@ -716,7 +717,7 @@ def preprocess_table_payload_value(
             )
             for k, v in value.items()
         }
-    elif isinstance(value, (list, set, DataAPISet)):
+    elif isinstance(value, list | set | DataAPISet):
         return [
             preprocess_table_payload_value(
                 path + [""], v, options=options, map2tuple_checker=map2tuple_checker
@@ -792,7 +793,7 @@ def preprocess_table_payload_value(
         return value.to_c_string()
     elif isinstance(value, UUID):
         return str(value)
-    elif isinstance(value, (ipaddress.IPv4Address, ipaddress.IPv6Address)):
+    elif isinstance(value, ipaddress.IPv4Address | ipaddress.IPv6Address):
         return str(value)
     elif isinstance(value, datetime.timedelta):
         return DataAPIDuration.from_timedelta(value).to_c_string()
@@ -818,7 +819,7 @@ def preprocess_table_payload_value(
         ]
 
     # is it a well-known, natively-JSON-serializable type:
-    if isinstance(_uvalue, (str, int, float, bool, type(None))):
+    if isinstance(_uvalue, str | int | float | bool | type(None)):
         return _uvalue
 
     # check whether instance of a class with a registered serializer:
diff --git a/astrapy/data_types/data_api_set.py b/astrapy/data_types/data_api_set.py
@@ -61,7 +61,7 @@ def __reduce__(self) -> tuple[type, tuple[Iterable[T]]]:
         return self.__class__, (self._items,)
 
     def __eq__(self, other: Any) -> bool:
-        if isinstance(other, (set, DataAPISet)):
+        if isinstance(other, set | DataAPISet):
             return len(other) == len(self._items) and all(
                 item in self for item in other
             )
diff --git a/astrapy/event_observers/context_managers.py b/astrapy/event_observers/context_managers.py
@@ -15,21 +15,10 @@
 from __future__ import annotations
 
 from collections.abc import Iterable, Iterator
-from typing import Protocol, TypeVar
-
-# TODO: once supporting 3.11+, this can be simplified.
-# 'Self' is imported differently below 3.11, cf. below. Then:
-# 1. To appease typecheckers on e.g. 3.9, we need the `attr-defined` exception
-# 2. To appease typecheckers on 3.11+, we need the `unused-ignore` exception.
-try:
-    # Python 3.11 upward:
-    from typing import Self  # type:ignore[attr-defined,unused-ignore]
-except ImportError:
-    # 3.10 and below:
-    from typing_extensions import Self
-
 from contextlib import contextmanager
+from typing import Protocol, TypeVar
 
+from typing_extensions import Self
 from uuid6 import uuid7
 
 from astrapy.api_options import APIOptions
diff --git a/astrapy/settings/definitions/definitions_types.py b/astrapy/settings/definitions/definitions_types.py
@@ -14,36 +14,25 @@
 
 from __future__ import annotations
 
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from typing import (
-    TYPE_CHECKING,
     Any,
-    Callable,
-    Optional,
     TypeVar,
-    Union,
 )
 
+from astrapy.data.info.table_descriptor.type_creation import CreateTypeDefinition
 from astrapy.data_types import DataAPIVector
 
-if TYPE_CHECKING:
-    from astrapy.info import CreateTypeDefinition
-
-
 DefaultDocumentType = dict[str, Any]
 DefaultRowType = dict[str, Any]
-ProjectionType = Union[
-    Iterable[str], dict[str, Union[bool, dict[str, Union[int, Iterable[int]]]]]
-]
+ProjectionType = Iterable[str] | dict[str, bool | dict[str, int | Iterable[int]]]
 SortType = dict[str, Any]
-HybridSortType = dict[
-    str, Union[str, dict[str, Union[str, list[float], DataAPIVector]]]
-]
+HybridSortType = dict[str, str | dict[str, str | list[float] | DataAPIVector]]
 FilterType = dict[str, Any]
-CallerType = tuple[Optional[str], Optional[str]]
+CallerType = tuple[str | None, str | None]
 SerializerFunctionType = Callable[[Any], dict[str, Any]]
 UDTDeserializerFunctionType = Callable[
-    [dict[str, Any], Optional["CreateTypeDefinition"]], Any
+    [dict[str, Any], CreateTypeDefinition | None], Any
 ]
 
 ROW = TypeVar("ROW")
diff --git a/astrapy/utils/document_paths.py b/astrapy/utils/document_paths.py
@@ -94,7 +94,7 @@ def escape_field_names(*field_names: str | int | Iterable[str | int]) -> str:  #
     """
     _field_names: Iterable[str | int]
     # strings are iterables, so:
-    if len(field_names) == 1 and not isinstance(field_names[0], (str, int)):
+    if len(field_names) == 1 and not isinstance(field_names[0], str | int):
         _field_names = field_names[0]
     else:
         # user passing a list of string-or-ints.
@@ -103,7 +103,7 @@ def escape_field_names(*field_names: str | int | Iterable[str | int]) -> str:  #
             segment
             for field_name in field_names
             for segment in (
-                [field_name] if isinstance(field_name, (str, int)) else field_name
+                [field_name] if isinstance(field_name, str | int) else field_name
             )
         ]
 
diff --git a/astrapy/utils/meta.py b/astrapy/utils/meta.py
@@ -15,11 +15,11 @@
 from __future__ import annotations
 
 import warnings
+from collections.abc import Callable
 from functools import wraps
-from typing import Callable, TypeVar
+from typing import ParamSpec, TypeVar
 
 from deprecation import DeprecatedWarning
-from typing_extensions import ParamSpec  # compatible with pre-3.10 Python
 
 P = ParamSpec("P")
 R = TypeVar("R")
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 [project]
-requires-python = ">=3.9,<4.0"
+requires-python = ">=3.10,<4.0"
 name = "astrapy"
 version = "2.2.1"
 description = "A Python client for the Data API on DataStax Astra DB"
@@ -24,7 +24,6 @@ classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: Apache Software License",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -54,17 +53,17 @@ dev = [
     "mypy ~= 1.9.0",
     "ruff >= 0.11.9,<0.12",
     "pre-commit ~= 3.5.0",
-    "pytest ~= 8.0.0",
-    "pytest-asyncio ~= 0.23.5",
+    "pytest >= 9.0.3,<10",
+    "pytest-asyncio >= 1.4.0,<2",
     "pytest-cov ~= 4.1.0",
     "pytest-testdox ~= 3.1.0",
-    "python-dotenv ~= 1.0.1",
+    "python-dotenv >= 1.2.2,<2",
     "pytest-httpserver ~= 1.0.8",
-    "requests >= 2.32.4",
+    "requests >= 2.33.0",
     "setuptools >= 61.0",
     "testcontainers ~= 3.7.1",
     "types-toml >= 0.10.8.7,<1.0.0",
-    "urllib3 >= 2.6.3",
+    "urllib3 >= 2.7.0",
     "virtualenv >= 20.36.1",
     "werkzeug >= 3.1.5"
 ]
diff --git a/tests/admin/integration/test_admin.py b/tests/admin/integration/test_admin.py
@@ -16,8 +16,8 @@
 
 import asyncio
 import time
-from collections.abc import Awaitable
-from typing import Any, Callable
+from collections.abc import Awaitable, Callable
+from typing import Any
 
 import pytest
 
diff --git a/tests/base/integration/collections/test_collection_farr_async.py b/tests/base/integration/collections/test_collection_farr_async.py
diff --git a/tests/base/integration/collections/test_collection_farr_sync.py b/tests/base/integration/collections/test_collection_farr_sync.py
diff --git a/tests/base/unit/test_timeouts.py b/tests/base/unit/test_timeouts.py
diff --git a/tests/conftest.py b/tests/conftest.py
diff --git a/tests/preprocess_env.py b/tests/preprocess_env.py
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`from abc import ABC, abstractmethod`
`18`	`18`	`from dataclasses import dataclass`
`19`		`-from typing import Any, TypeVar, Union, cast`
	`19`	`+from typing import Any, TypeVar, cast`
`20`	`20`
`21`	`21`	`from astrapy.data.info.table_descriptor.table_columns import (`
`22`	`22`	`TableColumnTypeDescriptor,`
`@@ -273,7 +273,7 @@ def _from_dict(cls, raw_dict: dict[str, Any]) -> AlterTableAddVectorize:`
`273`	`273`	`)`
`274`	`274`	`return AlterTableAddVectorize(`
`275`	`275`	`columns=cast(`
`276`		`- dict[str, Union[VectorServiceOptions, dict[str, Any]]],`
	`276`	`+ dict[str, VectorServiceOptions \| dict[str, Any]],`
`277`	`277`	`_columns,`
`278`	`278`	`)`
`279`	`279`	`)`