changed imports and fixed syntax error for python 3.10

Author: notactuallyfinn

src/hermes/commands/postprocess/base.py

@@ -3,12 +3,13 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # SPDX-FileContributor: Michael Meinel
+# SPDX-FileContributor: Michael Fritzsche
 
 import argparse
 
 from pydantic import BaseModel
 
-from hermes.commands.base import HermesCommand, HermesPlugin
+from ..base import HermesCommand, HermesPlugin
 
 
 class HermesPostprocessPlugin(HermesPlugin):

src/hermes/commands/postprocess/invenio.py

@@ -3,17 +3,17 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # SPDX-FileContributor: Michael Meinel
+# SPDX-FileContributor: Michael Fritzsche
 # SPDX-FileContributor: Stephan Druskat
 
 import logging
 
-from ruamel import yaml
+from ruamel.yaml import YAML
 import toml
 
-from hermes.commands.base import HermesCommand
 from hermes.error import MisconfigurationError
 from hermes.model.context_manager import HermesContext
-
+from ..base import HermesCommand
 from .base import HermesPostprocessPlugin
 
 
@@ -36,7 +36,7 @@ def __call__(self, command: HermesCommand):
             _log.error("hermes.toml already contains a record_id for Invenio deposit.")
             raise MisconfigurationError(
                 "Can't overwrite record_id automatically."
-                f"(Tried to overwrite {old_record_id} with {deposition["record_id"]})"
+                f"(Tried to overwrite {old_record_id} with {deposition['record_id']})"
             )
         except KeyError:
             pass
@@ -52,14 +52,14 @@ def __call__(self, command: HermesCommand):
             deposition = manager["result"]
         ctx.finalize_step("deposit")
 
-        yaml_io = yaml.YAML()
-        yaml_io.default_flow_style = False
-        yaml_io.allow_unicode = True
-        yaml_io.indent(mapping=4, sequence=2, offset=0)
-        yaml_io.allow_unicode = True
+        yaml = YAML()
+        yaml.default_flow_style = False
+        yaml.allow_unicode = True
+        yaml.indent(mapping=4, sequence=2, offset=0)
+        yaml.allow_unicode = True
 
         try:
-            cff = yaml_io.load(open('CITATION.cff', 'r'))
+            cff = yaml.load(open('CITATION.cff', 'r'))
             new_identifier = {
                 'description': f"DOI for the published version {deposition['metadata']['version']} "
                 "[generated by hermes]",
@@ -70,6 +70,6 @@ def __call__(self, command: HermesCommand):
                 cff['identifiers'].append(new_identifier)
             else:
                 cff['identifiers'] = [new_identifier]
-            yaml_io.dump(cff, open('CITATION.cff', 'w'))
+            yaml.dump(cff, open('CITATION.cff', 'w'))
         except Exception as e:
             raise RuntimeError("Update of CITATION.cff failed.") from e

src/hermes/commands/postprocess/invenio_rdm.py

@@ -3,18 +3,19 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # SPDX-FileContributor: Michael Meinel
+# SPDX-FileContributor: Michael Fritzsche
 # SPDX-FileContributor: Stephan Druskat
 
 import logging
 
 import toml
 
-from hermes.commands.base import HermesCommand
 from hermes.error import MisconfigurationError
 from hermes.model.context_manager import HermesContext
-
+from ..base import HermesCommand
 from .base import HermesPostprocessPlugin
 
+
 _log = logging.getLogger('postprocess.invenio_rdm')
 
 
@@ -34,7 +35,7 @@ def __call__(self, command: HermesCommand):
             _log.error("hermes.toml already contains a record_id for Invenio_RDM deposit.")
             raise MisconfigurationError(
                 "Can't overwrite record_id automatically."
-                f"(Tried to overwrite {old_record_id} with {deposition["record_id"]})"
+                f"(Tried to overwrite {old_record_id} with {deposition['record_id']})"
             )
         except KeyError:
             pass