Merge pull request #5974 from opsmill/pog-pt013

Fix consistent import of pytest

Author: ogenstad

backend/infrahub/pytest_plugin.py

@@ -1,7 +1,7 @@
+import pytest
 from infrahub_sdk.client import Config as InfrahubClientConfig
 from infrahub_sdk.client import InfrahubClientSync
 from infrahub_sdk.node import InfrahubNodeSync
-from pytest import Config, Item, Session, TestReport
 
 from infrahub.core.constants import InfrahubKind
 from infrahub.core.timestamp import Timestamp
@@ -50,7 +50,12 @@ def get_repository_validator(self) -> tuple[InfrahubNodeSync, bool]:
 
         return validator, True
 
-    def pytest_collection_modifyitems(self, session: Session, config: Config, items: list[Item]) -> None:  # noqa: ARG002
+    def pytest_collection_modifyitems(
+        self,
+        session: pytest.Session,  # noqa: ARG002
+        config: pytest.Config,  # noqa: ARG002
+        items: list[pytest.Item],
+    ) -> None:
         """This function is called after item collection and gives the opportunity to work on the collection before sending the items for testing.
 
         All items without an "infrahub" marker will be discarded. Items will also be re-ordered to be run in a specific order:
@@ -62,7 +67,7 @@ def pytest_collection_modifyitems(self, session: Session, config: Config, items:
         """
         filtered_items = [i for i in items if i.get_closest_marker("infrahub")]
 
-        def sort_key(item: Item) -> tuple[int, int]:
+        def sort_key(item: pytest.Item) -> tuple[int, int]:
             type_cost = 99
             for marker_name, priority in ORDER_TYPE_MAP.items():
                 if item.get_closest_marker(marker_name):
@@ -80,7 +85,7 @@ def sort_key(item: Item) -> tuple[int, int]:
         filtered_items.sort(key=sort_key)
         items[:] = filtered_items
 
-    def pytest_collection_finish(self, session: Session) -> None:  # noqa: ARG002
+    def pytest_collection_finish(self, session: pytest.Session) -> None:  # noqa: ARG002
         """This function is called when tests have been collected and modified, meaning they are ready to be run."""
         self.proposed_change = self.client.get(kind=InfrahubKind.PROPOSEDCHANGE, id=self.proposed_change_id)
         self.proposed_change.validations.fetch()
@@ -93,7 +98,7 @@ def pytest_collection_finish(self, session: Session) -> None:  # noqa: ARG002
                 check = relationship.peer
                 self.checks[check.origin.value] = check
 
-    def pytest_runtestloop(self, session: Session) -> object | None:  # noqa: ARG002
+    def pytest_runtestloop(self, session: pytest.Session) -> object | None:  # noqa: ARG002
         """This function is called when the test loop is being run."""
         self.validator.conclusion.value = "unknown"
         self.validator.state.value = "in_progress"
@@ -102,7 +107,7 @@ def pytest_runtestloop(self, session: Session) -> object | None:  # noqa: ARG002
 
         return None
 
-    def pytest_runtest_setup(self, item: Item) -> None:
+    def pytest_runtest_setup(self, item: pytest.Item) -> None:
         """Create a StandardCheck for each test item to later record its details.
 
         If a check already exists, reset it to its default values.
@@ -130,7 +135,7 @@ def pytest_runtest_setup(self, item: Item) -> None:
 
         check.save()
 
-    def pytest_runtest_logreport(self, report: TestReport) -> None:
+    def pytest_runtest_logreport(self, report: pytest.TestReport) -> None:
         """This function is called 3 times per test: setup, call, teardown."""
         if report.when != "call":
             return
@@ -142,7 +147,7 @@ def pytest_runtest_logreport(self, report: TestReport) -> None:
         # Workaround for https://github.com/opsmill/infrahub/issues/2184
         check.update(do_full_update=True)
 
-    def pytest_sessionfinish(self, session: Session) -> None:  # noqa: ARG002
+    def pytest_sessionfinish(self, session: pytest.Session) -> None:  # noqa: ARG002
         """Set the final RepositoryValidator details after completing the test session."""
         conclusion = "success"
 

pyproject.toml

@@ -511,7 +511,6 @@ allow-dunder-method-names = [
     "ANN003", # Missing type annotation for `**kwargs`
     "ANN204", # Missing return type annotation for special method
     "ANN401", # Dynamically typed expressions (typing.Any) are disallowed
-    "PT013",   # Incorrect import of `pytest`; use `import pytest` instead
     "UP007",  # Use X | Y for type annotations
 ]