commonmeta-py 0.98__py3-none-any.whl → 0.101__py3-none-any.whl

commonmeta/__init__.py

@@ -10,7 +10,7 @@ commonmeta-py is a Python library to convert scholarly metadata
 """
 
 __title__ = "commonmeta-py"
-__version__ = "0.98"
+__version__ = "0.101"
 __author__ = "Martin Fenner"
 __license__ = "MIT"
 

commonmeta/author_utils.py

@@ -1,4 +1,5 @@
 """Author utils module for commonmeta-py"""
+
 import re
 from typing import List
 from nameparser import HumanName
@@ -71,7 +72,11 @@ def get_one_author(author, **kwargs):
         or next(
             (
                 format_name_identifier(i)
-                for i in wrap(author.get("nameIdentifiers", None or author.get("identifiers", None)))
+                for i in wrap(
+                    author.get(
+                        "nameIdentifiers", None or author.get("identifiers", None)
+                    )
+                )
             ),
             None,
         )
@@ -169,6 +174,8 @@ def is_personal_name(name):
             "Staff",
             "Lab",
             "Redaktion",
+            "Group",
+            "area",
         ]
     ):
         return False

commonmeta/doi_utils.py

@@ -298,4 +298,5 @@ def is_rogue_scholar_doi(doi: str) -> bool:
         "10.59350",
         "10.63485",
         "10.64000",
+        "10.71938", # not managed by Front Matter
     ]

commonmeta/readers/schema_org_reader.py

@@ -410,9 +410,8 @@ def get_html_meta(soup):
         pid = pid.get("content", None) or pid.get("href", None)
         data["@id"] = normalize_id(pid)
 
-    _type = (
-        soup.select_one("meta[name='dc.type']")
-        or soup.select_one("meta[name='DC.type']")
+    _type = soup.select_one("meta[name='dc.type']") or soup.select_one(
+        "meta[name='DC.type']"
     )
     data["@type"] = _type["content"].capitalize() if _type else None
     if _type is None:

commonmeta/utils.py

@@ -190,8 +190,6 @@ def normalize_url(
     if url is None or not isinstance(url, str):
         return None
     url = url.strip()
-    if url.endswith("/"):
-        url = url.strip("/")
     scheme = urlparse(url).scheme
     if not scheme or scheme not in ["http", "https"]:
         return None
@@ -202,55 +200,13 @@ def normalize_url(
     return url
 
 
-# def normalize_url(url: Optional[str], secure=False, fragments=False, lower=False) -> Optional[str]:
-#     """Normalize URL"""
-#     if url is None or not isinstance(url, str):
-#         return None
-#     try:
-#         f = furl(url.strip())
-#         f.path.normalize()
-
-#         # only allow http and https schemes
-#         if f.scheme not in ["http", "https"]:
-#             return None
-#         if secure and f.scheme == "http":
-#             f.set(scheme="https")
-
-#         # remove index.html
-#         if f.path.segments and f.path.segments[-1] in ["index.html"]:
-#             f.path.segments.pop(-1)
-
-#         # remove fragments
-#         if fragments:
-#             f.remove(fragment=True)
-
-#         # remove specific query parameters
-#         f.remove(
-#             [
-#                 "origin",
-#                 "ref",
-#                 "referrer",
-#                 "source",
-#                 "utm_content",
-#                 "utm_medium",
-#                 "utm_campaign",
-#                 "utm_source",
-#             ]
-#         )
-
-#         if lower:
-#             return f.url.lower().strip("/")
-#         return f.url.strip("/")
-#     except ValueError:
-#         print(f"Error normalizing url {url}")
-#         return None
-
-
 def normalize_cc_url(url: Optional[str]):
     """Normalize Creative Commons URL"""
     if url is None or not isinstance(url, str):
         return None
     url = normalize_url(url, secure=True)
+    if url and url.endswith("/"):
+        url = url.strip("/")
     return NORMALIZED_LICENSES.get(url, url)
 
 
@@ -1129,7 +1085,9 @@ def replace_curie(string: Optional[str]) -> Optional[str]:
     if string is None:
         return None
     match = re.sub(
-        r"((?:doi|DOI):\s?([\w.,@?^=%&:\/~+#-]*[\w@?^=%&\/~+#-]))", r'https://doi.org/\2', string
+        r"((?:doi|DOI):\s?([\w.,@?^=%&:\/~+#-]*[\w@?^=%&\/~+#-]))",
+        r"https://doi.org/\2",
+        string,
     )
     if match is None:
         return None

{commonmeta_py-0.98.dist-info → commonmeta_py-0.101.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commonmeta-py
-Version: 0.98
+Version: 0.101
 Summary: Library for conversions to/from the Commonmeta scholarly metadata format
 Project-URL: Homepage, https://python.commonmeta.org
 Project-URL: Repository, https://github.com/front-matter/commonmeta-py

{commonmeta_py-0.98.dist-info → commonmeta_py-0.101.dist-info}/RECORD

@@ -1,16 +1,16 @@
-commonmeta/__init__.py,sha256=SHCYRMzetKkkWtESl1FXaUSgK0Kl0F22uZOUe96eWTI,1911
+commonmeta/__init__.py,sha256=M2m85YjUMJYnxend54-gjHPtr6sSqCMxXdb5VyNGu8o,1912
 commonmeta/api_utils.py,sha256=-ZHGVZZhJqnjnsLtp4-PoeHYbDqL0cQme7W70BEjo4U,2677
-commonmeta/author_utils.py,sha256=1oQQfxaq7aMQI3rLt8XMufksuBeC8Zht96aJ8vz09Ug,8459
+commonmeta/author_utils.py,sha256=4ftyfy0tZRtP8bJ_PYdrNS8Z76FNBJ38sHj5EMhds1Y,8585
 commonmeta/base_utils.py,sha256=AsUElA5kT2fw_Osy7Uaj2F6MKeq9yB7d5f2V-h2lh7c,3750
 commonmeta/cli.py,sha256=sOI9BJTePnljVcXcZ95N7TKXDT283XpjUaak7bMnbr0,6076
 commonmeta/constants.py,sha256=aZ7v-5bomVUQ1D79ubeSGHvlHhQvtVOcTvjLy-Wagvw,18348
 commonmeta/crossref_utils.py,sha256=ijcdAdV2HHUXP2twIKIQP9Ln2xsysU3n9nwQDg-ZAxU,22224
 commonmeta/date_utils.py,sha256=rJRV4YmWKQWU__iAV8www3cqwaefC0iRKyHwvxrr_XY,6316
-commonmeta/doi_utils.py,sha256=z-a9ufigQfjBiaRCCuHDC6Huf0hv7nNDMSiSwdVfWVc,9192
+commonmeta/doi_utils.py,sha256=ZBhHS66AjIHtdWlm3HGy4TIhgiesxqF4vtq4CeqaKPk,9242
 commonmeta/metadata.py,sha256=cjvCcxW1FMtKCbNKan0zXX0FN6z5orHFGPYsgkp6fSI,12480
 commonmeta/schema_utils.py,sha256=2DmwMAcasmNa0xBdxxeS6bIvoHz63sODk_ja5UYFTqk,915
 commonmeta/translators.py,sha256=RpGJtKNLjmz41VREZDY7KyyE2eXOi8j7m-da4jHmknI,1362
-commonmeta/utils.py,sha256=nWSdkc1jNkhSnv46MKScExOUlD--wMP_QCRpy8Rnq_g,44989
+commonmeta/utils.py,sha256=WuOxCNKDKEqb3xA7Iotje_ET5GuXSuk-cguAv-jMG8s,43758
 commonmeta/readers/__init__.py,sha256=vOf7UsOKNoh_ZCuyexxhAmPMt8wjB-pF_CfpWRaN8pk,45
 commonmeta/readers/bibtex_reader.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 commonmeta/readers/cff_reader.py,sha256=5HMFUvjE1zb-zfpQSNM8vtB0YunD0reom99hn8N0xKc,6144
@@ -25,7 +25,7 @@ commonmeta/readers/inveniordm_reader.py,sha256=F0syoLZ3amzkrEk8efb9WxwhMDY8QM8ct
 commonmeta/readers/json_feed_reader.py,sha256=L2zl0Iv8F9o9JC-qjF_j7K5Lw_iJwa5LrQCNx-sxfDE,14437
 commonmeta/readers/kbase_reader.py,sha256=ehKXQsJyPCtaq2FmBxNb2Jb5Nktpx8pNscpmEM6N0A4,6763
 commonmeta/readers/ris_reader.py,sha256=v6qOd-i2OcMTEFy5RGd3MlYthJcYSU6yzmZ5yHDzmII,3677
-commonmeta/readers/schema_org_reader.py,sha256=78vYWCZqrYevZsSbx7oVVLm3mlNzi323WNW5E_PL9o0,17234
+commonmeta/readers/schema_org_reader.py,sha256=oZoLG9okMxzlyCuX6oNNNFwvGCFpQ3W2Pz2TpXr3vkA,17224
 commonmeta/resources/cff_v1.2.0.json,sha256=MpfjDYgX7fN9PLiG54ISZ2uu9WItNqfh-yaRuTf6Ptg,46691
 commonmeta/resources/commonmeta_v0.12.json,sha256=HUSNReXh2JN3Q6YWSt7CE69js8dh50OlpMYGTyU98oU,16762
 commonmeta/resources/commonmeta_v0.13.json,sha256=2-WSZGijR13zVu97S_YHXr-cyeLW7hzHXYMlr6nIjdw,15787
@@ -70,8 +70,8 @@ commonmeta/writers/datacite_writer.py,sha256=UpDp4Brg5xrmS5T3QYoNi6PPXKdRxAo254e
 commonmeta/writers/inveniordm_writer.py,sha256=M_VmBZ_E5x_BHSgMjt2u70c34Eij2ngoaDwYWOrJzkg,11429
 commonmeta/writers/ris_writer.py,sha256=AcnCszS3WY9lF594NbFBtLylsA8ownnYp_XLQJ84Ios,2093
 commonmeta/writers/schema_org_writer.py,sha256=5j002uCNLdlScZMNQmPjodcVWqaBh2z38zL1H4lo2hY,5741
-commonmeta_py-0.98.dist-info/METADATA,sha256=bLI5eaocUq1OnIg-rhfflQoVjnaVcHmHmEdaQaQutHo,7429
-commonmeta_py-0.98.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-commonmeta_py-0.98.dist-info/entry_points.txt,sha256=U4w4BoRuS3rN5t5Y-uYSyOeU5Lh_VRVMS9OIDzIgw4w,50
-commonmeta_py-0.98.dist-info/licenses/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
-commonmeta_py-0.98.dist-info/RECORD,,
+commonmeta_py-0.101.dist-info/METADATA,sha256=jaK_LmceW2w8DOWmgfbqps7mhWano0RdAulI9wEGVAg,7430
+commonmeta_py-0.101.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+commonmeta_py-0.101.dist-info/entry_points.txt,sha256=U4w4BoRuS3rN5t5Y-uYSyOeU5Lh_VRVMS9OIDzIgw4w,50
+commonmeta_py-0.101.dist-info/licenses/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
+commonmeta_py-0.101.dist-info/RECORD,,