3.8 is EOL

CHANGELOG.md

@@ -15,6 +15,16 @@ You can find our backwards-compatibility policy [here](https://github.com/hynek/
 
 ## [Unreleased](https://github.com/hynek/svcs/compare/24.1.0...HEAD)
 
+### Added
+
+- Python 3.13 support.
+
+
+### Removed
+
+- Python 3.8 support.
+
+
 ### Changed
 
 - Flask: The registry is now stored on `app.extensions`, not `app.config`.

docs/examples/fastapi/simple_fastapi_app.py

@@ -2,7 +2,7 @@
 
 import os
 
-from typing import AsyncGenerator
+from collections.abc import AsyncGenerator
 
 from fastapi import FastAPI
 

docs/examples/starlette/simple_starlette_app.py

@@ -2,7 +2,7 @@
 
 import os
 
-from typing import AsyncGenerator
+from collections.abc import AsyncGenerator
 
 from starlette.applications import Starlette
 from starlette.middleware import Middleware

pyproject.toml

@@ -11,13 +11,12 @@ build-backend = "hatchling.build"
 dynamic = ["version", "readme"]
 name = "svcs"
 description = "A Flexible Service Locator"
-requires-python = ">=3.8"
 license = "MIT"
 authors = [{ name = "Hynek Schlawack", email = "[email protected]" }]
+requires-python = ">=3.9"
 classifiers = [
   "Development Status :: 5 - Production/Stable",
   "License :: OSI Approved :: MIT License",
-  "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
@@ -30,12 +29,7 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-tests = [
-  "pytest",
-  "pytest-asyncio",
-  "sybil>=6",
-  "typing-extensions; python_version<'3.9'",
-]
+tests = ["pytest", "pytest-asyncio", "sybil>=6"]
 typing = ["mypy>=1.4", "fastapi", "flask", "starlette", "aiohttp", "pyramid"]
 docs = [
   "sphinx>=7.2.2",

src/svcs/_core.py

@@ -8,7 +8,7 @@
 import logging
 import warnings
 
-from collections.abc import Callable
+from collections.abc import Awaitable, Callable
 from contextlib import (
     AbstractAsyncContextManager,
     AbstractContextManager,
@@ -24,7 +24,7 @@
     isgeneratorfunction,
 )
 from types import TracebackType
-from typing import Any, Awaitable, TypeVar, overload
+from typing import Any, TypeVar, overload
 
 import attrs
 

src/svcs/fastapi.py

@@ -6,9 +6,9 @@
 
 import contextlib
 import inspect
-import sys
 
-from typing import AsyncGenerator, Callable
+from collections.abc import AsyncGenerator
+from typing import Annotated, Callable
 
 import attrs
 
@@ -19,12 +19,6 @@
 from svcs._core import _KEY_REGISTRY
 
 
-if sys.version_info < (3, 9):
-    from typing_extensions import Annotated
-else:
-    from typing import Annotated
-
-
 @attrs.define
 class lifespan:  # noqa: N801
     """

src/svcs/starlette.py

@@ -7,7 +7,8 @@
 import contextlib
 import inspect
 
-from typing import Any, AsyncGenerator, Callable, overload
+from collections.abc import AsyncGenerator
+from typing import Any, Callable, overload
 
 import attrs
 

tests/helpers.py

@@ -2,13 +2,8 @@
 #
 # SPDX-License-Identifier: MIT
 
-import sys
 
-
-if sys.version_info >= (3, 9):
-    from typing import Annotated
-else:
-    from typing_extensions import Annotated  # noqa: F401
+from typing import Annotated  # noqa: F401
 
 
 def nop(*_, **__):

tests/test_fake_factories.py

@@ -8,7 +8,7 @@
 
 import sys
 
-from typing import AsyncGenerator, Generator
+from collections.abc import AsyncGenerator, Generator
 
 import pytest
 

tests/typing/aiohttp.py

@@ -2,7 +2,8 @@
 #
 # SPDX-License-Identifier: MIT
 
-from typing import Generator, Protocol
+from collections.abc import Generator
+from typing import Protocol
 
 from aiohttp.web import Application, Request
 

tests/typing/core.py

@@ -5,7 +5,8 @@
 import contextlib
 import sys
 
-from typing import AsyncGenerator, Generator, NewType, Protocol
+from collections.abc import AsyncGenerator, Generator
+from typing import NewType, Protocol
 
 import svcs
 

tests/typing/fastapi.py

@@ -4,23 +4,16 @@
 
 from __future__ import annotations
 
-import sys
-
+from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager
-from typing import AsyncGenerator
+from typing import Annotated
 
 from fastapi import Depends, FastAPI
 from fastapi.responses import JSONResponse
 
 import svcs
 
 
-if sys.version_info < (3, 9):
-    from typing_extensions import Annotated
-else:
-    from typing import Annotated
-
-
 @svcs.fastapi.lifespan
 async def lifespan(
     app: FastAPI, registry: svcs.Registry

tests/typing/flask.py

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-from typing import Generator
+from collections.abc import Generator
 
 import flask
 

tests/typing/pyramid.py

@@ -4,7 +4,7 @@
 
 from __future__ import annotations
 
-from typing import Generator
+from collections.abc import Generator
 
 import pyramid
 

tests/typing/starlette.py

@@ -4,8 +4,9 @@
 
 from __future__ import annotations
 
+from collections.abc import AsyncGenerator, Generator
 from contextlib import asynccontextmanager
-from typing import AsyncGenerator, Generator, Protocol
+from typing import Protocol
 
 from starlette.applications import Starlette
 from starlette.middleware import Middleware

tox.ini

@@ -9,8 +9,8 @@ env_list =
     docs,
     mypy-pkg,
     pyright,
-    py3{8,9,10,11,12,13}-mypy
-    py3{8,9,10,11,12,13}-tests{,-optional},
+    py3{9,10,11,12,13}-mypy
+    py3{9,10,11,12,13}-tests{,-optional},
     coverage-report