Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Capture stderr as well while trying for singularity or apptainer to avoid spurious stderr display #208

Merged
merged 2 commits into from
Jun 8, 2023
Merged

Capture stderr as well while trying for singularity or apptainer to avoid spurious stderr display #208

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f6875f
BF: capture also stderr while trying for singularity or apptainer
yarikoptic Jun 7, 2023
c06aff8
[release-action] Autogenerate changelog snippet for PR 208
Jun 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions datalad_container/extractors/_load_singularity_versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,21 @@
- external_versions["cmd:apptainer"]
- external_versions["cmd:singularity"]
"""
import subprocess

from datalad.cmd import (
StdOutCapture,
StdOutErrCapture,
WitlessRunner,
)
from datalad.support.external_versions import external_versions


def __get_apptainer_version():
version = WitlessRunner().run("apptainer --version", protocol=StdOutCapture)['stdout'].strip()
version = WitlessRunner().run("apptainer --version", protocol=StdOutErrCapture)['stdout'].strip()
return version.split("apptainer version ")[1]


def __get_singularity_version():
return WitlessRunner().run("singularity version", protocol=StdOutCapture)['stdout'].strip()
return WitlessRunner().run("singularity version", protocol=StdOutErrCapture)['stdout'].strip()


# Load external_versions and patch with "cmd:singularity" and "cmd:apptainer"
Expand Down