Merge branch 'main' into 4-build-automation

Author: notactuallyfinn

src/hermes_toml/harvest.py

@@ -185,7 +185,7 @@ def handle_person_in_unknown_format(cls, persons):
                     #try to parse the string
                     try:
                         [(name, email)] = getaddresses([person])
-                        return cls.remove_forbidden_keys({"name":name, "email":email})
+                        return_list.append(cls.remove_forbidden_keys({"name":name, "email":email}))
                     except ValueError as exc:
                         raise ValueError("Wrong string format for name (and email).") from exc
 

test/hermes_toml_test/test_harvest.py

@@ -49,7 +49,9 @@ def toml_file(tmp_path_factory):
     ({"project":{"authors":{"givenName":"a", "a":"b"}}}, {"author":{"givenName":"a", "@type":"Person"}}),
     ({"project":{"authors":{"a":"b"}}}, {}),
     ({"project":{"authors":[{"a":"a"}, {"givenName":"a"}]}}, {"author":{"givenName":"a", "@type":"Person"}}),
-    ({"project":{"authors":[{"a":"b"}]}}, {})
+    ({"project":{"authors":[{"a":"b"}]}}, {}),
+    ({"project":{"authors":["abc def<abc.def@dlr.com>"]}}, {"author":{"name":"abc def", "email": "abc.def@dlr.com", "@type": "Person"}}),
+    ({"project":{"authors":"abc def<abc.def@dlr.com>"}}, {"author":{"name":"abc def", "email": "abc.def@dlr.com", "@type": "Person"}})
 ])
 def test_read_from_toml(in_data, out_data, toml_file):
     toml.dump(in_data, open(toml_file, "w", encoding="utf8"))
@@ -58,7 +60,9 @@ def test_read_from_toml(in_data, out_data, toml_file):
 @pytest.mark.parametrize("in_data", [
     ({"project": {"authors":1}}), ({"tool": {"poetry": {"authors":1}}}),
     ({"project": {"authors":[1]}}), ({"tool": {"poetry": {"authors":[1]}}}),
-    ({"project": {"name":"a"}, "tool": {"poetry": {"name":"a"}}})
+    ({"project": {"name":"a"}, "tool": {"poetry": {"name":"a"}}}),
+    ({"project": {"authors":["as<as>as"]}}),
+    ({"project": {"authors":"as<as>as"}})
 ])
 def test_read_from_toml_with_error(in_data, toml_file):
     toml.dump(in_data, open(toml_file, "w", encoding="utf8"))