Skip to content

Commit

Permalink
test for stderr before printing (#212)
Browse files Browse the repository at this point in the history
* test for stderr before printing
* bumped version / added to change log
* changed to a different semver
* corrected version

---------

Co-authored-by: tgalvin <tim.galvin@csiro.au>
  • Loading branch information
tjgalvin and tgalvin committed Nov 23, 2023
1 parent 31dec0b commit ef53ca3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -17,6 +17,7 @@ The client here will eventually be released as "spython" (and eventually to
singularity on pypi), and the versions here will coincide with these releases.

## [master](https://github.com/singularityhub/singularity-cli/tree/master)
- added check to enbsure stderr exists upon a non-zero return code when streaming (0.3.11)
- exposed the stream type option, and ability to capture both stdout and stderr when stream=True (0.3.1)
- dropping support for Singularity 2.x (0.3.0)
- add comment out of STOPSIGNAL (0.2.14)
Expand Down
5 changes: 4 additions & 1 deletion spython/utils/terminal.py
Expand Up @@ -148,7 +148,10 @@ def stream_command(
process.stdout.close()
return_code = process.wait()
if return_code:
print(process.stderr.read(), file=sys.stderr)
# Some situations may return process without an attached stderr object
# to read from
if process.stderr:
print(process.stderr.read(), file=sys.stderr)
raise subprocess.CalledProcessError(return_code, cmd)


Expand Down
2 changes: 1 addition & 1 deletion spython/version.py
Expand Up @@ -5,7 +5,7 @@
# with this file, You can obtain one at http://mozilla.org/MPL/2.0/.


__version__ = "0.3.1"
__version__ = "0.3.11"
AUTHOR = "Vanessa Sochat"
AUTHOR_EMAIL = "vsoch@users.noreply.github.com"
NAME = "spython"
Expand Down

0 comments on commit ef53ca3

Please sign in to comment.