Merge pull request #384 from pepkit/v_142_pointrelease

Expand paths after rendering var_templates. For point release v1.4.2.
pepkit · Jul 31, 2023 · 3399add · 3399add
2 parents 5891017 + 1a5aec9
commit 3399add
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -2,6 +2,11 @@
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) and [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) format.
 
+## [1.4.2] -- 2023-07-31
+
+### Fixed
+- Fix for expanding paths properly.
+
 ## [1.4.1] -- 2023-06-22
 
 ### Fixed

diff --git a/looper/_version.py b/looper/_version.py
@@ -1 +1 @@
-__version__ = "1.4.1"
+__version__ = "1.4.2"
diff --git a/looper/conductor.py b/looper/conductor.py
@@ -19,7 +19,7 @@
 from pipestat import PipestatError
 from ubiquerg import expandpath
 from yaml import dump
-from yacman import YAMLConfigManager
+from yacman import YAMLConfigManager, expandpath as expath
 
 from .const import *
 from .exceptions import JobSubmissionException
@@ -730,6 +730,8 @@ def write_script(self, pool, size):
             )
             _LOGGER.debug(f"namespace pipelines: { pl_iface }")
             namespaces["pipeline"]["var_templates"] = pl_iface[VAR_TEMPL_KEY]
+            for k, v in namespaces["pipeline"]["var_templates"].items():
+                namespaces["pipeline"]["var_templates"][k] = expath(v)
             # pre_submit hook namespace updates
             namespaces = _exec_pre_submit(pl_iface, namespaces)
             self._rendered_ok = False