Timeout in instance stop

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 with timeout argument (0.0.77)
  - instance list includes ip address (0.0.76)
  - export lines aren't ignored from environment, but replaced (0.0.75)
  - instance logging functions for Singularity 3.5 and up (0.0.74)

spython/instance/cmd/stop.py

@@ -8,13 +8,15 @@
 from spython.logger import bot
 
 
-def stop(self, name=None, sudo=False):
+def stop(self, name=None, sudo=False, timeout=None):
     """stop an instance. This is done by default when an instance is created.
 
        Parameters
        ==========
        name: a name for the instance
        sudo: if the user wants to run the command with sudo
+       timeout: forcebly kill non-stopped instance after the
+                timeout specified in seconds
 
        USAGE: 
        singularity [...] instance.stop [...] <instance name>
@@ -28,6 +30,8 @@ def stop(self, name=None, sudo=False):
 
     if "version 3" in self.version():
         subgroup = ["instance", "stop"]
+        if timeout:
+            subgroup += ["-t", str(timeout)]
 
     cmd = self._init_command(subgroup)
 

spython/version.py

@@ -5,7 +5,7 @@
 # with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-__version__ = "0.0.76"
+__version__ = "0.0.77"
 AUTHOR = "Vanessa Sochat"
 AUTHOR_EMAIL = "vsochat@stanford.edu"
 NAME = "spython"