From 350f3f79680836e372912622c6be63368f516534 Mon Sep 17 00:00:00 2001 From: Donald Campbell <125581724+donaldcampbelljr@users.noreply.github.com> Date: Mon, 31 Jul 2023 16:24:25 -0400 Subject: [PATCH 1/2] Expand paths after rendering var_templates. For point release v1.4.2. --- looper/conductor.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/looper/conductor.py b/looper/conductor.py index b2d12146c..852923745 100644 --- 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 From 1a5aec93335058c500b57c660ce9e2944f79c79e Mon Sep 17 00:00:00 2001 From: Donald Campbell <125581724+donaldcampbelljr@users.noreply.github.com> Date: Mon, 31 Jul 2023 16:32:05 -0400 Subject: [PATCH 2/2] changelog and version update --- docs/changelog.md | 5 +++++ looper/_version.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/changelog.md b/docs/changelog.md index b783aa8d9..3a4338f09 100644 --- 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 index bf2561596..daa50c7cf 100644 --- a/looper/_version.py +++ b/looper/_version.py @@ -1 +1 @@ -__version__ = "1.4.1" +__version__ = "1.4.2"