feat: drop support for Python <=3.10 and require >=3.11 (#1485)

Author: kgala2

.github/workflows/tests.yml

@@ -35,7 +35,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        python-version: ["3.10", "3.14"]
+        python-version: ["3.11", "3.14"]
       fail-fast: false
     permissions:
       contents: read
@@ -144,7 +144,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10", "3.14"]
+        python-version: ["3.11", "3.14"]
       fail-fast: false
     permissions:
       contents: read

google/cloud/sql/connector/client.py

@@ -285,7 +285,7 @@ async def _get_ephemeral(
             # google.auth library strips timezone info for backwards compatibality
             # reasons with Python 2. Add it back to allow timezone aware datetimes.
             # Ref: https://github.com/googleapis/google-auth-library-python/blob/49a5ff7411a2ae4d32a7d11700f9f961c55406a9/google/auth/_helpers.py#L93-L99
-            token_expiration = token_expiration.replace(tzinfo=datetime.timezone.utc)
+            token_expiration = token_expiration.replace(tzinfo=datetime.UTC)
 
             expiration = min(expiration, token_expiration)
         return ephemeral_cert, expiration

google/cloud/sql/connector/connector.py

@@ -17,13 +17,14 @@
 from __future__ import annotations
 
 import asyncio
+from collections.abc import Callable
 from functools import partial
 import logging
 import os
 import socket
 from threading import Thread
 from types import TracebackType
-from typing import Any, Callable
+from typing import Any
 
 import google.auth
 from google.auth.credentials import Credentials

google/cloud/sql/connector/instance.py

@@ -19,7 +19,7 @@
 import asyncio
 from datetime import datetime
 from datetime import timedelta
-from datetime import timezone
+from datetime import UTC
 import logging
 
 from google.cloud.sql.connector.client import CloudSQLClient
@@ -221,7 +221,7 @@ async def _refresh_task(self: RefreshAheadCache, delay: int) -> ConnectionInfo:
             logger.debug(
                 f"['{self._conn_name}']: Connection info refresh"
                 " operation scheduled for "
-                f"{(datetime.now(timezone.utc) + timedelta(seconds=delay)).isoformat(timespec='seconds')} "
+                f"{(datetime.now(UTC) + timedelta(seconds=delay)).isoformat(timespec='seconds')} "
                 f"(now + {timedelta(seconds=delay)})"
             )
             self._next = self._schedule_refresh(delay)

google/cloud/sql/connector/lazy.py

@@ -17,7 +17,7 @@
 import asyncio
 from datetime import datetime
 from datetime import timedelta
-from datetime import timezone
+from datetime import UTC
 import logging
 
 from google.cloud.sql.connector.client import CloudSQLClient
@@ -121,7 +121,7 @@ async def connect_info(self) -> ConnectionInfo:
             if (
                 self._cached
                 and not self._needs_refresh
-                and datetime.now(timezone.utc)
+                and datetime.now(UTC)
                 < (self._cached.expiration - timedelta(seconds=_refresh_buffer))
             ):
                 logger.debug(

google/cloud/sql/connector/monitored_cache.py

@@ -15,9 +15,10 @@
 from __future__ import annotations
 
 import asyncio
+from collections.abc import Callable
 import logging
 import ssl
-from typing import Any, Callable
+from typing import Any
 
 import aiohttp
 

google/cloud/sql/connector/refresh_utils.py

@@ -17,11 +17,12 @@
 from __future__ import annotations
 
 import asyncio
+from collections.abc import Callable
 import copy
 import datetime
 import logging
 import random
-from typing import Any, Callable
+from typing import Any
 
 import aiohttp
 from google.auth.credentials import Credentials
@@ -52,7 +53,7 @@ def _seconds_until_refresh(
     """
 
     duration = int(
-        (expiration - datetime.datetime.now(datetime.timezone.utc)).total_seconds()
+        (expiration - datetime.datetime.now(datetime.UTC)).total_seconds()
     )
 
     # if certificate duration is less than 1 hour
@@ -70,7 +71,7 @@ async def _is_valid(task: asyncio.Task) -> bool:
     try:
         metadata = await task
         # only valid if now is before the cert expires
-        if datetime.datetime.now(datetime.timezone.utc) < metadata.expiration:
+        if datetime.datetime.now(datetime.UTC) < metadata.expiration:
             return True
     except Exception:  # noqa: BLE001
         # supress any errors from task

noxfile.py

@@ -21,7 +21,7 @@
 
 LINT_PATHS = ["google", "tests", "noxfile.py"]
 
-TEST_PYTHON_VERSIONS = ["3.10", "3.11", "3.12", "3.13", "3.14"]
+TEST_PYTHON_VERSIONS = ["3.11", "3.12", "3.13", "3.14"]
 
 
 @nox.session

pyproject.toml

@@ -22,7 +22,7 @@ name = "cloud-sql-python-connector"
 authors = [{ name = "Google LLC", email = "googleapis-packages@google.com" }]
 license = "Apache-2.0"
 license-files = ["LICENSE"]
-requires-python = ">=3.9"
+requires-python = ">=3.11"
 readme = "README.md"
 classifiers = [
     # Should be one of:
@@ -33,11 +33,10 @@ classifiers = [
     "Intended Audience :: Developers",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Operating System :: OS Independent",
 ]
 dependencies = [
@@ -77,7 +76,7 @@ version = { attr = "google.cloud.sql.connector.version.__version__" }
 include = ["google*"]
 
 [tool.mypy]
-python_version = "3.9"
+python_version = "3.11"
 namespace_packages = true
 ignore_missing_imports = true
 warn_unused_configs = true

tests/unit/mocks.py

@@ -18,10 +18,11 @@
 
 from __future__ import annotations
 
+from collections.abc import Callable
 import datetime
 import json
 import ssl
-from typing import Any, Callable, Literal
+from typing import Any, Literal
 
 from aiohttp import web
 from cryptography import x509
@@ -56,7 +57,7 @@ def __class__(self) -> Credentials:
     def refresh(self, _: Callable) -> None:
         """Refreshes the access token."""
         self.token = "12345"
-        self.expiry = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(
+        self.expiry = datetime.datetime.now(datetime.UTC) + datetime.timedelta(
             minutes=60
         )
 
@@ -70,7 +71,7 @@ def expired(self) -> bool:
         """
         if self.expiry is None:
             return False
-        return not self.expiry > datetime.datetime.now(datetime.timezone.utc)
+        return not self.expiry > datetime.datetime.now(datetime.UTC)
 
     @property
     def universe_domain(self) -> str:
@@ -94,11 +95,11 @@ def token_state(
         if self.expiry is None:
             return TokenState.FRESH
 
-        expired = datetime.datetime.now(datetime.timezone.utc) >= self.expiry
+        expired = datetime.datetime.now(datetime.UTC) >= self.expiry
         if expired:
             return TokenState.INVALID
 
-        is_stale = datetime.datetime.now(datetime.timezone.utc) >= (
+        is_stale = datetime.datetime.now(datetime.UTC) >= (
             self.expiry - _helpers.REFRESH_THRESHOLD
         )
         if is_stale:
@@ -117,9 +118,9 @@ def generate_cert(
     Generate a private key and cert object to be used in testing.
     """
     if cert_before is None:
-        cert_before = datetime.datetime.now(datetime.timezone.utc)
+        cert_before = datetime.datetime.now(datetime.UTC)
     if cert_after is None:
-        cert_after = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(hours=1)
+        cert_after = datetime.datetime.now(datetime.UTC) + datetime.timedelta(hours=1)
     # generate private key
     key = rsa.generate_private_key(public_exponent=65537, key_size=2048)
     common_name = f"{project}:{name}"
@@ -168,9 +169,9 @@ def client_key_signed_cert(
     Create a PEM encoded certificate that is signed by given public key.
     """
     if cert_before is None:
-        cert_before = datetime.datetime.now(datetime.timezone.utc)
+        cert_before = datetime.datetime.now(datetime.UTC)
     if cert_expiration is None:
-        cert_expiration = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(hours=1)
+        cert_expiration = datetime.datetime.now(datetime.UTC) + datetime.timedelta(hours=1)
     # configure cert subject
     subject = issuer = x509.Name(
         [
@@ -234,9 +235,9 @@ def __init__(
         cert_expiration: datetime.datetime | None = None,
     ) -> None:
         if cert_before is None:
-            cert_before = datetime.datetime.now(datetime.timezone.utc)
+            cert_before = datetime.datetime.now(datetime.UTC)
         if cert_expiration is None:
-            cert_expiration = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(hours=1)
+            cert_expiration = datetime.datetime.now(datetime.UTC) + datetime.timedelta(hours=1)
         if dns_names is None:
             dns_names = ["abcde.12345.us-central1.sql.goog"]
         if ip_addrs is None: