Merge pull request #793 from linsword13/cleanup

Minor cleanups for pkgman

lib/ramble/ramble/util/command_runner.py

@@ -45,7 +45,7 @@ def get_version(self):
 
     def set_dry_run(self, dry_run=False):
         """
-        Set the dry_run state of this spack runner
+        Set the dry_run state of this runner
         """
         self.dry_run = dry_run
 

var/ramble/repos/builtin/package_managers/pip/package_manager.py

@@ -252,7 +252,7 @@ def _extract_pkg_name(pkg_spec):
     return match.group("pkg_name") if match else None
 
 
-class PipRunner(ramble.util.command_runner.CommandRunner):
+class PipRunner(CommandRunner):
     """Runner for executing pip+venv commands."""
 
     _venv_name = ".venv"
@@ -273,10 +273,6 @@ def configure_env(self, path):
         """Configure the venv path for subsequent commands"""
         self.env_path = path
 
-    def set_dry_run(self, dry_run=False):
-        """Set the dry_run state of this pip runner"""
-        self.dry_run = dry_run
-
     def create_env(self, env_path):
         """Ensure a venv environment is created"""
         if os.path.exists(env_path) and not os.path.isdir(env_path):

var/ramble/repos/builtin/package_managers/spack-lightweight/package_manager.py

@@ -21,7 +21,6 @@
 import ramble.config
 import ramble.error
 import ramble.util.hashing
-import ramble.util.command_runner
 from ramble.util.logger import logger
 
 
@@ -92,7 +91,7 @@ def _software_install_requested_compilers(self, workspace, app_inst=None):
                     logger.debug(f"Installing compiler: {compiler_spec}")
                     self.runner.install_compiler(compiler_spec)
 
-        except ramble.util.command_runner.RunnerError as e:
+        except RunnerError as e:
             logger.die(e)
 
     register_phase("software_create_env", pipeline="mirror")
@@ -197,7 +196,7 @@ def _software_create_env(self, workspace, app_inst=None):
 
                 self.runner.deactivate()
 
-        except ramble.util.command_runner.RunnerError as e:
+        except RunnerError as e:
             logger.die(e)
 
     register_phase(
@@ -238,7 +237,7 @@ def _software_configure(self, workspace, app_inst=None):
             if not env_concretized:
                 self.runner.concretize()
 
-        except ramble.util.command_runner.RunnerError as e:
+        except RunnerError as e:
             logger.die(e)
 
     register_phase(
@@ -320,7 +319,7 @@ def _mirror_software(self, workspace, app_inst=None):
             for i in range(error_start, error_start + failed):
                 workspace.software_mirror_stats.errors.add(i)
 
-        except ramble.util.command_runner.RunnerError as e:
+        except RunnerError as e:
             if self.environment_required():
                 logger.die(e)
             pass
@@ -348,7 +347,7 @@ def _push_to_spack_cache(self, workspace, app_inst=None):
             self.runner.push_to_spack_cache(workspace.spack_cache_path)
 
             self.runner.deactivate()
-        except ramble.util.command_runner.RunnerError as e:
+        except RunnerError as e:
             if self.environment_required():
                 logger.die(e)
             pass
@@ -365,7 +364,7 @@ def populate_inventory(
 
         try:
             pkgman_version = self.runner.get_version()
-        except ramble.util.command_runner.RunnerError:
+        except RunnerError:
             pkgman_version = "unknown"
 
         self.app_inst.hash_inventory["package_manager"].append(
@@ -433,7 +432,7 @@ def _deploy_artifacts(self, workspace, app_inst=None):
 
             self.runner.deactivate()
 
-        except ramble.util.command_runner.RunnerError as e:
+        except RunnerError as e:
             if self.environment_required():
                 logger.die(e)
             pass
@@ -523,7 +522,7 @@ def _add_software_to_results(self, workspace, app_inst=None):
 package_name_regex = re.compile(r"[\s-]*(?P<package_name>[\w][\w-]+).*")
 
 
-class SpackRunner(ramble.util.command_runner.CommandRunner):
+class SpackRunner(CommandRunner):
     """Runner for executing several spack commands
 
     The SpackRunner class is primarily used to manage spack environments
@@ -638,12 +637,6 @@ def get_version(self):
 
         return spack_version
 
-    def set_dry_run(self, dry_run=False):
-        """
-        Set the dry_run state of this spack runner
-        """
-        self.dry_run = dry_run
-
     def set_compiler_config_dir(self, path=None):
         """
         Set the config path to use when installing compilers
@@ -711,9 +704,7 @@ def create_env(self, path, output=None, error=None):
         this runner.
         """
         if os.path.exists(path) and not os.path.isdir(path):
-            raise ramble.util.command_runner.RunnerError(
-                "Unable to create environment %s" % path
-            )
+            raise RunnerError("Unable to create environment %s" % path)
 
         if not os.path.exists(path):
             fs.mkdirp(path)
@@ -753,9 +744,7 @@ def load_compiler(self, spec):
             )
             shell_flag = "--fish"
         else:
-            raise ramble.util.command_runner.RunnerError(
-                "Shell %s not supported" % self.shell
-            )
+            raise RunnerError("Shell %s not supported" % self.shell)
 
         self._load_compiler_shell(spec, shell_flag, regex)
 
@@ -853,7 +842,7 @@ def activate(self):
         Ensure the spack environment is active in subsequent commands.
         """
         if not self.env_path:
-            raise ramble.util.command_runner.NoPathRunnerError(
+            raise NoPathRunnerError(
                 "Environment runner has no path configured"
             )
 
@@ -868,7 +857,7 @@ def deactivate(self):
         Ensure the spack environment is not active in subsequent commands.
         """
         if not self.env_path:
-            raise ramble.util.command_runner.NoPathRunnerError(
+            raise NoPathRunnerError(
                 "Environment runner has no path configured"
             )
 
@@ -880,7 +869,7 @@ def deactivate(self):
 
     def _check_active(self):
         if not self.env_path:
-            raise ramble.util.command_runner.NoPathRunnerError(
+            raise NoPathRunnerError(
                 "Environment runner has no path configured"
             )
 
@@ -1354,10 +1343,10 @@ def package_provenance(self):
                         yield info_dict
 
 
-class NoActiveEnvironmentError(ramble.util.command_runner.RunnerError):
+class NoActiveEnvironmentError(RunnerError):
     """Raised when an environment command is executed without an active
     environment."""
 
 
-class InvalidExternalEnvironment(ramble.util.command_runner.RunnerError):
+class InvalidExternalEnvironment(RunnerError):
     """Raised when an invalid external spack environment is passed in"""