Merge branch 'ragavi' of github.com:SpheMakh/Stimela into ragavi

Author: o-smirnov

setup.py

@@ -9,11 +9,10 @@
 requirements = ["pyyaml",
                 "nose>=1.3.7",
                 "future-fstrings",
-                "udocker",
                 ],
 
 PACKAGE_NAME = "stimela"
-__version__ = "1.5.0"
+__version__ = "1.5.1"
 
 setup(name=PACKAGE_NAME,
       version=__version__,

stimela/recipe.py

@@ -225,9 +225,9 @@ def setup_job(self, image, config,
             simage = _cab.base.replace("/", "_")
             if singularity_image_dir is None:
                 singularity_image_dir = os.path.join(CDIR, "stimela_singularity_images")
-                singularity_image_dir = os.path.abspath(singularity_image_dir)
             cont.image = '{0:s}/{1:s}_{2:s}{3:s}'.format(singularity_image_dir,
                     simage, _cab.tag, singularity.suffix)
+            cont.image = os.path.abspath(cont.image)
             if not os.path.exists(cont.image):
                 main.pull(f"-s -cb {cont.cabname} -pf {singularity_image_dir}".split())
         else: