Fix for failing tests as a result of pydantic 2.0 (#2399)

* Fix defs for optional field in models
* Remove usage of deprecated parse_obj method
* Quote values for 'start' field in roles.yml

Author: deepakunni3

_data/roles.yml

@@ -236,7 +236,7 @@
       github: jamesaoverton
       orcid: 0000-0001-5139-5557
       status: lead
-      start: 2017
+      start: "2017"
 - name: OBO Academy
   open: false
   description: |
@@ -267,12 +267,12 @@
       github: shawntanzk
       orcid: 0000-0001-7258-9596
       status: support
-      start: 2022
+      start: "2022"
     - name: Bradley Varner
       github: bvarner-ebi
       status: support
       orcid: 0000-0002-1773-2692
-      start: 2022
+      start: "2022"
 - name: OBO Issue Tracker Shepherd
   open: false
   description: |

tests/test_memberships.py

@@ -21,8 +21,8 @@ class Affiliation(BaseModel):
     """Represents an affiliation."""
 
     name: str
-    ror: Optional[str]
-    wikidata: Optional[str]
+    ror: Optional[str] = None
+    wikidata: Optional[str] = None
 
 
 class Member(BaseModel):
@@ -48,7 +48,7 @@ class TestMembershipData(unittest.TestCase):
 
     def test_data(self):
         """Test the working group data is clean."""
-        res = Group.parse_obj(yaml.safe_load(OPERATIONS_METADATA_PATH.read_text()))
+        res = Group.model_validate(yaml.safe_load(OPERATIONS_METADATA_PATH.read_text()))
         self.assertIsNotNone(res)
         counter = Counter(member.orcid for member in res.members)
         counter = {orcid for orcid, count in counter.items() if count > 1}

tests/test_roles.py

@@ -23,18 +23,18 @@ class Person(BaseModel):
     orcid: str
     status: Literal["lead", "support"]
     start: str
-    end: Optional[str]
+    end: Optional[str] = None
 
 
 class Role(BaseModel):
     """A model for a role in the OBO Foundry community."""
 
     name: str
     description: str
-    open: Optional[bool]
-    commitment: Optional[str]  # can later be required
-    requirements: Optional[List[str]]  # can later be required
-    responsibilities: Optional[List[str]]  # can later be required
+    open: Optional[bool] = None
+    commitment: Optional[str] = None # can later be required
+    requirements: Optional[List[str]] = None # can later be required
+    responsibilities: Optional[List[str]] = None # can later be required
     people: List[Person]
 
 
@@ -48,7 +48,7 @@ def test_data(self):
             name = role_dict.get("name")
             with self.subTest(name=name):
                 self.assertIsNotNone(name)
-                obj = Role.parse_obj(role_dict)
+                obj = Role.model_validate(role_dict)
                 self.assertIsInstance(obj, Role)
                 if obj.requirements is not None:
                     self.assertNotEqual(0, len(obj.requirements))