Rename orcid to orcid_id

Author: jl-wynen

src/scippneutron/io/cif.py

@@ -32,7 +32,7 @@
   ...  .with_beamline(metadata.Beamline(name='fake', facility='made up'))
   ...  .with_authors(metadata.Person(
   ...      name='Jane Doe',
-  ...      orcid='0000-0000-0000-0001',
+  ...      orcid_id='0000-0000-0000-0001',
   ...      corresponding=True
   ...  ))
   ...  .with_reduced_powder_data(da)
@@ -971,11 +971,11 @@ def _serialize_authors(
 ) -> tuple[Chunk | Loop, dict[str, str]]:
     fields = {
         f'{category}.{key}': f
-        for key in ('name', 'email', 'address', 'orcid')
+        for key in ('name', 'email', 'address', 'orcid_id')
         if any(f := [getattr(a, key) or '' for a in authors])
     }
-    # Map between our name (Person.orcid) and CIF's (id_orcid)
-    if orcid_id := fields.pop(f'{category}.orcid', None):
+    # Map between our name (Person.orcid_id) and CIF's (id_orcid)
+    if orcid_id := fields.pop(f'{category}.orcid_id', None):
         fields[f'{category}.id_orcid'] = orcid_id
 
     roles = {next(id_generator): a.role for a in authors}

src/scippneutron/metadata/_model.py

@@ -166,7 +166,7 @@ class Person(BaseModel):
 
     name: str
     """Free form name of the person."""
-    orcid: ORCIDiD | None = None
+    orcid_id: ORCIDiD | None = None
     """ORCID iD of the person."""
 
     corresponding: bool = False

tests/io/cif_test.py

@@ -1074,7 +1074,7 @@ def test_builder_single_contact_author() -> None:
         name='Jane Doe',
         email='[email protected]',
         address='Partikelgatan, Lund',
-        orcid='https://orcid.org/0000-0000-0000-0001',
+        orcid_id='https://orcid.org/0000-0000-0000-0001',
         corresponding=True,
     )
     cif_ = cif.CIF().with_authors(author)
@@ -1091,7 +1091,7 @@ def test_builder_regular_author() -> None:
         name='Jane Doe',
         email='[email protected]',
         address='Partikelgatan, Lund',
-        orcid='https://orcid.org/0000-0000-0000-0001',
+        orcid_id='https://orcid.org/0000-0000-0000-0001',
         corresponding=False,
     )
     cif_ = cif.CIF().with_authors(author)
@@ -1109,13 +1109,13 @@ def test_builder_multiple_regular_authors() -> None:
             name='Jane Doe',
             email='[email protected]',
             address='Partikelgatan, Lund',
-            orcid='https://orcid.org/0000-0000-0000-0001',
+            orcid_id='https://orcid.org/0000-0000-0000-0001',
             corresponding=False,
         ),
         metadata.Person(
             name='Max Mustermann',
             email='[email protected]',
-            orcid='https://orcid.org/0000-0000-0001-0082',
+            orcid_id='https://orcid.org/0000-0000-0001-0082',
             corresponding=False,
         ),
     ]