Skip to content

Commit

Permalink
unpin yaml version, broken in conda (#662)
Browse files Browse the repository at this point in the history
* unpin yaml version, broken in conda

Signed-off-by: vsoch <vsochat@stanford.edu>
  • Loading branch information
vsoch committed Oct 10, 2023
1 parent df6a62c commit e1e66ad
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 7 additions & 1 deletion shpc/defaults.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions shpc/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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}),
)

Expand Down

0 comments on commit e1e66ad

Please sign in to comment.