Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ workflows:
singularity-3: true
- run-spython-ci-tests:
<<: *base_job
name: "Oldest Singularity - Python 3"
name: "Singularity 3.1.0 - Python 3"
singularity: 3.1.0
run-linter: true # Use any job to run linter once
- run-spython-ci-tests:
<<: *base_job
name: "Singularity after OCI change - Python 3"
name: "Singularity 3.2.0 - Python 3"
singularity: 3.2.0
- run-spython-ci-tests:
<<: *base_job
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
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)
- fixing bug that inspect does not honor quiet (0.0.65)
- refactor recipe parsers, writers, and base (0.0.64)
- paths for files, add, copy, will not be expanded as it adds hardcoded paths
- oci state fixes and added Client.version_info() (0.0.63)
Expand Down
11 changes: 8 additions & 3 deletions spython/main/inspect.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
# with this file, You can obtain one at http://mozilla.org/MPL/2.0/.

import json as jsonp
from spython.logger import bot

from spython.utils import (
check_install,
Expand All @@ -26,11 +27,15 @@ def inspect(self, image=None, json=True, app=None, quiet=True):
check_install()

# No image provided, default to use the client's loaded image
if image is None:
if not image:
image = self._get_uri()

# If there still isn't an image, exit on error
if not image:
bot.exit('Please provide an image to inspect.')

cmd = self._init_command('inspect')
if app is not None:
if app:
cmd = cmd + ['--app', app]

options = ['e', 'd', 'l', 'r', 'hf', 't']
Expand All @@ -47,7 +52,7 @@ def inspect(self, image=None, json=True, app=None, quiet=True):
cmd.append('--json')

cmd.append(image)
result = run_command(cmd, quiet=False)
result = run_command(cmd, quiet=quiet)

if result['return_code'] == 0:
result = jsonp.loads(result['message'][0])
Expand Down
2 changes: 1 addition & 1 deletion spython/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# with this file, You can obtain one at http://mozilla.org/MPL/2.0/.


__version__ = "0.0.64"
__version__ = "0.0.65"
AUTHOR = 'Vanessa Sochat'
AUTHOR_EMAIL = 'vsochat@stanford.edu'
NAME = 'spython'
Expand Down