Add language support for 3.10

- Drop 3.12 generics syntax
- Drop typing.Self
- Add matrix testing for 3.10-3.12 versions

Author: scottzach1

.github/actions/setup-poetry/action.yml

@@ -9,15 +9,6 @@ description: 'Setup Poetry Project'
 runs:
   using: 'composite'
   steps:
-    #----------------------------------------------
-    #       set-up python
-    #----------------------------------------------
-    - name: Set up python
-      id: setup-python
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.12'
-
     #----------------------------------------------
     #         install & configure poetry
     #----------------------------------------------

.github/workflows/pipeline.yml

@@ -20,6 +20,11 @@ jobs:
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
+      - name: Set up python
+        id: setup-python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
       - name: Setup Poetry
         uses: ./.github/actions/setup-poetry
       - name: Ruff (linting + formating)
@@ -45,9 +50,17 @@ jobs:
   pytest:
     runs-on: ubuntu-latest
     name: "Pytest Tests"
+    strategy:
+      matrix:
+        python-version: [ "3.10", "3.11", "3.12" ]
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
+      - name: Set up python
+        id: setup-python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
       - name: Setup Poetry
         uses: ./.github/actions/setup-poetry
       - name: Run Pytest

examples/simple_service/main.py

@@ -15,7 +15,7 @@ def do_stuff(self): ...
 # Define some providers to use for injection.
 ApiDomainProvider = providers.Blank()
 ApiTokenProvider = providers.Blank()
-ApiClientProvider = providers.Singleton[ApiClient](ApiClient, domain=ApiDomainProvider, token=ApiTokenProvider)
+ApiClientProvider = providers.Singleton(ApiClient, domain=ApiDomainProvider, token=ApiTokenProvider)
 
 
 @wiring.inject

pif/providers/existing_singleton.py

@@ -7,11 +7,16 @@
 #        Zac Scott (github.com/scottzach1)
 #
 #  https://github.com/scottzach1/python-injector-framework
+from typing import TypeVar
 
 from pif.providers.provider import Provider
 
+__all__ = ("ExistingSingleton",)
 
-class ExistingSingleton[T](Provider):
+T = TypeVar("T")
+
+
+class ExistingSingleton(Provider):
     """
     Provide an existing object instance.
     """

pif/providers/factory.py

@@ -9,20 +9,24 @@
 #  https://github.com/scottzach1/python-injector-framework
 
 import functools
-from typing import Callable
+from typing import Callable, TypeVar
 
 from pif.providers.provider import Provider
 from pif.providers.util import intercept_args
 
+__all__ = ("Factory",)
 
-class Factory[T](Provider):
+T = TypeVar("T")
+
+
+class Factory(Provider):
     """
     Generate a new instance every call.
     """
 
     __slots__ = ("_func", "_depends")
 
-    def __init__(self, func: Callable[[...], T], *args, **kwargs):
+    def __init__(self, func: Callable[..., T], *args, **kwargs):
         self._func = functools.partial(intercept_args(func), *args, **kwargs)
 
     def _evaluate(self) -> T:

pif/providers/provider.py

@@ -11,10 +11,15 @@
 from __future__ import annotations
 
 import abc
-from typing import Self
+from typing import Generic, TypeVar
 
+__all__ = ("Provider", "Override")
 
-class Provider[T](abc.ABC):
+T = TypeVar("T")
+U = TypeVar("U")
+
+
+class Provider(abc.ABC, Generic[T]):
     """
     Signposts something that can be injected.
     """
@@ -37,13 +42,13 @@ def _evaluate(self) -> T:
         """
         return self()
 
-    def override[U: Provider | None](self, provider: U) -> Override[U]:
+    def override(self, provider: Provider[U] | None) -> Override[Provider[U] | None]:
         """
         Override the current providers value with another provider.
         """
         return Override(self, provider)
 
-    def override_existing[U](self, value: U) -> Override[Provider[T]]:
+    def override_existing(self, value: U) -> Override[Provider[U]]:
         """
         Override the current provider with an existing singleton.
         """
@@ -52,21 +57,21 @@ def override_existing[U](self, value: U) -> Override[Provider[T]]:
         return self.override(ExistingSingleton(value))
 
 
-class Override[ProviderT: Provider]:
+class Override(Generic[T]):
     """
     A context manager to implement overrides for providers.
     """
 
     __slots__ = ("_base", "_override", "_before")
 
-    def __init__(self, base: Provider, override: ProviderT | None = None):
+    def __init__(self, base: Provider, override: Provider[T] | None = None):
         # noinspection PyProtectedMember
         self._before = base._override
         self._base = base
         self._override = override
         base._override = override
 
-    def __enter__(self) -> Self:
+    def __enter__(self) -> Override[T]:
         yield self
 
     def disable(self) -> None:

pif/providers/singleton.py

@@ -9,15 +9,18 @@
 #  https://github.com/scottzach1/python-injector-framework
 
 import functools
-from typing import Callable
+from typing import Callable, TypeVar
 
 from pif.providers.provider import Provider
 from pif.providers.util import intercept_args
 
+__all__ = ("Singleton",)
+
+T = TypeVar("T")
 UNSET = object()
 
 
-class Singleton[T](Provider):
+class Singleton(Provider[T]):
     """
     Provide a singleton instance.
 
@@ -26,7 +29,7 @@ class Singleton[T](Provider):
 
     __slots__ = ("_func", "_func", "_result", "_depends")
 
-    def __init__(self, func: Callable[[...], T], *args, **kwargs):
+    def __init__(self, func: Callable[..., T], *args, **kwargs):
         self._func = functools.partial(intercept_args(func), *args, **kwargs)
         self._result = UNSET
 

pif/wiring.py

@@ -13,10 +13,12 @@
 import inspect
 import itertools
 import types
-from typing import Any, Callable
+from typing import Any, Callable, TypeVar
 
 from pif.providers.provider import Provider
 
+__all__ = ("intercept", "patch_args", "inject", "is_patched", "patch_method", "unpatch_method", "wire", "unwire")
+
 
 def intercept(func):
     """
@@ -62,7 +64,10 @@ def patch_args(
     return args, kwargs
 
 
-def inject[T: Callable](func: T) -> T:
+TCallable = TypeVar("TCallable", bound=Callable)
+
+
+def inject(func: TCallable) -> TCallable:
     """
     Get a decorated copy of `func` with patched arguments.
 
@@ -97,7 +102,7 @@ def is_patched(func: Callable | types.FunctionType) -> bool:
     return hasattr(func, "_patched_func")
 
 
-def patch_method[T: Callable | types.FunctionType](func: T) -> T:
+def patch_method(func: TCallable) -> TCallable:
     """
     Return a "patched" version of the method provided.
 
@@ -112,7 +117,7 @@ def patch_method[T: Callable | types.FunctionType](func: T) -> T:
     return func
 
 
-def unpatch_method[T: Callable | types.FunctionType](func: T) -> T:
+def unpatch_method(func: TCallable) -> TCallable:
     """
     Get an "unpatched" copy of a method.
 

poetry.lock

@@ -8,7 +8,7 @@ readme = "README.md"
 packages = [{ include = "pif" }]
 
 [tool.poetry.dependencies]
-python = "^3.12"
+python = "^3.10"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.2.1"