fair-cli 0.9.8__tar.gz → 0.9.9__tar.gz

{fair_cli-0.9.8 → fair_cli-0.9.9}/CITATION.cff

@@ -36,4 +36,4 @@ license: BSD-2-Clause
 message: If you use this software, please cite it using these metadata.
 repository-code: https://github.com/FAIRDataPipeline/FAIR-CLI/
 title: "The FAIR Data Pipeline command line tool"
-version: 0.9.8
+version: 0.9.9

{fair_cli-0.9.8 → fair_cli-0.9.9}/PKG-INFO

@@ -1,12 +1,13 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: fair-cli
-Version: 0.9.8
+Version: 0.9.9
 Summary: Synchronization interface for the SCRC FAIR Data Pipeline registry
 License: BSD-2-Clause
+License-File: LICENSE
 Keywords: FAIR Data Pipeline,FAIR,Data Management,Provenance
 Author: Richard Reeve
 Author-email: richard.reeve@glasgow.ac.uk
-Requires-Python: >=3.9.0,<4.0.0
+Requires-Python: >=3.10.0,<4.0.0
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Science/Research
@@ -15,11 +16,12 @@ Classifier: Operating System :: MacOS
 Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Programming Language :: Python :: 3.15
 Classifier: Topic :: Database :: Front-Ends
 Classifier: Topic :: Scientific/Engineering
 Provides-Extra: all

{fair_cli-0.9.8 → fair_cli-0.9.9}/fair/identifiers.py

@@ -234,7 +234,12 @@ def _check_generic_ror(id: str) -> typing.Dict:
         return _result_dict
 
     _id = _response.json()["items"][0]["id"]
-    _name = _response.json()["items"][0]["name"]
+    # The ROR API lists every name of an organisation, marking the one to show as "ror_display"
+    _names = _response.json()["items"][0]["names"]
+    _name = next(
+        (n["value"] for n in _names if "ror_display" in n["types"]),
+        _names[0]["value"],
+    )
     _result_dict["name"] = _name
     _result_dict["family_name"] = _name
     _result_dict["given_names"] = None

{fair_cli-0.9.8 → fair_cli-0.9.9}/fair/user_config/__init__.py

@@ -808,7 +808,13 @@ class JobConfiguration(MutableMapping):
         # Additional parser for formatted datetime
         _regex_fmt = re.compile(r"\$\{\{\s*([^}${\s]+)\s*\}\}")
 
-        if _unparsed := _regex_fmt.findall(_conf_str):
+        # RUN_ID is the code run's UUID, which does not exist until the API
+        # creates the code run, so the API substitutes it at finalise
+        _unparsed = [
+            var for var in _regex_fmt.findall(_conf_str) if var != "RUN_ID"
+        ]
+
+        if _unparsed:
             raise fdp_exc.InternalError(f"Failed to parse variables '{_unparsed}'")
 
     def _subst_cli_vars(self, job_time: datetime.datetime) -> str:

{fair_cli-0.9.8 → fair_cli-0.9.9}/pyproject.toml

@@ -10,7 +10,6 @@ authors = [
 classifiers = [
   "License :: OSI Approved :: BSD License",
   "Intended Audience :: Science/Research",
-  "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
@@ -24,7 +23,7 @@ classifiers = [
 ]
 description = "Synchronization interface for the SCRC FAIR Data Pipeline registry"
 name = "fair-cli"
-version = "0.9.8"
+version = "0.9.9"
 
 homepage = "https://www.fairdatapipeline.org/"
 
@@ -56,7 +55,7 @@ click = "^8.0.0"
 email-validator = "^1.1.3"
 pre-commit = "^3"
 pydantic = {extras = ["email"], version = "^1.9.0"}
-python = "^3.9.0,<4.0"
+python = "^3.10.0,<4.0"
 requests = "^2.23.0"
 rich = ">=10.2.3,<12.0.0"
 semver = "^2.13.0"