removed toml dependency and pined setuptools to <82

Author: notactuallyfinn

docs/source/conf.py

@@ -22,7 +22,8 @@
 #
 import os
 import sys
-import toml
+
+import tomlkit
 
 sys.path.insert(0, os.path.abspath('../../src'))
 sys.path.append(os.path.abspath('_ext'))
@@ -36,7 +37,7 @@ def read_from_pyproject(file_path="../../pyproject.toml"):
     """
     try:
         # Load the pyproject.toml file
-        data = toml.load(file_path)
+        data = tomlkit.load(open(file_path, 'r')).unwrap()
 
         # Navigate to the authors metadata
         metadata = data.get("project", {})
@@ -45,7 +46,7 @@ def read_from_pyproject(file_path="../../pyproject.toml"):
         return metadata
     except FileNotFoundError:
         return f"The file {file_path} was not found."
-    except toml.TomlDecodeError:
+    except tomlkit.exceptions.TOMLKitError:
         return f"Failed to parse {file_path}. Ensure it is a valid TOML file."
     except Exception as e:
         return f"An unexpected error occurred: {e}"

poetry.lock

@@ -32,7 +32,7 @@ dependencies = [
     "jsonschema>=3.0.0, <4.0.0",
     "pyld>=2.0.3, <3.0.0",
     "cffconvert>=2.0.0, <3.0.0",
-    "toml>=0.10.2, <1.0.0",
+    "setuptools<82",
     "pyparsing>=3.0.9, <4.0.0",
     "requests>=2.28.1, <3.0.0",
     "pydantic>=2.5.1, <3.0.0",

pyproject.toml

@@ -11,9 +11,9 @@
 from importlib import metadata
 from typing import Type, Union
 
-import toml
 from pydantic import BaseModel
 from pydantic_settings import BaseSettings, SettingsConfigDict
+import tomlkit
 
 
 class HermesSettings(BaseSettings):
@@ -131,7 +131,7 @@ def init_command_parser(self, command_parser: argparse.ArgumentParser) -> None:
     def load_settings(self, args: argparse.Namespace):
         """Load settings from the configuration file (passed in from command line)."""
 
-        toml_data = toml.load(args.path / args.config)
+        toml_data = tomlkit.load((args.path / args.config).open()).unwrap()
         self.root_settings = HermesCommand.settings_class.model_validate(toml_data)
         self.settings = getattr(self.root_settings, self.command_name)
 

src/hermes/commands/base.py

@@ -16,9 +16,9 @@
 from urllib.parse import urljoin, urlparse
 
 import requests
-import toml
 from pydantic import BaseModel
 from requests import HTTPError
+import tomlkit
 
 import hermes.commands.init.util.slim_click as sc
 from hermes.commands import marketplace
@@ -359,7 +359,7 @@ def create_hermes_toml(self) -> None:
                 or sc.confirm("Do you want to replace your `hermes.toml` with a new one?", default=True):
             with open(hermes_toml_path, 'w') as toml_file:
                 # noinspection PyTypeChecker
-                toml.dump(self.hermes_toml_data, toml_file)
+                tomlkit.dump(self.hermes_toml_data, toml_file)
             sc.echo("`hermes.toml` was created.", formatting=sc.Formats.OKGREEN)
 
     def create_citation_cff(self) -> None:

src/hermes/commands/init/base.py

@@ -8,7 +8,7 @@
 import sys
 
 from ruamel import yaml
-import toml
+import tomlkit
 
 from hermes.commands import cli
 from hermes.model import context_manager
@@ -72,12 +72,12 @@ def test_invenio_postprocess(tmp_path, monkeypatch):
         if e.code != 0:
             raise e
     finally:
-        result_toml = toml.load(config_file)
+        result_toml = tomlkit.load(config_file.open('r')).unwrap()
         result_cff = yaml.YAML().load(citation_file)
         result_codemeta = json.loads(codemeta_file.read_text())
         sys.argv = orig_argv
 
-    assert result_toml == toml.loads(
+    assert result_toml == tomlkit.loads(
         """# SPDX-FileCopyrightText: 2023 German Aerospace Center (DLR)
 #
 # SPDX-License-Identifier: CC0-1.0
@@ -103,7 +103,7 @@ def test_invenio_postprocess(tmp_path, monkeypatch):
 [postprocess]
 run = ["config_invenio_record_id", "cff_doi", "codemeta_doi"]
 """
-    )
+    ).unwrap()
     assert result_cff == yaml.YAML().load(
         """cff-version: 1.2.0
 title: Test

test/hermes_test/commands/postprocess/test_invenio_postprocess.py

@@ -3,10 +3,11 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-import toml
 from pathlib import Path
 
-pyproject = toml.load(Path(__file__).parent.parent.parent / "pyproject.toml")
+import tomlkit
+
+pyproject = tomlkit.load((Path(__file__).parent.parent.parent / "pyproject.toml").open('r')).unwrap()
 expected_name = pyproject["project"]["name"]
 expected_version = pyproject["project"]["version"]
 expected_homepage = pyproject["project"]["urls"]["homepage"]