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
3 changes: 1 addition & 2 deletions .travis/before_install
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,4 @@ which python
python setup.py sdist && python setup.py install

# Install Singularity (development)
cd /tmp && git clone -b vault/release-2.5 https://github.com/singularityware/singularity.git && cd singularity && ./autogen.sh && ./configure --prefix=/usr/local && make && sudo make install

cd /tmp && git clone -b vault/release-2.6 https://github.com/singularityware/singularity.git && cd singularity && ./autogen.sh && ./configure --prefix=/usr/local && make && sudo make install
1 change: 0 additions & 1 deletion .travis/script
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/bin/bash
sudo apt-get install -y squashfs-tools
cd $TRAVIS_BUILD_DIR/spython
python -m unittest tests.test_client
python -m unittest tests.test_utils
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)
- instance stop all missing check for Singularity V3.+ (0.0.52)
- fixing bug with instances list, name not taken into account (0.0.51)
- additional of args to instance start commands (0.0.50)
- continued lines should not be split in docker.py recipe parser (_setup) (0.0.49)
Expand Down
9 changes: 7 additions & 2 deletions spython/main/instances.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,12 @@ def stopall(self, sudo=False, quiet=True):
from spython.utils import run_command, check_install
check_install()

cmd = self._init_command('instance.stop')
subgroup = 'instance.stop'

if 'version 3' in get_singularity_version():
subgroup = ["instance", "stop"]

cmd = self._init_command(subgroup)
cmd = cmd + ['--all']
output = run_command(cmd, sudo=sudo, quiet=quiet)

Expand All @@ -119,4 +124,4 @@ def stopall(self, sudo=False, quiet=True):
bot.error(message)
return output['return_code']

return output['return_code']
return output['return_code']
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.51"
__version__ = "0.0.52"
AUTHOR = 'Vanessa Sochat'
AUTHOR_EMAIL = 'vsochat@stanford.edu'
NAME = 'spython'
Expand Down