wireup 2.9.0__tar.gz → 2.11.0__tar.gz

{wireup-2.9.0 → wireup-2.11.0}/.github/contributing.md

@@ -38,7 +38,7 @@ make lint test
 
 ## Guidelines
 
-- **Python Support**: Target Python 3.8+ compatibility
+- **Python Support**: Target Python 3.10+ compatibility
 - **Dependencies**: No new dependencies without approval
 - **Documentation**: Update docs for user-facing changes
 - **Testing**: Maintain test coverage for new code

{wireup-2.9.0 → wireup-2.11.0}/.github/workflows/run_all.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.8"
+          python-version: "3.10"
       - name: Install uv
         uses: astral-sh/setup-uv@v5
       - name: Install dependencies
@@ -46,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}

{wireup-2.9.0 → wireup-2.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wireup
-Version: 2.9.0
+Version: 2.11.0
 Summary: Python Dependency Injection Library
 Project-URL: Homepage, https://github.com/maldoinc/wireup
 Project-URL: Repository, https://github.com/maldoinc/wireup
@@ -21,8 +21,6 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -30,7 +28,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Requires-Dist: typing-extensions>=4.7
 Provides-Extra: eval-type
 Requires-Dist: eval-type-backport>=0.2.0; (python_version < '3.11') and extra == 'eval-type'
@@ -67,7 +65,7 @@ Reuse the same application code in APIs, CLIs, workers, and scripts without rewr
 </td>
 <td align="center" valign="top" width="33%">
 <h3>✅ Correct by Default</h3>
-If the container starts, your dependency graph is valid. Wireup checks for missing or misconfigured dependencies to avoid surprises at runtime.
+If the container starts, your dependency graph is valid. Wireup checks for missing or misconfigured dependencies to avoid surprises at runtime. See <a href="https://maldoinc.github.io/wireup/latest/what_wireup_validates/">What Wireup Validates</a>
 </td>
 <td align="center" valign="top" width="33%">
 <h3>🌐 Framework-Ready</h3>
@@ -83,8 +81,7 @@ Resolve singleton constructor dependencies once at startup in <a href="https://m
 <h3>🧩 Advanced Wiring</h3>
 Go beyond simple constructor injection with
 <a href="https://maldoinc.github.io/wireup/latest/reusable_bundles/">reusable bundles</a>,
-<a href="https://maldoinc.github.io/wireup/latest/lifetimes_and_scopes/">explicit scope context sharing</a>, and
-more using plain Python.
+<a href="https://maldoinc.github.io/wireup/latest/lifetimes_and_scopes/">explicit scope context sharing</a>, <a href="https://maldoinc.github.io/wireup/latest/interfaces/#collection-injection">collection injection</a>, and more using plain Python.
 </td>
 <td align="center" valign="top">
 <h3>🧪 Easy to test</h3>
@@ -311,7 +308,7 @@ class OrderProcessor:
 
 ### 🛡️ Startup Validation
 
-Wireup validates the dependency graph when the container is created.
+Wireup validates the dependency graph when the container is created. See <a href="https://maldoinc.github.io/wireup/latest/what_wireup_validates/">What Wireup Validates</a> for the full rules and limits.
 
 ```python
 # Missing dependencies: caught at startup, not at runtime

{wireup-2.9.0 → wireup-2.11.0}/benchmarks/bench_runner.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 # /// script
 # dependencies = [
 #     "rich==14.2.0",
@@ -35,7 +37,7 @@ import urllib.error
 import urllib.request
 from contextlib import suppress
 from io import StringIO
-from typing import Any, Callable, Dict, List, Optional, TextIO, Tuple
+from typing import TYPE_CHECKING, Any, TextIO
 
 import psutil
 from rich.console import Console, Group
@@ -44,6 +46,9 @@ from rich.panel import Panel
 from rich.text import Text
 from rich.table import Table
 
+if TYPE_CHECKING:
+    from collections.abc import Callable
+
 # Configuration
 PROJECTS = {
     "globals": "Manual Wiring (No DI)",
@@ -68,8 +73,8 @@ SERVER_LOG = "benchmarks/server.log"
 HEY_BIN = "hey"
 STARTUP_TIMEOUT_S = 20.0
 STARTUP_POLL_INTERVAL_S = 0.1
-BenchIteration = Dict[str, Any]
-BenchResult = Dict[str, Any]
+BenchIteration = dict[str, Any]
+BenchResult = dict[str, Any]
 TIMING_COLUMNS = [
     ("response-time", "latency"),
 ]
@@ -130,7 +135,7 @@ def get_free_port() -> int:
         return s.getsockname()[1]
 
 
-def resolve_repo_paths() -> Tuple[str, str]:
+def resolve_repo_paths() -> tuple[str, str]:
     benchmarks_dir = os.path.dirname(os.path.abspath(__file__))
     repo_root = os.path.dirname(benchmarks_dir)
     return repo_root, benchmarks_dir
@@ -138,7 +143,7 @@ def resolve_repo_paths() -> Tuple[str, str]:
 
 def build_runner_env(
     project: str, bench_assert: bool, use_local_version: bool, repo_root: str, benchmarks_dir: str
-) -> Dict[str, str]:
+) -> dict[str, str]:
     env = os.environ.copy()
     env["PROJECT"] = project
     if bench_assert:
@@ -178,7 +183,7 @@ def wait_for_server_ready(process: subprocess.Popen[Any], port: int, timeout_s:
     raise TimeoutError(msg)
 
 
-def start_server(port: int, env: Dict[str, str], benchmarks_dir: str, log_file: TextIO) -> subprocess.Popen[Any]:
+def start_server(port: int, env: dict[str, str], benchmarks_dir: str, log_file: TextIO) -> subprocess.Popen[Any]:
     cmd = [sys.executable, "-m", "uvicorn", "wireup_benchmarks.app:app", "--port", str(port)]
     log_file.flush()
     process = subprocess.Popen(
@@ -201,7 +206,7 @@ def start_server(port: int, env: Dict[str, str], benchmarks_dir: str, log_file:
     return process
 
 
-def percentile(values: List[float], p: float) -> float:
+def percentile(values: list[float], p: float) -> float:
     if not values:
         return 0.0
     if p <= 0:
@@ -216,7 +221,7 @@ def percentile(values: List[float], p: float) -> float:
     return values[lo] + (values[hi] - values[lo]) * (idx - lo)
 
 
-def compute_series_stats_ms(values_seconds: List[float]) -> Dict[str, float]:
+def compute_series_stats_ms(values_seconds: list[float]) -> dict[str, float]:
     if not values_seconds:
         return {
             "p50_ms": 0.0,
@@ -238,7 +243,7 @@ def compute_series_stats_ms(values_seconds: List[float]) -> Dict[str, float]:
 
 def monitor_memory_usage(
     process: psutil.Process, stop_event: threading.Event, sample_interval_s: float = 0.02
-) -> Dict[str, float]:
+) -> dict[str, float]:
     rss_peak = 0.0
 
     while not stop_event.is_set():
@@ -252,9 +257,9 @@ def monitor_memory_usage(
     return {"rss_peak_mb": rss_peak}
 
 
-def run_load_test(url: str, total_requests: int, concurrency: int) -> Dict[str, Any]:
-    latencies: List[float] = []
-    status_codes: List[int] = []
+def run_load_test(url: str, total_requests: int, concurrency: int) -> dict[str, Any]:
+    latencies: list[float] = []
+    status_codes: list[int] = []
 
     cmd = [HEY_BIN, "-n", str(total_requests), "-c", str(concurrency), "-o", "csv", url]
     start_global = time.perf_counter()
@@ -310,7 +315,7 @@ def run_load_test(url: str, total_requests: int, concurrency: int) -> Dict[str,
     }
 
 
-def assert_workload(port: int) -> Tuple[bool, Dict[str, Any]]:
+def assert_workload(port: int) -> tuple[bool, dict[str, Any]]:
     url = f"http://127.0.0.1:{port}/assert-workload"
     try:
         with urllib.request.urlopen(url) as response:  # noqa: S310
@@ -333,7 +338,7 @@ def run_benchmark(
     warmup_requests: int,
     use_local_version: bool,
     bench_assert: bool,
-) -> Optional[BenchIteration]:
+) -> BenchIteration | None:
     print(f"--- Benchmarking {project} - {test_name} ---")
 
     # Start Server
@@ -360,7 +365,7 @@ def run_benchmark(
 
         # Run single measured load test
         stop_event = threading.Event()
-        monitor_result: Dict[str, float] = {"rss_peak_mb": 0.0}
+        monitor_result: dict[str, float] = {"rss_peak_mb": 0.0}
 
         def sample_memory() -> None:
             nonlocal monitor_result
@@ -422,7 +427,7 @@ def run_benchmark(
 def summarize_runs(
     project_id: str,
     test_name: str,
-    runs: List[BenchIteration],
+    runs: list[BenchIteration],
     runs_completed: int,
     runs_total: int,
 ) -> BenchResult:
@@ -502,10 +507,10 @@ def main() -> None:
     completed_runs = 0
     benchmark_start = time.perf_counter()
 
-    all_results: List[BenchResult] = []
+    all_results: list[BenchResult] = []
     fieldnames = SUMMARY_FIELDNAMES
     run_fieldnames = RUN_FIELDNAMES
-    run_state: Dict[Tuple[str, str], List[BenchIteration]] = {pair: [] for pair in pairs}
+    run_state: dict[tuple[str, str], list[BenchIteration]] = {pair: [] for pair in pairs}
 
     # Ensure output directory exists
     output_dir = os.path.dirname(args.output)
@@ -525,7 +530,7 @@ def main() -> None:
 
     console = Console()
 
-    def build_table(title: str, results: List[BenchResult]) -> Optional[Table]:
+    def build_table(title: str, results: list[BenchResult]) -> Table | None:
         if not results:
             return None
 
@@ -557,7 +562,7 @@ def main() -> None:
 
         return table
 
-    in_progress: Dict[Tuple[str, str], BenchResult] = {}
+    in_progress: dict[tuple[str, str], BenchResult] = {}
     current_iteration_line = ""
     current_iteration_progress = ""
 
@@ -581,7 +586,7 @@ def main() -> None:
             f"Elapsed: {format_duration(elapsed)}  ETA: {format_duration(eta)}"
         )
 
-        parts: List[Any] = []
+        parts: list[Any] = []
         parts.append(Panel(progress, title="Progress", expand=False))
         singleton_table = build_table("Benchmark Results - Singleton (So Far)", singleton_results)
         scoped_table = build_table("Benchmark Results - Scoped (So Far)", scoped_results)
@@ -642,7 +647,7 @@ def main() -> None:
                     bench_assert=args.bench_assert,
                 )
                 if res:
-                    run_row: Dict[str, Any] = dict.fromkeys(run_fieldnames, "")
+                    run_row: dict[str, Any] = dict.fromkeys(run_fieldnames, "")
                     run_row.update(
                         {
                             "project_id": project_id,

{wireup-2.9.0 → wireup-2.11.0}/benchmarks/generate_charts.py

@@ -7,7 +7,7 @@ import argparse
 import csv
 import os
 from collections import defaultdict
-from typing import DefaultDict, Dict, List, TypedDict
+from typing import TypedDict
 
 import matplotlib.pyplot as plt
 
@@ -23,9 +23,9 @@ class ChartItem(TypedDict):
     rps: float
 
 
-def load_data(csv_path: str) -> Dict[str, List[ChartItem]]:
+def load_data(csv_path: str) -> dict[str, list[ChartItem]]:
     """Loads CSV data and returns a dict grouped by test type."""
-    data_by_test: DefaultDict[str, List[ChartItem]] = defaultdict(list)
+    data_by_test: defaultdict[str, list[ChartItem]] = defaultdict(list)
 
     with open(csv_path, encoding="utf-8") as f:
         reader = csv.DictReader(f)
@@ -40,7 +40,7 @@ def load_data(csv_path: str) -> Dict[str, List[ChartItem]]:
     return data_by_test
 
 
-def create_chart(title: str, data: List[ChartItem], filename: str, text_color: str = "black") -> None:
+def create_chart(title: str, data: list[ChartItem], filename: str, text_color: str = "black") -> None:
     if not data:
         return
 
@@ -62,7 +62,7 @@ def create_chart(title: str, data: List[ChartItem], filename: str, text_color: s
     bars = ax.barh(names, rps_values, color=colors, height=0.6)  # Slightly thinner bars
 
     # Make "Manual Wiring (No DI)" visually distinct: outline + diagonal hatch.
-    for bar, item in zip(bars, data):
+    for bar, item in zip(bars, data, strict=False):
         if item["name"].lower().startswith("globals"):
             outline = "#cecece" if text_color == "black" else "#cecece"
             bar.set_facecolor("none")
@@ -88,7 +88,7 @@ def create_chart(title: str, data: List[ChartItem], filename: str, text_color: s
     ax.set_xlim(0, max_rps + label_pad * 8)
 
     # Add value labels
-    for bar, item in zip(bars, data):
+    for bar, item in zip(bars, data, strict=False):
         width = bar.get_width()
         is_wireup = "wireup" in item["name"].lower()
 

{wireup-2.9.0 → wireup-2.11.0}/benchmarks/generate_versions.py

@@ -1,18 +1,17 @@
 import re
 import os
-from typing import List
 
 # Configuration
 RUNNER_PATH = "benchmarks/bench_runner.py"
 DOCS_PATH = "docs/pages/benchmarks.md"
 
 
-def extract_versions() -> List[str]:
+def extract_versions() -> list[str]:
     with open(RUNNER_PATH, "r") as f:
         content = f.read()
 
     lines = content.splitlines()
-    dep_lines: List[str] = []
+    dep_lines: list[str] = []
     in_deps = False
 
     for line in lines:

{wireup-2.9.0 → wireup-2.11.0}/benchmarks/wireup_benchmarks/aioinject_setup.py

@@ -1,5 +1,4 @@
 import contextlib
-from typing import Dict
 
 import aioinject
 import fastapi
@@ -28,7 +27,7 @@ router = fastapi.APIRouter()
 
 @router.get("/aioinject/singleton")
 @inject
-async def wireup_singleton(a: Injected[A], b: Injected[B]) -> Dict[str, str]:
+async def wireup_singleton(a: Injected[A], b: Injected[B]) -> dict[str, str]:
     services.record_request("singleton")
     assert a.start == 10
     assert isinstance(a, A)
@@ -49,7 +48,7 @@ async def wireup_scoped(
     g: Injected[G],
     h: Injected[H],
     i: Injected[I],
-) -> Dict[str, str]:
+) -> dict[str, str]:
     services.record_request("scoped")
     assert isinstance(c, C)
     assert c is cc

{wireup-2.9.0 → wireup-2.11.0}/benchmarks/wireup_benchmarks/dependency_injector_setup.py

@@ -1,10 +1,10 @@
-from typing import Any, Dict
+from typing import Any
 
 import fastapi
 from dependency_injector import containers, providers
 from dependency_injector.wiring import Provide, inject
 from fastapi import Depends
-from typing_extensions import Annotated
+from typing import Annotated
 
 from wireup_benchmarks import services
 
@@ -34,7 +34,7 @@ router = fastapi.APIRouter()
 async def dependency_injector_singleton(
     a: Annotated[services.A, Depends(Provide[Container.a])],
     b: Annotated[services.B, Depends(Provide[Container.b])],
-) -> Dict[str, Any]:
+) -> dict[str, Any]:
     services.record_request("singleton")
     assert a.start == 10
     assert isinstance(a, services.A)
@@ -55,7 +55,7 @@ async def dependency_injector_scoped(
     g: Annotated[services.G, Depends(Provide[Container.g])],
     h: Annotated[services.H, Depends(Provide[Container.h])],
     i: Annotated[services.I, Depends(Provide[Container.i])],
-) -> Dict[str, Any]:
+) -> dict[str, Any]:
     services.record_request("scoped")
     assert isinstance(c, services.C)
     assert c is cc

{wireup-2.9.0 → wireup-2.11.0}/benchmarks/wireup_benchmarks/dishka_setup.py

@@ -1,5 +1,3 @@
-from typing import Dict
-
 import dishka
 import fastapi
 from dishka.integrations.fastapi import FromDishka, inject
@@ -24,7 +22,7 @@ router = fastapi.APIRouter()
 
 @router.get("/dishka/singleton")
 @inject
-async def dishka_singleton(a: FromDishka[A], b: FromDishka[B]) -> Dict[str, str]:
+async def dishka_singleton(a: FromDishka[A], b: FromDishka[B]) -> dict[str, str]:
     services.record_request("singleton")
     assert a.start == 10
     assert isinstance(a, A)
@@ -45,7 +43,7 @@ async def dishka_scoped(
     g: FromDishka[G],
     h: FromDishka[H],
     i: FromDishka[I],
-) -> Dict[str, str]:
+) -> dict[str, str]:
     services.record_request("scoped")
     assert isinstance(c, C)
     assert c is cc

{wireup-2.9.0 → wireup-2.11.0}/benchmarks/wireup_benchmarks/diwire_setup.py

@@ -1,5 +1,3 @@
-from typing import Dict
-
 import fastapi
 from diwire import Container, Injected, Lifetime, Scope, resolver_context
 
@@ -24,7 +22,7 @@ router = fastapi.APIRouter()
 
 @router.get("/diwire/singleton")
 @resolver_context.inject(scope=Scope.REQUEST)
-async def diwire_singleton(a: Injected[A], b: Injected[B]) -> Dict[str, str]:
+async def diwire_singleton(a: Injected[A], b: Injected[B]) -> dict[str, str]:
     services.record_request("singleton")
     assert a.start == 10
     assert isinstance(a, A)
@@ -45,7 +43,7 @@ async def diwire_scoped(
     g: Injected[G],
     h: Injected[H],
     i: Injected[I],
-) -> Dict[str, str]:
+) -> dict[str, str]:
     services.record_request("scoped")
     assert isinstance(c, C)
     assert c is cc

{wireup-2.9.0 → wireup-2.11.0}/benchmarks/wireup_benchmarks/fastapi_setup.py

@@ -1,8 +1,8 @@
 from functools import lru_cache
-from typing import AsyncIterator, Dict, Iterator
+from collections.abc import AsyncIterator, Iterator
 
 import fastapi
-from typing_extensions import Annotated
+from typing import Annotated
 
 from wireup_benchmarks import services
 from wireup_benchmarks.services import A, B, C, D, E, F, G, H, I, Settings, make_h, make_i
@@ -74,7 +74,7 @@ router = fastapi.APIRouter()
 @router.get("/fastapi/singleton")
 async def fastapi_singleton(
     a: Annotated[A, fastapi.Depends(get_a)], b: Annotated[B, fastapi.Depends(get_b)]
-) -> Dict[str, str]:
+) -> dict[str, str]:
     services.record_request("singleton")
     assert a.start == 10
     assert isinstance(a, A)
@@ -94,7 +94,7 @@ async def fastapi_scoped(
     g: Annotated[G, fastapi.Depends(get_g)],
     h: Annotated[H, fastapi.Depends(get_h)],
     i: Annotated[I, fastapi.Depends(get_i)],
-) -> Dict[str, str]:
+) -> dict[str, str]:
     services.record_request("scoped")
     assert isinstance(c, C)
     assert c is cc

{wireup-2.9.0 → wireup-2.11.0}/benchmarks/wireup_benchmarks/globals_setup.py

@@ -1,5 +1,4 @@
 import contextlib
-from typing import Dict
 
 import fastapi
 
@@ -15,7 +14,7 @@ router = fastapi.APIRouter()
 
 
 @router.get("/globals/singleton")
-async def fastapi_singleton() -> Dict[str, str]:
+async def fastapi_singleton() -> dict[str, str]:
     services.record_request("singleton")
     assert a.start == 10
     assert isinstance(a, A)
@@ -24,7 +23,7 @@ async def fastapi_singleton() -> Dict[str, str]:
 
 
 @router.get("/globals/scoped")
-async def globals_scoped() -> Dict[str, str]:
+async def globals_scoped() -> dict[str, str]:
     services.record_request("scoped")
     c = C()
     d = D(c=c)

{wireup-2.9.0 → wireup-2.11.0}/benchmarks/wireup_benchmarks/injector_setup.py

@@ -1,5 +1,3 @@
-from typing import Dict
-
 import fastapi
 from fastapi_injector import (
     Injected,
@@ -87,7 +85,7 @@ def setup_injector(app: fastapi.FastAPI) -> None:
 async def injector_singleton(
     a: A = Injected(A),
     b: B = Injected(B),
-) -> Dict[str, str]:
+) -> dict[str, str]:
     services.record_request("singleton")
     assert a.start == 10
     assert isinstance(a, A)
@@ -107,7 +105,7 @@ async def injector_scoped(
     g: G = Injected(G),
     h: H = Injected(H),
     i: I = Injected(I),
-) -> Dict[str, str]:
+) -> dict[str, str]:
     services.record_request("scoped")
     assert isinstance(c, C)
     assert c is cc

{wireup-2.9.0 → wireup-2.11.0}/benchmarks/wireup_benchmarks/lagom_setup.py

@@ -1,4 +1,4 @@
-from typing import Dict, Iterator
+from collections.abc import Iterator
 
 import fastapi
 from lagom import Container, Singleton, context_dependency_definition
@@ -43,7 +43,7 @@ deps = FastApiIntegration(container, request_singletons=[C, D, E, F, G], request
 async def lagom_singleton(
     a=deps.depends(A),
     b=deps.depends(B),
-) -> Dict[str, str]:
+) -> dict[str, str]:
     services.record_request("singleton")
     assert a.start == 10
     assert isinstance(a, A)
@@ -63,7 +63,7 @@ async def lagom_scoped(
     g=deps.depends(G),
     h=deps.depends(H),
     i=deps.depends(I),
-) -> Dict[str, str]:
+) -> dict[str, str]:
     services.record_request("scoped")
     assert isinstance(c, C)
     assert c is cc

{wireup-2.9.0 → wireup-2.11.0}/benchmarks/wireup_benchmarks/services.py

@@ -8,9 +8,9 @@ to avoid code duplication.
 import os
 from dataclasses import dataclass
 from threading import Lock
-from typing import AsyncIterator, Dict, Iterator, Optional, Tuple
+from collections.abc import AsyncIterator, Iterator
 
-_COUNTERS: Dict[str, int] = {}
+_COUNTERS: dict[str, int] = {}
 _COUNTER_LOCK = Lock()
 _ASSERT_ENABLED = os.getenv("BENCH_ASSERT") == "1"
 
@@ -38,7 +38,7 @@ def record_exit(name: str) -> None:
     _inc(f"exit.{name}")
 
 
-def get_counters() -> Dict[str, int]:
+def get_counters() -> dict[str, int]:
     if not _ASSERT_ENABLED:
         return {}
     with _COUNTER_LOCK:
@@ -52,8 +52,8 @@ def reset_counters() -> None:
         _COUNTERS.clear()
 
 
-def _expected_counts(requests_singleton: int, requests_scoped: int) -> Dict[str, int]:
-    expected: Dict[str, int] = {}
+def _expected_counts(requests_singleton: int, requests_scoped: int) -> dict[str, int]:
+    expected: dict[str, int] = {}
     singleton_expected = 1 if requests_singleton > 0 else 0
     for name in ("Settings", "A", "B"):
         expected[f"create.{name}"] = singleton_expected
@@ -69,8 +69,8 @@ def _expected_counts(requests_singleton: int, requests_scoped: int) -> Dict[str,
 
 
 def assert_workload(
-    overrides: Optional[Dict[str, int]] = None,
-) -> Tuple[bool, Dict[str, int], Dict[str, int], Dict[str, int]]:
+    overrides: dict[str, int] | None = None,
+) -> tuple[bool, dict[str, int], dict[str, int], dict[str, int]]:
     if not _ASSERT_ENABLED:
         return True, {}, {}, {}
     counters = get_counters()
@@ -79,7 +79,7 @@ def assert_workload(
     expected = _expected_counts(requests_singleton, requests_scoped)
     if overrides:
         expected.update(overrides)
-    mismatches: Dict[str, int] = {}
+    mismatches: dict[str, int] = {}
     singleton_create_keys = {"create.Settings", "create.A", "create.B"}
     for key, expected_value in expected.items():
         actual_value = counters.get(key, 0)

{wireup-2.9.0 → wireup-2.11.0}/benchmarks/wireup_benchmarks/svcs_setup.py

@@ -1,5 +1,4 @@
 from contextlib import asynccontextmanager
-from typing import Dict
 
 import fastapi
 import svcs
@@ -131,7 +130,7 @@ lifespan = svcs.fastapi.lifespan(_lifespan, registry=registry)
 
 
 @router.get("/svcs/singleton")
-async def svcs_singleton(container: DepContainer) -> Dict[str, str]:
+async def svcs_singleton(container: DepContainer) -> dict[str, str]:
     services.record_request("singleton")
     a = container.get(A)
     b = container.get(B)
@@ -143,7 +142,7 @@ async def svcs_singleton(container: DepContainer) -> Dict[str, str]:
 
 
 @router.get("/svcs/scoped")
-async def svcs_scoped(container: DepContainer) -> Dict[str, str]:
+async def svcs_scoped(container: DepContainer) -> dict[str, str]:
     services.record_request("scoped")
     c = container.get(C)
     cc = container.get(C)

{wireup-2.9.0 → wireup-2.11.0}/benchmarks/wireup_benchmarks/that_depends_setup.py

@@ -1,4 +1,4 @@
-from typing_extensions import Annotated
+from typing import Annotated
 
 from fastapi import APIRouter, Depends
 from that_depends import BaseContainer, providers

{wireup-2.9.0 → wireup-2.11.0}/benchmarks/wireup_benchmarks/wireup_cbr_setup.py

@@ -1,5 +1,3 @@
-from typing import Dict
-
 import fastapi
 from wireup import Injected
 from wireup.integration.fastapi import WireupRoute
@@ -17,7 +15,7 @@ class WireupSingletonBenchController:
         self.b = b
 
     @router.get("/singleton")
-    async def wireup_singleton(self) -> Dict[str, str]:
+    async def wireup_singleton(self) -> dict[str, str]:
         services.record_request("singleton")
         assert self.a.start == 10
         assert isinstance(self.a, A)
@@ -41,7 +39,7 @@ class WireupScopedBenchController:
         g: Injected[G],
         h: Injected[H],
         i: Injected[I],
-    ) -> Dict[str, str]:
+    ) -> dict[str, str]:
         services.record_request("scoped")
         assert isinstance(c, C)
         assert c is cc

{wireup-2.9.0 → wireup-2.11.0}/benchmarks/wireup_benchmarks/wireup_setup.py

@@ -1,5 +1,3 @@
-from typing import Dict
-
 import fastapi
 import wireup
 from wireup import Injected
@@ -27,7 +25,7 @@ container = wireup.create_async_container(
 
 
 @router.get("/wireup/singleton")
-async def wireup_singleton(a: Injected[A], b: Injected[B]) -> Dict[str, str]:
+async def wireup_singleton(a: Injected[A], b: Injected[B]) -> dict[str, str]:
     services.record_request("singleton")
     assert a.start == 10
     assert isinstance(a, A)
@@ -47,7 +45,7 @@ async def wireup_scoped(
     g: Injected[G],
     h: Injected[H],
     i: Injected[I],
-) -> Dict[str, str]:
+) -> dict[str, str]:
     services.record_request("scoped")
     assert isinstance(c, C)
     assert c is cc