Adjust tests for Python 3.9

Author: dgarros

infrahub_sdk/data.py

@@ -1,11 +1,8 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
 from pydantic import BaseModel, ConfigDict, Field
 
-if TYPE_CHECKING:
-    from .node import InfrahubNode
+from .node import InfrahubNode  # noqa: TCH001
 
 
 class RepositoryBranchInfo(BaseModel):

poetry.lock

@@ -50,6 +50,7 @@ toml = { version = "^0.10", optional = true }
 typer = { version = "^0.12.3", optional = true }
 pytest = { version = "*", optional = true }
 pyyaml = { version = "^6", optional = true }
+eval-type-backport = { version = "^0.2.2", python = "~3.9" }
 
 [tool.poetry.group.dev.dependencies]
 pytest = "*"

pyproject.toml

@@ -1,10 +1,16 @@
+import sys
+
+import pytest
 from typer.testing import CliRunner
 
 from infrahub_sdk.ctl.cli import app
 
 runner = CliRunner()
 
+requires_python_310 = pytest.mark.skipif(sys.version_info < (3, 10), reason="Requires Python 3.10 or higher")
+
 
+@requires_python_310
 def test_main_app():
     result = runner.invoke(app, ["--help"])
     assert result.exit_code == 0

tests/unit/ctl/test_cli.py

@@ -1,5 +1,6 @@
 """Integration tests for infrahubctl commands."""
 
+import sys
 from unittest import mock
 
 import pytest
@@ -10,6 +11,8 @@
 
 runner = CliRunner()
 
+requires_python_310 = pytest.mark.skipif(sys.version_info < (3, 10), reason="Requires Python 3.10 or higher")
+
 
 @pytest.fixture
 def mock_client() -> mock.Mock:
@@ -25,6 +28,7 @@ def mock_client() -> mock.Mock:
 class TestInfrahubctlRepository:
     """Groups the 'infrahubctl repository' test cases."""
 
+    @requires_python_310
     def test_repo_no_username(self, mock_init_client, mock_client) -> None:
         """Case allow no username to be passed in and set it as None rather than blank string that fails."""
         mock_cred = mock.AsyncMock()
@@ -84,6 +88,7 @@ def test_repo_no_username(self, mock_init_client, mock_client) -> None:
             tracker="mutation-repository-create",
         )
 
+    @requires_python_310
     def test_repo_username(self, mock_init_client, mock_client) -> None:
         """Case allow no username to be passed in and set it as None rather than blank string that fails."""
         mock_cred = mock.AsyncMock()
@@ -145,6 +150,7 @@ def test_repo_username(self, mock_init_client, mock_client) -> None:
             tracker="mutation-repository-create",
         )
 
+    @requires_python_310
     def test_repo_readonly_true(self, mock_init_client, mock_client) -> None:
         """Case allow no username to be passed in and set it as None rather than blank string that fails."""
         mock_cred = mock.AsyncMock()
@@ -205,6 +211,7 @@ def test_repo_readonly_true(self, mock_init_client, mock_client) -> None:
             tracker="mutation-repository-create",
         )
 
+    @requires_python_310
     def test_repo_description_commit_branch(self, mock_init_client, mock_client) -> None:
         """Case allow no username to be passed in and set it as None rather than blank string that fails."""
         mock_cred = mock.AsyncMock()

tests/unit/ctl/test_repository_app.py

@@ -22,6 +22,8 @@
     Path(os.path.abspath(__file__)).parent / ".." / ".." / "fixtures" / "integration" / "test_infrahubctl"
 )
 
+requires_python_310 = pytest.mark.skipif(sys.version_info < (3, 10), reason="Requires Python 3.10 or higher")
+
 
 def read_fixture(file_name: str, fixture_subdir: str = ".") -> str:
     """Read the contents of a fixture."""
@@ -57,6 +59,7 @@ class TestInfrahubctlTransform:
     """Groups the 'infrahubctl transform' test cases."""
 
     @staticmethod
+    @requires_python_310
     def test_transform_not_exist_in_infrahub_yml(tags_transform_dir: str) -> None:
         """Case transform is not specified in the infrahub.yml file."""
         transform_name = "not_existing_transform"
