diff --git a/.travis/before_install b/.travis/before_install index 0bdc18cb..9e81eb2d 100644 --- a/.travis/before_install +++ b/.travis/before_install @@ -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 diff --git a/.travis/script b/.travis/script index 9c2617a3..b16b7ee5 100644 --- a/.travis/script +++ b/.travis/script @@ -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 diff --git a/CHANGELOG.md b/CHANGELOG.md index abc21e12..b68da4b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/spython/main/instances.py b/spython/main/instances.py index 23a75c69..957a2f39 100644 --- a/spython/main/instances.py +++ b/spython/main/instances.py @@ -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) @@ -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'] diff --git a/spython/version.py b/spython/version.py index e2ce1160..45621e95 100644 --- a/spython/version.py +++ b/spython/version.py @@ -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'