Skip to content

Commit

Permalink
support pulling from https (#176)
Browse files Browse the repository at this point in the history
* support pulling from https
* wrong version in changelog

Signed-off-by: vsoch <vsoch@users.noreply.github.com>
Co-authored-by: vsoch <vsoch@users.noreply.github.com>
  • Loading branch information
vsoch and vsoch committed Apr 6, 2021
1 parent 130366c commit 7701dbb
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ 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)
- add more verbosity to instance start/stop (0.0.12)
- adding support to pull from a url (0.1.13)
- add more verbosity to instance start/stop (0.1.12)
- adding more verbosity to running commands (0.1.11)
- log error paths are optional (0.1.1)
- instance list doesn't always include container_image (0.1.0)
Expand Down
6 changes: 4 additions & 2 deletions spython/main/pull.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,10 @@ def pull(
bot.exit("You must provide an image uri, or use client.load() first.")

# Singularity Only supports shub, docker and library pull
if not re.search("^(shub|docker|library)://", image):
bot.exit("pull only valid for docker, shub and library. Use sregistry client.")
if not re.search("^(shub|docker|library|https)://", image):
bot.exit(
"pull only valid for docker, https, shub and library. Use sregistry client."
)

# If we still don't have a custom name, base off of image uri.
if name is None:
Expand Down
2 changes: 1 addition & 1 deletion spython/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# with this file, You can obtain one at http://mozilla.org/MPL/2.0/.


__version__ = "0.1.12"
__version__ = "0.1.13"
AUTHOR = "Vanessa Sochat"
AUTHOR_EMAIL = "vsochat@stanford.edu"
NAME = "spython"
Expand Down

0 comments on commit 7701dbb

Please sign in to comment.