Feature/add python3.12 drop python3.7 (#112)

.github/workflows/workflow.yaml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python
@@ -34,8 +34,6 @@ jobs:
       matrix:
         include:
           # test python versions
-          - python: "3.7"
-            os: ubuntu-latest
           - python: "3.8"
             os: ubuntu-latest
           - python: "3.9"
@@ -44,6 +42,8 @@ jobs:
             os: ubuntu-latest
           - python: "3.11"
             os: ubuntu-latest
+          - python: "3.12"
+            os: ubuntu-latest
           # test OSs
           - python: "3.x"
             os: macos-latest

Makefile

@@ -27,8 +27,8 @@ init: .clean .init
 	@echo ---- 🔧 Re-initialized project ----
 
 lint: .init
-	poetry run ruff --fix di tests
-	poetry run black di tests
+	poetry run ruff --fix di tests docs_src
+	poetry run black di tests docs_src
 	poetry run mypy di tests
 
 test: .init

di/_container.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import inspect
-import sys
 import typing
 from contextlib import AsyncExitStack, ExitStack, contextmanager
 from types import TracebackType
@@ -12,6 +11,7 @@
     Generic,
     Iterable,
     Mapping,
+    Protocol,
     Sequence,
     TypeVar,
     cast,
@@ -57,11 +57,6 @@
     WiringError,
 )
 
-if sys.version_info < (3, 8):  # pragma: no cover
-    from typing_extensions import Protocol
-else:  # pragma: no cover
-    from typing import Protocol
-
 
 class BindHook(Protocol):
     def __call__(

di/_utils/concurrency.py

@@ -17,9 +17,9 @@
     overload,
 )
 
-if sys.version_info < (3, 10):
+if sys.version_info < (3, 10):  # pragma: no cover
     from typing_extensions import ParamSpec
-else:
+else:  # pragma: no cover
     from typing import ParamSpec
 
 import anyio

di/_utils/inspect.py

@@ -3,9 +3,9 @@
 import sys
 from typing import Any, Callable, Dict, Mapping, Optional, Union
 
-if sys.version_info < (3, 9):
+if sys.version_info < (3, 9):  # pragma: no cover
     from typing_extensions import Annotated, get_args, get_origin, get_type_hints
-else:
+else:  # pragma: no cover
     from typing import Annotated, get_args, get_origin, get_type_hints
 
 from di._utils.types import Some

di/_utils/types.py

@@ -1,13 +1,6 @@
-import sys
 from dataclasses import dataclass
 from types import TracebackType
-from typing import Generic, Optional, Type, TypeVar, Union
-
-if sys.version_info < (3, 8):  # pragma: no cover
-    from typing_extensions import Protocol
-else:  # pragma: no cover
-    from typing import Protocol
-
+from typing import Generic, Optional, Protocol, Type, TypeVar, Union
 
 T = TypeVar("T")
 

di/api/dependencies.py

@@ -1,11 +1,14 @@
 import inspect
-import sys
-from typing import Any, Generic, List, NamedTuple, Optional, TypeVar
-
-if sys.version_info < (3, 8):
-    from typing_extensions import Protocol, runtime_checkable
-else:
-    from typing import Protocol, runtime_checkable
+from typing import (
+    Any,
+    Generic,
+    List,
+    NamedTuple,
+    Optional,
+    Protocol,
+    TypeVar,
+    runtime_checkable,
+)
 
 from di._utils.types import CacheKey
 from di.api.providers import DependencyProviderType

di/api/executor.py

@@ -1,12 +1,6 @@
 from __future__ import annotations
 
-import sys
-from typing import Iterable, Union
-
-if sys.version_info < (3, 8):
-    from typing_extensions import Protocol
-else:
-    from typing import Protocol
+from typing import Iterable, Protocol, Union
 
 from di._task import AsyncTask, ExecutionState, SyncTask
 

di/typing.py

@@ -1,14 +1,14 @@
 import sys
 from typing import Generator, Type, TypeVar
 
-if sys.version_info < (3, 9):
+if sys.version_info < (3, 9):  # pragma: no cover
     from typing_extensions import Annotated, get_args, get_origin
-else:
+else:  # pragma: no cover
     from typing import Annotated, get_args, get_origin
 
 from di._utils.inspect import get_parameters
 
-__all__ = ("get_parameters", "get_markers_from_annotation")
+__all__ = ("Annotated", "get_parameters", "get_markers_from_annotation")
 
 
 T = TypeVar("T")

docs_src/bind_as_a_dep.py

@@ -1,10 +1,5 @@
-import sys
 from dataclasses import dataclass
-
-if sys.version_info < (3, 8):
-    from typing_extensions import Protocol
-else:
-    from typing import Protocol
+from typing import Protocol
 
 from di import Container, bind_by_type
 from di.dependent import Dependent

docs_src/solved_dependent.py

@@ -20,7 +20,7 @@ def web_framework():
 
     dependencies = solved.dag.keys() - {solved.dependency}
     assert all(isinstance(item, Dependent) for item in dependencies)
-    assert set(dependent.call for dependent in dependencies) == {Request, MyClass}
+    assert {dependent.call for dependent in dependencies} == {Request, MyClass}
 
 
 # User code