Skip to content

Commit 689fcde

Browse files
authored
need to support old daemon_name, etc (#171)
Signed-off-by: vsoch <[email protected]> Co-authored-by: vsoch <[email protected]>
1 parent 51b7697 commit 689fcde

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ The client here will eventually be released as "spython" (and eventually to
1717
singularity on pypi), and the versions here will coincide with these releases.
1818

1919
## [master](https://github.com/singularityhub/singularity-cli/tree/master)
20+
- log error paths are optional (0.1.1)
2021
- instance list doesn't always include container_image (0.1.0)
2122
- add sudo_options option to Instance.start/stop and Client.execute (0.0.85)
2223
- add environ option to Instance.start and Client.execute for passing env variables

spython/main/instances.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ def list_instances(
7777

7878
# Otherwise, add instances to the listing
7979
new_instance = self.instance(
80-
pid=i["pid"],
81-
ip_address=i["ip"],
82-
name=i["instance"],
83-
log_err_path=i["logErrPath"],
84-
log_out_path=i["logOutPath"],
85-
image=i.get("img", None),
80+
pid=i.get("pid"),
81+
ip_address=i.get("ip"),
82+
name=i.get("instance") or i.get("daemon_name"),
83+
log_err_path=i.get("logErrPath"),
84+
log_out_path=i.get("logOutPath"),
85+
image=i.get("img") or i.get("container_image"),
8686
start=False,
8787
)
8888

spython/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
66

77

8-
__version__ = "0.1.0"
8+
__version__ = "0.1.1"
99
AUTHOR = "Vanessa Sochat"
1010
AUTHOR_EMAIL = "[email protected]"
1111
NAME = "spython"

0 commit comments

Comments
 (0)