From e1e66adeb56035ce4b3c933b96fe2963df4e9d09 Mon Sep 17 00:00:00 2001 From: Vanessasaurus <814322+vsoch@users.noreply.github.com> Date: Tue, 10 Oct 2023 05:38:28 -0600 Subject: [PATCH] unpin yaml version, broken in conda (#662) * unpin yaml version, broken in conda Signed-off-by: vsoch --- CHANGELOG.md | 1 + shpc/defaults.py | 8 +++++++- shpc/version.py | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 821f9a5d4..8123fe75a 100644 --- a/CHANGELOG.md +++ b/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) + - unpin yaml dependency (0.1.26) - Change format of config command output to only show setting values, not keys, for parseability (0.1.25) - Allow custom location for wrapper scripts (0.1.24) - Labels with newlines need additional parsing (0.1.23) diff --git a/shpc/defaults.py b/shpc/defaults.py index 007bd34ac..a190eded3 100644 --- a/shpc/defaults.py +++ b/shpc/defaults.py @@ -18,7 +18,13 @@ ) # variables in settings that allow environment variable expansion -allowed_envars = ["container_base", "module_base", "views_base", "wrapper_base", "registry"] +allowed_envars = [ + "container_base", + "module_base", + "views_base", + "wrapper_base", + "registry", +] # The default GitHub registry with recipes (for docgen) github_url = "https://github.com/singularityhub/shpc-registry" diff --git a/shpc/version.py b/shpc/version.py index 25c71bdfa..237e405c6 100644 --- a/shpc/version.py +++ b/shpc/version.py @@ -2,7 +2,7 @@ __copyright__ = "Copyright 2021-2023, Vanessa Sochat" __license__ = "MPL 2.0" -__version__ = "0.1.25" +__version__ = "0.1.26" AUTHOR = "Vanessa Sochat" EMAIL = "vsoch@users.noreply.github.com" NAME = "singularity-hpc" @@ -21,7 +21,7 @@ ("spython", {"min_version": "0.2.0"}), ("Jinja2", {"min_version": None}), ("jsonschema", {"min_version": None}), - ("ruamel.yaml", {"max_version": "0.17.21"}), + ("ruamel.yaml", {"min_version": None}), ("requests", {"min_version": None}), )