commonmeta-py 0.100__tar.gz → 0.101__tar.gz

{commonmeta_py-0.100 → commonmeta_py-0.101}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commonmeta-py
-Version: 0.100
+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.100 → commonmeta_py-0.101}/commonmeta/__init__.py

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

{commonmeta_py-0.100 → commonmeta_py-0.101}/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,7 @@ def is_personal_name(name):
             "Staff",
             "Lab",
             "Redaktion",
+            "Group",
             "area",
         ]
     ):

{commonmeta_py-0.100 → commonmeta_py-0.101}/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_py-0.100 → commonmeta_py-0.101}/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.100 → commonmeta_py-0.101}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "commonmeta-py"
-version = "0.100"
+version = "0.101"
 description = "Library for conversions to/from the Commonmeta scholarly metadata format"
 authors = [{ name = "Martin Fenner", email = "martin@front-matter.io" }]
 requires-python = ">=3.9,<4.0"
@@ -71,10 +71,7 @@ dev = [
 ]
 
 [tool.uv]
-default-groups = [
-    "docs",
-    "dev",
-]
+default-groups = ["docs", "dev"]
 
 [tool.hatch.build.targets.sdist]
 include = ["commonmeta"]
@@ -88,10 +85,7 @@ build-backend = "hatchling.build"
 
 [tool.ruff]
 line-length = 88
-select = [
-    "F401",
-    "F403",
-]
+select = ["F401", "F403"]
 
 [tool.tox]
 legacy_tox_ini = """