fix: remove redundant None from list type

Author: Witte, Julius

src/microbial_strain_data_model/classes/actors.py

@@ -52,18 +52,21 @@ class Collection(Organization):
     axenic: bool | None = Field(
         default=None, title="Axenic Culture", alias="axenicCulture"
     )
-    supply_forms: list[SupplyForm] | None = Field(
+    supply_forms: list[SupplyForm] = Field(
         default_factory=list, title="Supply Forms", alias="supplyForms"
     )
     history: str | None = Field(default=None, title="History", alias="history")
-    date: Annotated[
-        str,
-        StringConstraints(
-            strip_whitespace=True,
-            to_upper=True,
-            pattern=r"^(?:\d{4}[-\._]?\d{0,2}[-\._]?\d{0,2})?/?(?:\d{4}[-\._]?\d{0,2}[-\._]?\d{0,2})?$",
-        ),
-    ] | None = Field(default=None, title="Deposition Date", alias="depositionDate")
+    date: (
+        Annotated[
+            str,
+            StringConstraints(
+                strip_whitespace=True,
+                to_upper=True,
+                pattern=r"^(?:\d{4}[-\._]?\d{0,2}[-\._]?\d{0,2})?/?(?:\d{4}[-\._]?\d{0,2}[-\._]?\d{0,2})?$",
+            ),
+        ]
+        | None
+    ) = Field(default=None, title="Deposition Date", alias="depositionDate")
     depositor: Person | None = Field(default=None, title="Depositor", alias="depositor")
     source: Annotated[str, StringConstraints(pattern=r"^\/sources\/\d+$")] = Field(
         title="Source", alias="source", description="JSON path to source object"

src/microbial_strain_data_model/classes/isolation.py

@@ -7,14 +7,17 @@
 class Isolation(BaseModel):
     """Isolation event information"""
 
-    date: Annotated[
-        str,
-        StringConstraints(
-            strip_whitespace=True,
-            to_upper=True,
-            pattern=r"^(?:\d{4}[-\._]?\d{0,2}[-\._]?\d{0,2})?/?(?:\d{4}[-\._]?\d{0,2}[-\._]?\d{0,2})?$",
-        ),
-    ] | None = Field(default=None, title="Date", alias="date")
+    date: (
+        Annotated[
+            str,
+            StringConstraints(
+                strip_whitespace=True,
+                to_upper=True,
+                pattern=r"^(?:\d{4}[-\._]?\d{0,2}[-\._]?\d{0,2})?/?(?:\d{4}[-\._]?\d{0,2}[-\._]?\d{0,2})?$",
+            ),
+        ]
+        | None
+    ) = Field(default=None, title="Date", alias="date")
     isolator: Organization | Person | None = Field(
         default=None, title="Isolated At", alias="isolatedAt"
     )

src/microbial_strain_data_model/classes/sample.py

@@ -32,14 +32,17 @@ def check_isolation_tag(self) -> Self:
 class Sample(BaseModel):
     """Information on the Sampling event of that Strain"""
 
-    date: Annotated[
-        str,
-        StringConstraints(
-            strip_whitespace=True,
-            to_upper=True,
-            pattern=r"^(?:\d{4}[-\._]?\d{0,2}[-\._]?\d{0,2})?/?(?:\d{4}[-\._]?\d{0,2}[-\._]?\d{0,2})?$",
-        ),
-    ] | None = Field(default=None, title="Date", alias="date")
+    date: (
+        Annotated[
+            str,
+            StringConstraints(
+                strip_whitespace=True,
+                to_upper=True,
+                pattern=r"^(?:\d{4}[-\._]?\d{0,2}[-\._]?\d{0,2})?/?(?:\d{4}[-\._]?\d{0,2}[-\._]?\d{0,2})?$",
+            ),
+        ]
+        | None
+    ) = Field(default=None, title="Date", alias="date")
     country: Country | None = Field(default=None, title="Country", alias="country")
     description: str | None = Field(
         default=None, title="Description", alias="description"

tests/test_microbe.py

@@ -4,7 +4,7 @@
 from microbial_strain_data_model.microbe import Microbe
 
 
-@pytest.fixture()
+@pytest.fixture
 def micro():
     return Microbe(
         organismType=OrganismType.bacteria,