@@ -66,7 +69,7 @@ def test_transform_not_exist_in_infrahub_yml(tags_transform_dir: str) -> None:
             assert output.exit_code == 1
 
     @staticmethod
-    @pytest.mark.skipif(sys.version_info < (3, 10), reason="requires python3.10 or higher")
+    @requires_python_310
     def test_transform_python_file_not_defined(tags_transform_dir: str) -> None:
         """Case transform python file not defined."""
         # Remove transform file
@@ -81,7 +84,7 @@ def test_transform_python_file_not_defined(tags_transform_dir: str) -> None:
             assert output.exit_code == 1
 
     @staticmethod
-    @pytest.mark.skipif(sys.version_info < (3, 10), reason="requires python3.10 or higher")
+    @requires_python_310
     def test_transform_python_class_not_defined(tags_transform_dir: str) -> None:
         """Case transform python class not defined."""
         # Rename transform inside of python file so the class name searched for no longer exists
@@ -101,7 +104,7 @@ def test_transform_python_class_not_defined(tags_transform_dir: str) -> None:
             assert output.exit_code == 1
 
     @staticmethod
-    @pytest.mark.skipif(sys.version_info < (3, 10), reason="requires python3.10 or higher")
+    @requires_python_310
     def test_gql_query_not_defined(tags_transform_dir: str) -> None:
         """Case GraphQL Query is not defined"""
         # Remove GraphQL Query file
@@ -115,7 +118,7 @@ def test_gql_query_not_defined(tags_transform_dir: str) -> None:
             assert output.exit_code == 1
 
     @staticmethod
-    @pytest.mark.skipif(sys.version_info < (3, 10), reason="requires python3.10 or higher")
+    @requires_python_310
     def test_infrahubctl_transform_cmd_success(httpx_mock: HTTPXMock, tags_transform_dir: str) -> None:
         """Case infrahubctl transform command executes successfully"""
         httpx_mock.add_response(

tests/unit/ctl/test_transform_app.py

@@ -1,3 +1,5 @@
+import sys
+
 import pytest
 from typer.testing import CliRunner
 
@@ -7,7 +9,10 @@
 
 runner = CliRunner()
 
+requires_python_310 = pytest.mark.skipif(sys.version_info < (3, 10), reason="Requires Python 3.10 or higher")
+
 
+@requires_python_310
 def test_validate_schema_valid():
     fixture_file = get_fixtures_dir() / "models" / "valid_model_01.json"
 
@@ -16,6 +21,7 @@ def test_validate_schema_valid():
     assert "Schema is valid" in result.stdout
 
 
+@requires_python_310
 def test_validate_schema_empty():
     fixture_file = get_fixtures_dir() / "models" / "empty.json"
 
@@ -24,6 +30,7 @@ def test_validate_schema_empty():
     assert "Empty YAML/JSON file" in remove_ansi_color(result.stdout)
 
 
+@requires_python_310
 def test_validate_schema_non_valid():
     fixture_file = get_fixtures_dir() / "models" / "non_valid_model_01.json"
 

tests/unit/ctl/test_validate_app.py

@@ -76,6 +76,14 @@ def return_annotation_map() -> dict[str, str]:
         "Optional[type[SchemaType]]": "Optional[type[SchemaTypeSync]]",
         "Optional[Union[CoreNode, SchemaType]]": "Optional[Union[CoreNodeSync, SchemaTypeSync]]",
         "InfrahubBatch": "InfrahubBatchSync",
+        "CoreNode | None": "CoreNodeSync | None",
+        "str | type[SchemaType]": "str | type[SchemaTypeSync]",
+        "InfrahubNode | SchemaType": "InfrahubNodeSync | SchemaTypeSync",
+        "InfrahubNode | SchemaType | None": "InfrahubNodeSync | SchemaTypeSync | None",
+        "list[InfrahubNode] | list[SchemaType]": "list[InfrahubNodeSync] | list[SchemaTypeSync]",
+        "InfrahubNode | None": "InfrahubNodeSync | None",
+        "type[SchemaType] | None": "type[SchemaTypeSync] | None",
+        "CoreNode | SchemaType | None": "CoreNodeSync | SchemaTypeSync | None",
     }