Fix conflict

dgarros · dgarros · commit 36158c855c89 · 2025-03-30T18:11:27.000+02:00
diff --git a/infrahub_sdk/schema/__init__.py b/infrahub_sdk/schema/__init__.py
@@ -74,8 +74,8 @@
     "SchemaModel",
     "SchemaRoot",
     "SchemaRootAPI",
-    "from_pydantic",
     "TemplateSchemaAPI",
+    "from_pydantic",
 ]
 
 
diff --git a/tests/unit/sdk/test_pydantic.py b/tests/unit/sdk/test_pydantic.py
@@ -35,7 +35,7 @@ class MyAllInOneModel(BaseModel):
     is_active: bool
     opt_age: int | None = None
     default_name: str = "some_default"
-    old_opt_age: Optional[int] = None  # noqa: UP007
+    old_opt_age: Optional[int] = None
 
 
 class AcmeTag(BaseModel):
