Add Python 3.10 and 3.11 compatibility

Author: zzstoatzz

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.12", "3.13"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
         backend:
           - name: "Redis 6.2, redis-py <5"
             redis-version: "6.2"
@@ -62,7 +62,7 @@ jobs:
       - name: Install uv and set Python version
         uses: astral-sh/setup-uv@v5
         with:
-          python-version: "3.12"
+          python-version: "3.10"
           enable-cache: true
           cache-dependency-glob: "pyproject.toml"
 

pyproject.toml

@@ -7,12 +7,14 @@ name = "pydocket"
 dynamic = ["version"]
 description = "A distributed background task system for Python functions"
 readme = { file = "README.md", content-type = "text/markdown" }
-requires-python = ">=3.12"
+requires-python = ">=3.10"
 license = { file = "LICENSE" }
 authors = [{ name = "Chris Guidry", email = "guid@omg.lol" }]
 classifiers = [
     "Development Status :: 4 - Beta",
     "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
     "License :: OSI Approved :: MIT License",
@@ -21,13 +23,15 @@ classifiers = [
 ]
 dependencies = [
     "cloudpickle>=3.1.1",
+    "exceptiongroup>=1.2.0; python_version < '3.11'",
     "opentelemetry-api>=1.30.0",
     "opentelemetry-exporter-prometheus>=0.51b0",
     "prometheus-client>=0.21.1",
     "python-json-logger>=3.2.1",
     "redis>=4.6",
     "rich>=13.9.4",
     "typer>=0.15.1",
+    "typing_extensions>=4.12.0",
     "uuid7>=0.1.0",
 ]
 
@@ -39,7 +43,7 @@ dev = [
     # This fixes xpending_range to return all 4 required fields (message_id, consumer,
     # time_since_delivered, times_delivered) instead of just 2, matching Redis behavior
     "fakeredis[lua] @ git+https://github.com/zzstoatzz/fakeredis-py.git@fix-xpending-range-fields",
-    "ipython>=9.0.1",
+    "ipython>=8.0.0",
     "mypy>=1.14.1",
     "opentelemetry-distro>=0.51b0",
     "opentelemetry-exporter-otlp>=1.30.0",
@@ -81,14 +85,13 @@ allow-direct-references = true
 packages = ["src/docket"]
 
 [tool.ruff]
-target-version = "py312"
+target-version = "py310"
 
 [tool.pytest.ini_options]
 addopts = [
     "--numprocesses=logical",
     "--maxprocesses=4",
     "--cov=src/docket",
-    "--cov=tests",
     "--cov-report=term-missing",
     "--cov-branch",
 ]

src/docket/annotations.py

@@ -1,6 +1,8 @@
 import abc
 import inspect
-from typing import Any, Iterable, Mapping, Self
+from typing import Any, Iterable, Mapping
+
+from typing_extensions import Self
 
 from .instrumentation import CACHE_SIZE
 

src/docket/cli.py

@@ -25,15 +25,15 @@
 )
 
 
-class LogLevel(enum.StrEnum):
+class LogLevel(str, enum.Enum):
     DEBUG = "DEBUG"
     INFO = "INFO"
     WARNING = "WARNING"
     ERROR = "ERROR"
     CRITICAL = "CRITICAL"
 
 
-class LogFormat(enum.StrEnum):
+class LogFormat(str, enum.Enum):
     RICH = "rich"
     PLAIN = "plain"
     JSON = "json"
@@ -111,7 +111,7 @@ def set_logging_format(format: LogFormat) -> None:
 
 
 def set_logging_level(level: LogLevel) -> None:
-    logging.getLogger().setLevel(level)
+    logging.getLogger().setLevel(level.value)
 
 
 def handle_strike_wildcard(value: str) -> str | None:
@@ -347,7 +347,7 @@ def strike(
     value_ = interpret_python_value(value)
     if parameter:
         function_name = f"{function or '(all tasks)'}"
-        print(f"Striking {function_name} {parameter} {operator} {value_!r}")
+        print(f"Striking {function_name} {parameter} {operator.value} {value_!r}")
     else:
         print(f"Striking {function}")
 
@@ -436,7 +436,7 @@ def restore(
     value_ = interpret_python_value(value)
     if parameter:
         function_name = f"{function or '(all tasks)'}"
-        print(f"Restoring {function_name} {parameter} {operator} {value_!r}")
+        print(f"Restoring {function_name} {parameter} {operator.value} {value_!r}")
     else:
         print(f"Restoring {function}")
 

src/docket/dependencies.py

@@ -161,7 +161,7 @@ async def greet_customer(customer_id: int, name: str = Depends(customer_name)) -
 
 
 class _TaskLogger(Dependency):
-    async def __aenter__(self) -> logging.LoggerAdapter[logging.Logger]:
+    async def __aenter__(self) -> "logging.LoggerAdapter[logging.Logger]":
         execution = self.execution.get()
         logger = logging.getLogger(f"docket.task.{execution.function.__name__}")
         return logging.LoggerAdapter(
@@ -174,7 +174,7 @@ async def __aenter__(self) -> logging.LoggerAdapter[logging.Logger]:
         )
 
 
-def TaskLogger() -> logging.LoggerAdapter[logging.Logger]:
+def TaskLogger() -> "logging.LoggerAdapter[logging.Logger]":
     """A dependency to access a logger for the currently executing task.  The logger
     will automatically inject contextual information such as the worker and docket
     name, the task key, and the current execution attempt number.
@@ -183,11 +183,11 @@ def TaskLogger() -> logging.LoggerAdapter[logging.Logger]:
 
     ```python
     @task
-    async def my_task(logger: LoggerAdapter[Logger] = TaskLogger()) -> None:
+    async def my_task(logger: "LoggerAdapter[Logger]" = TaskLogger()) -> None:
         logger.info("Hello, world!")
     ```
     """
-    return cast(logging.LoggerAdapter[logging.Logger], _TaskLogger())
+    return cast("logging.LoggerAdapter[logging.Logger]", _TaskLogger())
 
 
 class ForcedRetry(Exception):

src/docket/docket.py

@@ -17,14 +17,15 @@
     NoReturn,
     ParamSpec,
     Protocol,
-    Self,
     Sequence,
     TypedDict,
     TypeVar,
     cast,
     overload,
 )
 
+from typing_extensions import Self
+
 import redis.exceptions
 from opentelemetry import propagate, trace
 from redis.asyncio import ConnectionPool, Redis

src/docket/execution.py

@@ -3,16 +3,9 @@
 import inspect
 import logging
 from datetime import datetime
-from typing import (
-    Any,
-    Awaitable,
-    Callable,
-    Hashable,
-    Literal,
-    Mapping,
-    Self,
-    cast,
-)
+from typing import Any, Awaitable, Callable, Hashable, Literal, Mapping, cast
+
+from typing_extensions import Self
 
 import cloudpickle  # type: ignore[import]
 import opentelemetry.context
@@ -35,6 +28,12 @@ def get_signature(function: Callable[..., Any]) -> inspect.Signature:
         CACHE_SIZE.set(len(_signature_cache), {"cache": "signature"})
         return _signature_cache[function]
 
+    signature_attr = getattr(function, "__signature__", None)
+    if isinstance(signature_attr, inspect.Signature):
+        _signature_cache[function] = signature_attr
+        CACHE_SIZE.set(len(_signature_cache), {"cache": "signature"})
+        return signature_attr
+
     signature = inspect.signature(function)
     _signature_cache[function] = signature
     CACHE_SIZE.set(len(_signature_cache), {"cache": "signature"})
@@ -161,7 +160,7 @@ def compact_signature(signature: inspect.Signature) -> str:
     return ", ".join(parameters)
 
 
-class Operator(enum.StrEnum):
+class Operator(str, enum.Enum):
     EQUAL = "=="
     NOT_EQUAL = "!="
     GREATER_THAN = ">"

src/docket/instrumentation.py

@@ -193,7 +193,14 @@ def metrics_server(
         yield
         return
 
-    from wsgiref.types import WSGIApplication
+    import sys
+    from typing import Any
+
+    # wsgiref.types was added in Python 3.11
+    if sys.version_info >= (3, 11):  # pragma: no cover
+        from wsgiref.types import WSGIApplication
+    else:  # pragma: no cover
+        WSGIApplication = Any  # type: ignore[misc,assignment]
 
     from prometheus_client import REGISTRY
     from prometheus_client.exposition import (

src/docket/tasks.py

@@ -16,7 +16,7 @@
 
 async def trace(
     message: str,
-    logger: logging.LoggerAdapter[logging.Logger] = TaskLogger(),
+    logger: "logging.LoggerAdapter[logging.Logger]" = TaskLogger(),
     docket: Docket = CurrentDocket(),
     worker: Worker = CurrentWorker(),
     execution: Execution = CurrentExecution(),
@@ -46,7 +46,7 @@ async def fail(
 
 
 async def sleep(
-    seconds: float, logger: logging.LoggerAdapter[logging.Logger] = TaskLogger()
+    seconds: float, logger: "logging.LoggerAdapter[logging.Logger]" = TaskLogger()
 ) -> None:
     logger.info("Sleeping for %s seconds", seconds)
     await asyncio.sleep(seconds)

src/docket/worker.py

@@ -6,13 +6,12 @@
 import time
 from datetime import datetime, timedelta, timezone
 from types import TracebackType
-from typing import (
-    Coroutine,
-    Mapping,
-    Protocol,
-    Self,
-    cast,
-)
+from typing import Coroutine, Mapping, Protocol, cast
+
+if sys.version_info < (3, 11):  # pragma: no cover
+    from exceptiongroup import ExceptionGroup
+
+from typing_extensions import Self
 
 from opentelemetry import trace
 from opentelemetry.trace import Status, StatusCode, Tracer
@@ -167,16 +166,18 @@ async def run(
                 for task_path in tasks:
                     docket.register_collection(task_path)
 
-                async with Worker(
-                    docket=docket,
-                    name=name,
-                    concurrency=concurrency,
-                    redelivery_timeout=redelivery_timeout,
-                    reconnection_delay=reconnection_delay,
-                    minimum_check_interval=minimum_check_interval,
-                    scheduling_resolution=scheduling_resolution,
-                    schedule_automatic_tasks=schedule_automatic_tasks,
-                ) as worker:
+                async with (
+                    Worker(  # pragma: no branch - context manager exit varies across interpreters
+                        docket=docket,
+                        name=name,
+                        concurrency=concurrency,
+                        redelivery_timeout=redelivery_timeout,
+                        reconnection_delay=reconnection_delay,
+                        minimum_check_interval=minimum_check_interval,
+                        scheduling_resolution=scheduling_resolution,
+                        schedule_automatic_tasks=schedule_automatic_tasks,
+                    ) as worker
+                ):
                     if until_finished:
                         await worker.run_until_finished()
                     else: