commonmeta-py 0.85__py3-none-any.whl → 0.87__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.85"
+__version__ = "0.87"
 __author__ = "Martin Fenner"
 __license__ = "MIT"
 
@@ -40,9 +40,15 @@ from .writers import (
 )
 from .utils import (
     dict_to_spdx,
+    extract_url,
+    extract_urls,
+    extract_curie,
     from_csl,
+    from_json_feed,
     from_schema_org,
     get_language,
+    issn_as_url,
+    name_to_fos,
     normalize_cc_url,
     normalize_id,
     normalize_ids,
@@ -50,16 +56,11 @@ from .utils import (
     normalize_url,
     normalize_ror,
     pages_as_string,
+    replace_curie,
     to_csl,
     validate_orcid,
+    validate_ror,
     validate_url,
-    get_language,
-    name_to_fos,
-    from_json_feed,
-    extract_url,
-    extract_urls,
-    extract_curie,
-    replace_curie,
 )
 from .author_utils import (
     authors_as_string,

commonmeta/readers/json_feed_reader.py

@@ -286,7 +286,7 @@ def get_funding_references(meta: Optional[dict]) -> Optional[list]:
             if i.get("type", None) == "HasAward"
         ]
     )
-    funding = py_.get(meta, "blog.funding", None)
+    funding = py_.get(meta, "blog.funding")
     if funding is not None:
         awards += [
             {
@@ -296,6 +296,9 @@ def get_funding_references(meta: Optional[dict]) -> Optional[list]:
                 "awardNumber": funding.get("award_number", None),
             }
         ]
+    funding_references = py_.get(meta, "funding_references")
+    if funding_references is not None:
+        awards += [compact(i) for i in funding_references]
     return awards
 
 

{commonmeta_py-0.85.dist-info → commonmeta_py-0.87.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commonmeta-py
-Version: 0.85
+Version: 0.87
 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.85.dist-info → commonmeta_py-0.87.dist-info}/RECORD

@@ -1,4 +1,4 @@
-commonmeta/__init__.py,sha256=_mF-n3S2EhVteX6G0ocqq9fbR_mi6pOpZ9FtmIa4NA8,1894
+commonmeta/__init__.py,sha256=ToXvSGATGxDBN50c9wETUrtKhpMS0J7cUJ7d5_-sA4U,1911
 commonmeta/api_utils.py,sha256=-ZHGVZZhJqnjnsLtp4-PoeHYbDqL0cQme7W70BEjo4U,2677
 commonmeta/author_utils.py,sha256=1oQQfxaq7aMQI3rLt8XMufksuBeC8Zht96aJ8vz09Ug,8459
 commonmeta/base_utils.py,sha256=AsUElA5kT2fw_Osy7Uaj2F6MKeq9yB7d5f2V-h2lh7c,3750
@@ -22,7 +22,7 @@ commonmeta/readers/csl_reader.py,sha256=ynqJeqK9TlHFsmgMREPmKGlcj6tVycpnqDN0N0Lj
 commonmeta/readers/datacite_reader.py,sha256=CdOtxhthrakBoQMsLTdPx6sUCmqtEWo5ICYE6ZsWDdo,12026
 commonmeta/readers/datacite_xml_reader.py,sha256=nhnO92fZihr1HZlbXjyem-HJXc9_DWLgJ2zeltuPMIg,13041
 commonmeta/readers/inveniordm_reader.py,sha256=uS92St68UkO4Adh3PsCu9ox81aO0kek3Y0vneBSDkts,7584
-commonmeta/readers/json_feed_reader.py,sha256=x29DpOXaHqtYTTow7fnx3TVBcI_585VA3OMucqlKu94,13443
+commonmeta/readers/json_feed_reader.py,sha256=yMwLDBe0SUJT0hHSEIHTPLXVpstYqZ_m8E8oKEZJf0A,13596
 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
@@ -70,8 +70,8 @@ commonmeta/writers/datacite_writer.py,sha256=UpDp4Brg5xrmS5T3QYoNi6PPXKdRxAo254e
 commonmeta/writers/inveniordm_writer.py,sha256=yWDMYorsJJ4vFNHOmjU8d1_uAfqMwkBxzeV7jtBoC1Q,11515
 commonmeta/writers/ris_writer.py,sha256=AcnCszS3WY9lF594NbFBtLylsA8ownnYp_XLQJ84Ios,2093
 commonmeta/writers/schema_org_writer.py,sha256=5j002uCNLdlScZMNQmPjodcVWqaBh2z38zL1H4lo2hY,5741
-commonmeta_py-0.85.dist-info/METADATA,sha256=OUA6nGuCDxScVcQwWYlqP5fo4wc7Z26HgdUMjps-xDk,7429
-commonmeta_py-0.85.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-commonmeta_py-0.85.dist-info/entry_points.txt,sha256=U4w4BoRuS3rN5t5Y-uYSyOeU5Lh_VRVMS9OIDzIgw4w,50
-commonmeta_py-0.85.dist-info/licenses/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
-commonmeta_py-0.85.dist-info/RECORD,,
+commonmeta_py-0.87.dist-info/METADATA,sha256=aBKlcvfgtgTUgW5-Z7QbncVPnyMkCkeuH0-SEBLhoxI,7429
+commonmeta_py-0.87.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+commonmeta_py-0.87.dist-info/entry_points.txt,sha256=U4w4BoRuS3rN5t5Y-uYSyOeU5Lh_VRVMS9OIDzIgw4w,50
+commonmeta_py-0.87.dist-info/licenses/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
+commonmeta_py-0.87.dist-info/RECORD,,