diff --git a/doc/source/changelog.rst b/doc/source/changelog.rst index 17d56218a..ab86dfec8 100644 --- a/doc/source/changelog.rst +++ b/doc/source/changelog.rst @@ -1,6 +1,14 @@ Changelog ****************************** +- **v0.7.1** (*2017-11-15*): + + - Fixed + + - No longer falsely display that there's a submission failure. + + - Allow non-string values to be unquoted in the ``pipeline_args`` section. + - **v0.7** (*2017-11-15*): - New diff --git a/looper/_version.py b/looper/_version.py index 49e0fc1e0..a5f830a2c 100644 --- a/looper/_version.py +++ b/looper/_version.py @@ -1 +1 @@ -__version__ = "0.7.0" +__version__ = "0.7.1" diff --git a/looper/looper.py b/looper/looper.py index 45ed03d42..7aaa8d2f3 100755 --- a/looper/looper.py +++ b/looper/looper.py @@ -522,7 +522,7 @@ def __call__(self, args, remaining_args): samples_by_reason[SUBMISSION_FAILURE_MESSAGE] |= fails failed_samples_by_pipeline[pl_key] |= fails - failed_sub_samples = samples_by_reason[SUBMISSION_FAILURE_MESSAGE] + failed_sub_samples = samples_by_reason.get(SUBMISSION_FAILURE_MESSAGE) if failed_sub_samples: _LOGGER.info("\n{} samples with at least one failed job submission: {}". format(len(failed_sub_samples), diff --git a/looper/models.py b/looper/models.py index fa0f184bd..e773fdd43 100644 --- a/looper/models.py +++ b/looper/models.py @@ -1196,8 +1196,15 @@ def get_arg_string(self, pipeline_name): def make_optarg_text(opt, arg): """ Transform flag/option into CLI-ready text version. """ - return "{} {}".format(opt, _os.path.expandvars(arg)) \ - if arg else opt + if arg: + try: + arg = _os.path.expandvars(arg) + except TypeError: + # Rely on direct string formatting of arg. + pass + return "{} {}".format(opt, arg) + else: + return opt def create_argtext(name): """ Create command-line argstring text from config section. """