Drop Python 3.10 support

.github/workflows/test.yaml

@@ -93,7 +93,7 @@ jobs:
           REQUESTED_VERSIONS: ${{ inputs.python-versions }}
           # Every supported version, oldest first; keep in sync with the
           # pyproject.toml classifiers.
-          PYTHON_VERSIONS: '["3.10", "3.11", "3.12", "3.13", "3.14"]'
+          PYTHON_VERSIONS: '["3.11", "3.12", "3.13", "3.14"]'
         run: |
           case "$EVENT_NAME" in
             pull_request | schedule)

README.md

@@ -32,7 +32,7 @@ PyAthena is a Python [DB API 2.0 (PEP 249)](https://www.python.org/dev/peps/pep-
 
 - Python
 
-  - CPython 3.10, 3.11, 3.12, 3.13, 3.14
+  - CPython 3.11, 3.12, 3.13, 3.14
 
 ## Installation
 

benchmarks/pyproject.toml

@@ -10,7 +10,7 @@ name = "pyathena-benchmarks"
 version = "0.1.0"
 description = "Reproducible Athena cursor measurements"
 # The workspace lock covers the root's Python range; benchmark runs use Python 3.12.
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 classifiers = ["Private :: Do Not Upload"]
 dependencies = [
     "PyAthena[pandas,arrow,polars]",

benchmarks/tests/test_packaging.py

@@ -29,7 +29,7 @@ def test_main_distributions_exclude_benchmark_code_and_dependencies():
             archive.read(next(n for n in names if n.endswith("/METADATA"))).decode()
         )
         assert metadata["Name"].lower() == "pyathena"
-        assert metadata["Requires-Python"] == ">=3.10"
+        assert metadata["Requires-Python"] == ">=3.11"
         requirements = "\n".join(metadata.get_all("Requires-Dist", []))
         assert "awswrangler" not in requirements
         assert "psutil" not in requirements

docs/conf.py

@@ -4,7 +4,7 @@
 # https://www.sphinx-doc.org/en/master/usage/configuration.html
 import re
 import subprocess
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 
 
 def get_version():
@@ -139,7 +139,7 @@ def setup(app):
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
 
 project = "PyAthena"
-copyright = f"2017-{datetime.now(timezone.utc).year}, The PyAthena authors"
+copyright = f"2017-{datetime.now(UTC).year}, The PyAthena authors"
 author = "The PyAthena authors"
 # Version will be set dynamically in setup() function
 version = ""

docs/introduction.md

@@ -17,7 +17,7 @@ SPDX-License-Identifier: MIT
 
 - Python
 
-  - CPython 3.10, 3.11, 3.12, 3.13, 3.14
+  - CPython 3.11, 3.12, 3.13, 3.14
 
 (installation)=
 

pyathena/aio/common.py

@@ -4,7 +4,7 @@
 import logging
 import sys
 from collections.abc import Awaitable, Callable
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from typing import Any, TypeVar, cast
 
 from botocore.exceptions import BotoCoreError, ClientError
@@ -240,9 +240,9 @@ async def _find_previous_query_id(  # type: ignore[override]
         if cache_size == 0 and cache_expiration_time > 0:
             cache_size = sys.maxsize
         if cache_expiration_time > 0:
-            expiration_time = datetime.now(timezone.utc) - timedelta(seconds=cache_expiration_time)
+            expiration_time = datetime.now(UTC) - timedelta(seconds=cache_expiration_time)
         else:
-            expiration_time = datetime.now(timezone.utc)
+            expiration_time = datetime.now(UTC)
         try:
             next_token = None
             while cache_size > 0:
@@ -264,8 +264,7 @@ async def _find_previous_query_id(  # type: ignore[override]
                     if (
                         cache_expiration_time > 0
                         and execution.completion_date_time
-                        and execution.completion_date_time.astimezone(timezone.utc)
-                        < expiration_time
+                        and execution.completion_date_time.astimezone(UTC) < expiration_time
                     ):
                         next_token = None
                         break

pyathena/common.py

@@ -5,7 +5,7 @@
 import time
 from abc import ABCMeta, abstractmethod
 from collections.abc import Callable
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from typing import TYPE_CHECKING, Any, TypeVar, cast
 
 from botocore.exceptions import BotoCoreError, ClientError
@@ -925,9 +925,9 @@ def _find_previous_query_id(
         if cache_size == 0 and cache_expiration_time > 0:
             cache_size = sys.maxsize
         if cache_expiration_time > 0:
-            expiration_time = datetime.now(timezone.utc) - timedelta(seconds=cache_expiration_time)
+            expiration_time = datetime.now(UTC) - timedelta(seconds=cache_expiration_time)
         else:
-            expiration_time = datetime.now(timezone.utc)
+            expiration_time = datetime.now(UTC)
         try:
             next_token = None
             while cache_size > 0:
@@ -950,8 +950,7 @@ def _find_previous_query_id(
                     if (
                         cache_expiration_time > 0
                         and execution.completion_date_time
-                        and execution.completion_date_time.astimezone(timezone.utc)
-                        < expiration_time
+                        and execution.completion_date_time.astimezone(UTC) < expiration_time
                     ):
                         next_token = None
                         break

pyathena/formatter.py

@@ -8,7 +8,7 @@
 from collections.abc import Callable
 from copy import deepcopy
 from dataclasses import dataclass
-from datetime import date, datetime, timezone
+from datetime import UTC, date, datetime
 from decimal import Decimal
 from typing import Any, Literal
 
@@ -140,7 +140,7 @@ def wrap_unload(
 
         operation_upper = operation.strip().upper()
         if operation_upper.startswith(("SELECT", "WITH")):
-            now = datetime.now(timezone.utc).strftime("%Y%m%d")
+            now = datetime.now(UTC).strftime("%Y%m%d")
             location = f"{s3_staging_dir}unload/{now}/{uuid.uuid4()!s}/"
             operation = textwrap.dedent(
                 f"""

pyathena/pandas/result_set.py

@@ -392,7 +392,7 @@ def _get_available_engine(self, engine_candidates: list[str]) -> str:
             try:
                 module = importlib.import_module(engine)
                 return module.__name__
-            except ImportError as e:  # noqa: PERF203
+            except ImportError as e:
                 error_msgs += f"\n - {e!s}"
 
         available_engines = ", ".join(f"'{e}'" for e in engine_candidates)

pyathena/sqlalchemy/array.py

@@ -15,7 +15,6 @@
 from sqlalchemy.sql.type_api import TypeEngine
 from sqlalchemy.sql.visitors import InternalTraversal
 
-from pyathena.converter import _parse_datetime
 from pyathena.formatter import _ComplexParameter
 from pyathena.sqlalchemy.map import AthenaMap
 from pyathena.sqlalchemy.struct import AthenaStruct
@@ -167,23 +166,6 @@ def __init__(self, element, type_):
         self.array_type = type_
 
 
-def _decode_datetime(value: str) -> datetime:
-    """Decode an ARRAY element as a datetime.
-
-    Args:
-        value: The element as ISO 8601 text, or as Athena TIMESTAMP text of any
-            precision.
-
-    Returns:
-        The datetime. Fractional digits beyond microseconds are truncated.
-    """
-    try:
-        return datetime.fromisoformat(value)
-    except ValueError:
-        # Python 3.10 accepts only 3 or 6 fractional digits.
-        return _parse_datetime(value)
-
-
 class _ArrayTypeInspector:
     """Interpret nested ARRAY element types for SQL compilation and value conversion.
 
@@ -414,7 +396,7 @@ def _decode(self, value: Any, type_: TypeEngine[Any], as_tuple: bool = False) ->
         if isinstance(type_, types.Numeric):
             return Decimal(value) if type_.asdecimal else float(value)
         if isinstance(type_, (types.DateTime, AthenaTimestamp)):
-            return value if isinstance(value, datetime) else _decode_datetime(value)
+            return value if isinstance(value, datetime) else datetime.fromisoformat(value)
         if isinstance(type_, (types.Date, AthenaDate)):
             return value if isinstance(value, date) else date.fromisoformat(value)
         if isinstance(type_, (types.LargeBinary, types.BINARY, types.VARBINARY)):

pyproject.toml

@@ -14,7 +14,7 @@ dependencies = [
     "fsspec",
     "python-dateutil",
 ]
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 readme = "README.md"
 license = "MIT"
 license-files = ["LICENSE", "NOTICE"]
@@ -24,7 +24,6 @@ classifiers = [
     "Operating System :: OS Independent",
     "Topic :: Database :: Front-Ends",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
@@ -94,7 +93,6 @@ dev = [
     "sphinx-design",
     "types-python-dateutil",
     "cfn-lint>=1",
-    "tomli>=2.0.0; python_version<'3.11'",
 ]
 
 [build-system]
@@ -142,7 +140,7 @@ exclude = [
     ".tox",
     "benchmarks",
 ]
-target-version = "py310"
+target-version = "py311"
 
 [tool.ruff.lint]
 # https://docs.astral.sh/ruff/rules/
@@ -208,11 +206,10 @@ exclude = [
 legacy_tox_ini = """
 [tox]
 isolated_build = true
-envlist = py{310,311,312,313,314}-{pyathena,sqla,sqla_async}
+envlist = py{311,312,313,314}-{pyathena,sqla,sqla_async}
 
 [gh-actions]
 python =
-    3.10: py310
     3.11: py311
     3.12: py312
     3.13: py313

scripts/check_license_headers.py

@@ -18,14 +18,10 @@
 import re
 import subprocess
 import sys
+import tomllib
 from dataclasses import dataclass
 from pathlib import Path
 
-if sys.version_info >= (3, 11):
-    import tomllib
-else:
-    import tomli as tomllib
-
 HEADER_LINES = (
     r"Copyright \d{4} The PyAthena authors",
     "",

scripts/sweep_databases.py

@@ -41,7 +41,7 @@
 import os
 import re
 import time
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from typing import Any
 
 import boto3
@@ -75,7 +75,7 @@ def sweep_databases(client: Any, catalog_id: str, *, dry_run: bool = True) -> di
     Databases younger than seven days are retained, including concurrent CI runs.
     Only Glue metadata is deleted; S3 objects and child catalogs are untouched.
     """
-    cutoff = datetime.now(timezone.utc) - timedelta(days=7)
+    cutoff = datetime.now(UTC) - timedelta(days=7)
     # Finish pagination before deleting anything from the catalog.
     candidates = [
         database
@@ -141,7 +141,7 @@ def sweep_s3tables_namespaces(
     Returns:
         The numbers of eligible, deleted and skipped namespaces.
     """
-    cutoff = datetime.now(timezone.utc) - timedelta(days=7)
+    cutoff = datetime.now(UTC) - timedelta(days=7)
     # Finish pagination before deleting anything from the table bucket.
     candidates = [
         namespace

scripts/tests/test_sweep_databases.py

@@ -5,7 +5,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-from datetime import datetime, timedelta, timezone
+from datetime import UTC, datetime, timedelta
 from unittest.mock import Mock
 
 import boto3
@@ -22,7 +22,7 @@
 )
 
 CATALOG = "123456789012"
-OLD = datetime.now(timezone.utc) - timedelta(days=10)
+OLD = datetime.now(UTC) - timedelta(days=10)
 DATABASE = {"Name": "pyathena_test_abcdefghij", "CreateTime": OLD}
 BUCKET_ARN = f"arn:aws:s3tables:us-west-2:{CATALOG}:bucket/table-bucket"
 NAMESPACE = {
@@ -109,7 +109,7 @@ def test_preview_and_apply_finish_pagination_before_mutating(glue):
     "current",
     [
         {**DATABASE, "CreateTime": OLD - timedelta(days=1)},
-        {**DATABASE, "CreateTime": datetime.now(timezone.utc)},
+        {**DATABASE, "CreateTime": datetime.now(UTC)},
         {**DATABASE, "TargetDatabase": {"CatalogId": CATALOG, "DatabaseName": "shared"}},
     ],
 )
@@ -283,7 +283,7 @@ def test_namespace_sweep_deletes_tables_then_namespace(s3tables):
 @pytest.mark.parametrize(
     "current",
     [
-        {**NAMESPACE, "createdAt": datetime.now(timezone.utc)},
+        {**NAMESPACE, "createdAt": datetime.now(UTC)},
         RECREATED,
     ],
 )

tests/pyathena/aio/test_cursor.py

@@ -1,7 +1,7 @@
 import asyncio
 import re
 import threading
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
@@ -171,7 +171,7 @@ def execution(schema):
                         "QueryExecutionContext": {"Database": schema},
                         "Status": {
                             "State": AthenaQueryExecution.STATE_SUCCEEDED,
-                            "CompletionDateTime": datetime.now(timezone.utc),
+                            "CompletionDateTime": datetime.now(UTC),
                         },
                     }
                 }
@@ -208,7 +208,7 @@ def execution(catalog):
                         "QueryExecutionContext": {"Database": schema, "Catalog": catalog},
                         "Status": {
                             "State": AthenaQueryExecution.STATE_SUCCEEDED,
-                            "CompletionDateTime": datetime.now(timezone.utc),
+                            "CompletionDateTime": datetime.now(UTC),
                         },
                     }
                 }

tests/pyathena/filesystem/test_s3.py

@@ -6,7 +6,7 @@
 import urllib.request
 import uuid
 from concurrent.futures import Future, ThreadPoolExecutor
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from itertools import chain
 from pathlib import Path
 from types import SimpleNamespace
@@ -786,7 +786,7 @@ def test_info_file(self, fs):
         with pytest.raises(FileNotFoundError):
             fs.info(file)
 
-        now = datetime.now(timezone.utc)
+        now = datetime.now(UTC)
         fs.pipe(file, b"a")
         bucket, key, version_id = fs.parse_path(file)
         fs.invalidate_cache()

tests/pyathena/filesystem/test_s3_async.py

@@ -4,7 +4,7 @@
 import urllib.parse
 import urllib.request
 import uuid
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from itertools import chain
 from pathlib import Path
 
@@ -371,7 +371,7 @@ async def test_info_file(self, fs):
         with pytest.raises(FileNotFoundError):
             await fs._info(file)
 
-        now = datetime.now(timezone.utc)
+        now = datetime.now(UTC)
         await fs._pipe_file(file, b"a")
         bucket, key, version_id = fs.parse_path(file)
         fs.invalidate_cache()