Miscellaneous changes (#516)

* Should this not be a warning ?
* `self._cleanup(module_dir)` should be called in both cases.
Refactored the code, so that cleanup is only implemented once
* Only ignore these in the root directory
* duplicated
* version bump

Author: muffato

.gitignore

@@ -4,7 +4,6 @@ shpc.db
 singularity_hpc.egg-info/
 env
 .env
-env
 build
 docs/_build
 release
@@ -15,6 +14,6 @@ __pycache__
 *.simg
 *.sif
 *.img
-.eggs
-symlinks
-modules
+/.eggs
+/symlinks
+/modules

CHANGELOG.md

@@ -14,6 +14,7 @@ and **Merged pull requests**. Critical items to know are:
 The versions coincide with releases on pip. Only major versions will be released as tags on Github.
 
 ## [0.0.x](https://github.com/singularityhub/singularity-hpc/tree/main) (0.0.x)
+ - Properly cleanup empty module directories, and asking to remove a container that doesn't exist now logs a _warning_ (0.0.48)
  - wrapper script generation permissions error (0.0.47)
  - fixing but with stream command repeating output (0.0.46)
  - Adding support for wrapper scripts for global and container.yaml (0.0.45)

shpc/main/modules/__init__.py

@@ -104,17 +104,15 @@ def _uninstall(self, module_dir, name, force=False):
         """
         Sub function, so we can pass more than one folder from uninstall
         """
-        if os.path.exists(module_dir) and not force:
-            msg = "%s, and all content below it? " % name
-            if utils.confirm_uninstall(msg, force):
-                self._cleanup(module_dir)
-                logger.info("%s and all subdirectories been removed." % name)
-
-        elif os.path.exists(module_dir) and force:
-            shutil.rmtree(module_dir)
+        if os.path.exists(module_dir):
+            if not force:
+                msg = "%s, and all content below it? " % name
+                if not utils.confirm_uninstall(msg, force):
+                    return
+            self._cleanup(module_dir)
             logger.info("%s and all subdirectories have been removed." % name)
         else:
-            logger.info("%s does not exist." % name)
+            logger.warning("%s does not exist." % name)
 
     def _test_setup(self, tmpdir):
         """

shpc/version.py

@@ -2,7 +2,7 @@
 __copyright__ = "Copyright 2021-2022, Vanessa Sochat"
 __license__ = "MPL 2.0"
 
-__version__ = "0.0.47"
+__version__ = "0.0.48"
 AUTHOR = "Vanessa Sochat"
 NAME = "singularity-hpc"
 PACKAGE_URL = "https://github.com/singularityhub/singularity-hpc"