reactivated tests and added afew log calls

Author: notactuallyfinn

src/hermes/commands/__init__.py

@@ -11,7 +11,7 @@
 from hermes.commands.base import HermesHelpCommand
 from hermes.commands.base import HermesVersionCommand
 from hermes.commands.clean.base import HermesCleanCommand
-# from hermes.commands.init.base import HermesInitCommand
+from hermes.commands.init.base import HermesInitCommand
 from hermes.commands.curate.base import HermesCurateCommand
 from hermes.commands.harvest.base import HermesHarvestCommand
 from hermes.commands.process.base import HermesProcessCommand

src/hermes/commands/cli.py

@@ -12,13 +12,9 @@
 import sys
 
 from hermes import logger
-# FIXME: remove comments after new implementation of modules is available
-# from hermes.commands import (HermesHelpCommand, HermesVersionCommand, HermesCleanCommand,
-#                              HermesHarvestCommand, HermesProcessCommand, HermesCurateCommand,
-#                              HermesDepositCommand, HermesPostprocessCommand, HermesInitCommand)
 from hermes.commands import (
-    HermesCurateCommand, HermesDepositCommand, HermesHarvestCommand, HermesHelpCommand, HermesPostprocessCommand,
-    HermesProcessCommand, HermesVersionCommand
+    HermesCurateCommand, HermesCleanCommand, HermesDepositCommand, HermesHarvestCommand, HermesHelpCommand,
+    HermesInitCommand, HermesPostprocessCommand, HermesProcessCommand, HermesVersionCommand
 )
 from hermes.commands.base import HermesCommand
 from hermes.error import HermesPluginRunError
@@ -42,12 +38,12 @@ def main() -> None:
     setting_types = {}
 
     for command in (
-            # HermesCleanCommand(parser),
+            HermesCleanCommand(parser),
             HermesCurateCommand(parser),
             HermesDepositCommand(parser),
             HermesHarvestCommand(parser),
             HermesHelpCommand(parser),
-            # HermesInitCommand(parser),
+            HermesInitCommand(parser),
             HermesPostprocessCommand(parser),
             HermesProcessCommand(parser),
             HermesVersionCommand(parser),

src/hermes/commands/curate/base.py

@@ -25,7 +25,7 @@ def __call__(self, command: HermesCommand, metadata: SoftwareMetadata) -> Softwa
 class CurateSettings(BaseModel):
     """Generic deposition settings."""
 
-    plugin: str = ""
+    plugin: str = "pass_curate"
 
 
 class HermesCurateCommand(HermesCommand):
@@ -51,15 +51,15 @@ def __call__(self, args: argparse.Namespace) -> None:
             raise HermesValidationError("The results of the process step are invalid.") from e
         ctx.finalize_step("process")
 
-        self.log.info("## Load curation plugin")
+        self.log.info(f"## Load curation plugin {plugin_name}")
         # load plugin
         try:
             plugin_func = self.plugins[plugin_name]()
         except KeyError:
             self.log.error(f"Plugin {plugin_name} not found.")
             raise MisconfigurationError(f"Curate plugin {plugin_name} not found.")
 
-        self.log.info("## Run curation plugin")
+        self.log.info(f"## Run curation plugin {plugin_name}")
         # run plugin
         try:
             curated_metadata = plugin_func(self, metadata)

src/hermes/commands/deposit/base.py

@@ -139,15 +139,15 @@ def __call__(self, args: argparse.Namespace) -> None:
         self.args = args
         plugin_name = self.settings.target
 
-        self.log.info("## Load deposit plugin")
+        self.log.info(f"## Load deposit plugin {plugin_name}")
         # load plugin
         try:
             plugin_func = self.plugins[plugin_name]()
         except KeyError:
             self.log.error(f"Plugin {plugin_name} not found.")
             raise MisconfigurationError(f"Deposit plugin {self.settings.plugin} not found.")
 
-        self.log.info("## Run deposit plugin")
+        self.log.info(f"## Run deposit plugin {plugin_name}")
         # run plugin
         try:
             plugin_func(self)

src/hermes/commands/harvest/base.py

@@ -40,6 +40,9 @@ def __call__(self, args: argparse.Namespace) -> None:
         self.log.info("# Metadata harvesting")
         self.args = args
 
+        if len(self.settings.sources) == 0:
+            self.log.info("# No plugin was configured to be run and loaded.")
+
         # Initialize the harvest cache directory here to indicate the step ran
         ctx = HermesContext()
         ctx.prepare_step('harvest')

test/hermes_test/commands/deposit/test_invenio_e2e.py

@@ -37,7 +37,7 @@ def sandbox_auth():
                     "http://schema.org/familyName": [{"@value": "Test"}],
                     "http://schema.org/givenName": [{"@value": "Testi"}]
                 }],
-                "http://schema.org/license": [{"@id": "https://spdx.org/licenses/Apache-2.0"}]
+                "http://schema.org/license": ["https://spdx.org/licenses/Apache-2.0"]
             }),
             {
                 "upload_type": "software",

test/hermes_test/commands/init/test_init.py

@@ -7,8 +7,6 @@
 import json
 import pytest
 
-pytest.skip("FIXME: Re-enable test after data model refactoring is done.", allow_module_level=True)
-
 from hermes.commands.init.base import string_in_file, download_file_from_url
 from unittest.mock import patch, MagicMock
 import hermes.commands.init.util.oauth_process as oauth_process

test/hermes_test/conftest.py

@@ -7,6 +7,7 @@
 import os
 import shutil
 import subprocess
+import sys
 
 import pytest
 
@@ -33,7 +34,7 @@ def __enter__(self):
 
     def run(self, *args):
         proc = subprocess.Popen(
-            [self.hermes_exe, *args], stdout=subprocess.PIPE, stderr=subprocess.PIPE
+            [sys.executable, "-m", self.hermes_exe, *args], stdout=subprocess.PIPE, stderr=subprocess.PIPE
         )
         proc.wait()
         return proc

test/hermes_test/test_cli.py

@@ -8,8 +8,6 @@
 
 import pytest
 
-pytest.skip("FIXME: Re-enable test after data model refactoring is done.", allow_module_level=True)
-
 from hermes.commands import cli
 
 
@@ -34,6 +32,5 @@ def test_hermes_process(hermes_env):
 
     with hermes_env:
         result = hermes_env.run("process")
-        print(result.stdout.read())
 
     assert result.returncode == 0

test/hermes_test/test_main.py

@@ -6,10 +6,6 @@
 
 # flake8: noqa
 
-import pytest
-
-pytest.skip("FIXME: Re-enable test after data model refactoring is done.", allow_module_level=True)
-
 import subprocess
 import sys