Merge remote-tracking branch 'origin/maturin-implementation' into maturin-implementation

Author: 56kyle

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
           fetch-depth: 2
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.12"
 

.github/workflows/tests.yml

@@ -38,7 +38,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v4.6.1
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
 
@@ -112,6 +112,7 @@ jobs:
         with:
           name: coverage-data
           path: ".coverage.*"
+          include-hidden-files: true
 
       - name: Upload documentation
         if: matrix.session == 'docs-build'
@@ -128,7 +129,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v4.6.1
+        uses: actions/setup-python@v5
         with:
           python-version: "3.12"
 

docs/requirements.txt

@@ -1,4 +1,4 @@
-furo==2022.12.7
+furo==2024.8.6
 sphinx==8.0.2
 sphinx-click==6.0.0
 myst_parser==4.0.0

poetry.lock

@@ -7,7 +7,7 @@ features = ["pyo3/extension-module"]
 
 [tool.poetry]
 name = "pytest-static"
-version = "1.0.4"
+version = "1.1.0"
 description = "pytest-static"
 authors = ["Kyle Oliver <56kyleoliver@gmail.com>"]
 license = "MIT"

pyproject.toml

@@ -40,8 +40,6 @@
 
 type_handlers: TypeHandlerRegistry = TypeHandlerRegistry()
 
-JT = TypeVar("JT")
-
 
 def parametrize_types(
     metafunc: Metafunc,

src/pytest_static/parametric.py

@@ -234,7 +234,6 @@ def test_parametrize_types_with_sum_type_expected_examples(
     result.assert_outcomes(passed=expected)
 
 
-@pytest.mark.skip
 @pytest.mark.parametrize(
     argnames=["argtypes", "expected"],
     argvalues=[((type_annotation_to_string(typ),), expected) for typ, expected in PRODUCT_TYPE_EXPECTED_EXAMPLES],

tests/integration_tests/test_plugin.py

@@ -1,4 +1,5 @@
 """Fixtures used in unit tests."""
+
 from typing import Any
 from typing import Generator
 
@@ -9,36 +10,27 @@
 from pytest_static.type_handler import TypeHandlerRegistry
 
 
-
-
 @pytest.fixture(scope="function")
 def type_handler_registry(request: FixtureRequest) -> TypeHandlerRegistry:
     return getattr(request, "param", TypeHandlerRegistry())
 
 
 @pytest.fixture(scope="function")
 def type_handler_registry__basic(
-    request: FixtureRequest,
-    type_handler_registry: TypeHandlerRegistry,
-    basic_type: Any,
-    basic_handler: TypeHandler
+    request: FixtureRequest, type_handler_registry: TypeHandlerRegistry, basic_type: Any, basic_handler: TypeHandler
 ) -> TypeHandlerRegistry:
     type_handler_registry.register(int)(basic_handler)
-    return getattr(request, 'param', type_handler_registry)
+    return getattr(request, "param", type_handler_registry)
 
 
 @pytest.fixture(scope="function")
 def basic_type(request: FixtureRequest) -> Any:
-    return getattr(request, 'param', int)
+    return getattr(request, "param", int)
 
 
 @pytest.fixture(scope="function")
 def basic_handler(request: FixtureRequest) -> TypeHandler:
     def _iter_int(base_type: Any, type_args: tuple[Any, ...]) -> Generator[Any, None, None]:
         yield from (1, 2, 3)
-    return getattr(request, 'param', _iter_int)
-
-
-
-
 
+    return getattr(request, "param", _iter_int)

tests/unit_tests/conftest.py

@@ -64,8 +64,8 @@ class DummyClassNoArgs:
     pass
 
 
-def dummy_iter_instances(typ: Any) -> Generator[Any, None, None]:
-    yield from (1, 2, 3)
+def dummy_callable(typ: Any) -> str:
+    return str(typ)
 
 
 def assert_len(iterable: Iterable[Any], expected: int) -> None:
@@ -172,16 +172,15 @@ def test__iter_type_var_instances(base_type: Any, type_args: tuple[Any, ...], ex
 
 
 def test__iter_protocol_instances() -> None:
-    class DummyProtocol(Protocol):
-        def dummy_method(self, x: int) -> None:
-            ...
+    class DummyProtocolB(Protocol):
+        def dummy_method(self, x: int) -> None: ...  # pragma: no cover  # noqa: E704
 
     with pytest.raises(NotImplementedError):
-        _iter_protocol_instances(DummyProtocol, tuple())
+        _iter_protocol_instances(DummyProtocolB, tuple())
 
 
 def test__iter_callable_instances() -> None:
-    assert_len(_iter_callable_instances(dummy_iter_instances, tuple()), ANY_LEN)
+    assert_len(_iter_callable_instances(dummy_callable, tuple()), ANY_LEN)
 
 
 @pytest.mark.parametrize(

tests/unit_tests/test_parametric.py

@@ -10,38 +10,28 @@ def test___getitem___with_unregistered(self, type_handler_registry: TypeHandlerR
             assert type_handler_registry[int]
 
     def test___getitem___with_basic(
-        self,
-        type_handler_registry__basic: TypeHandlerRegistry,
-        basic_handler: TypeHandler
+        self, type_handler_registry__basic: TypeHandlerRegistry, basic_handler: TypeHandler
     ) -> None:
         assert type_handler_registry__basic[int] == [basic_handler]
 
     def test_get_with_unregistered(self, type_handler_registry: TypeHandlerRegistry) -> None:
         assert type_handler_registry.get(int, None) is None
 
     def test_get_with_basic(
-        self,
-        type_handler_registry__basic: TypeHandlerRegistry,
-        basic_handler: TypeHandler
+        self, type_handler_registry__basic: TypeHandlerRegistry, basic_handler: TypeHandler
     ) -> None:
         assert type_handler_registry__basic.get(int, None) == [basic_handler]
 
     def test_register_with_unregistered(self, type_handler_registry: TypeHandlerRegistry) -> None:
         assert type_handler_registry.get(int, None) is None
 
-    def test_register_with_basic(
-        self,
-        type_handler_registry: TypeHandlerRegistry,
-        basic_handler: TypeHandler
-    ) -> None:
+    def test_register_with_basic(self, type_handler_registry: TypeHandlerRegistry, basic_handler: TypeHandler) -> None:
         type_handler_registry.register(int)(basic_handler)
         assert type_handler_registry.get(int, None) is not None
         assert tuple(type_handler_registry.get(int, None)[0](int, ())) == (1, 2, 3)
 
     def test_register_with_existing(
-        self,
-        type_handler_registry__basic: TypeHandlerRegistry,
-        basic_handler: TypeHandler
+        self, type_handler_registry__basic: TypeHandlerRegistry, basic_handler: TypeHandler
     ) -> None:
         type_handler_registry__basic.register(int)(basic_handler)
         assert type_handler_registry__basic.get(int, None) is not None
@@ -53,9 +43,7 @@ def test_clear_with_unregistered(self, type_handler_registry: TypeHandlerRegistr
         assert type_handler_registry.get(int, None) is None
 
     def test_clear_with_basic(
-        self,
-        type_handler_registry__basic: TypeHandlerRegistry,
-        basic_handler: TypeHandler
+        self, type_handler_registry__basic: TypeHandlerRegistry, basic_handler: TypeHandler
     ) -> None:
         assert type_handler_registry__basic.get(int, None) == [basic_handler]
         assert tuple(type_handler_registry__basic.get(int, None)[0](int, ())) == (1, 2, 3)