fix bug with instance run command (#214)

* fix bug with instance run command the incorrect function is exposed for instance.run_command it is missing the self parameter, and so the instance (self) is passed as the command. Signed-off-by: vsoch <[email protected]>
singularityhub · Dec 8, 2023 · dd013ba · dd013ba
1 parent ef53ca3
commit dd013ba
Show file tree

Hide file tree

Showing 40 changed files with 48 additions and 77 deletions.
diff --git 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)
+ - bug with instance.run_command (0.3.12)
  - added check to enbsure stderr exists upon a non-zero return code when streaming (0.3.11)
  - exposed the stream type option, and ability to capture both stdout and stderr when stream=True (0.3.1)
  - dropping support for Singularity 2.x (0.3.0)

diff --git a/setup.py b/setup.py
@@ -1,14 +1,3 @@
-"""
-
-Copyright (C) 2017-2021 Vanessa Sochat.
-
-This Source Code Form is subject to the terms of the
-Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed
-with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-"""
-
-
 import os
 
 from setuptools import find_packages, setup

diff --git a/spython/__init__.py b/spython/__init__.py
@@ -1,11 +1 @@
-"""
-
-Copyright (C) 2017-2022 Vanessa Sochat.
-
-This Source Code Form is subject to the terms of the
-Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed
-with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-"""
-
 from spython.version import __version__
diff --git a/spython/client/__init__.py b/spython/client/__init__.py
@@ -1,12 +1,11 @@
 #!/usr/bin/env python
 
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed
 # with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 import argparse
 import os
 import sys

diff --git a/spython/client/recipe.py b/spython/client/recipe.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed

diff --git a/spython/client/shell.py b/spython/client/shell.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed

diff --git a/spython/client/test.py b/spython/client/test.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed

diff --git a/spython/image.py b/spython/image.py
@@ -1,9 +1,10 @@
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed
 # with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+
 import hashlib
 import os
 

diff --git a/spython/instance/__init__.py b/spython/instance/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed

diff --git a/spython/instance/cmd/__init__.py b/spython/instance/cmd/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed
@@ -18,16 +18,14 @@ def generate_instance_commands():
     from spython.main.base.generate import RobotNamer
     from spython.main.base.logger import println
     from spython.main.instances import list_instances
-    from spython.utils import run_command as run_cmd
 
     from .logs import _logs, error_logs, output_logs
     from .start import start
     from .stop import stop
 
     Instance.RobotNamer = RobotNamer()
     Instance._init_command = init_command
-    Instance.run_command = run_cmd
-    Instance._run_command = run_command
+    Instance.run_command = run_command
     Instance._list = list_instances  # list command is used to get metadata
     Instance._println = println
     Instance.start = start  # intended to be called on init, not by user

diff --git a/spython/instance/cmd/logs.py b/spython/instance/cmd/logs.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed

diff --git a/spython/instance/cmd/start.py b/spython/instance/cmd/start.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed

diff --git a/spython/instance/cmd/stop.py b/spython/instance/cmd/stop.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed

diff --git a/spython/logger/compatibility.py b/spython/logger/compatibility.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed

diff --git a/spython/logger/message.py b/spython/logger/message.py
@@ -1,9 +1,10 @@
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed
 # with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+
 import os
 import sys
 

diff --git a/spython/logger/spinner.py b/spython/logger/spinner.py
@@ -1,10 +1,9 @@
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed
 # with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 import sys
 import threading
 import time

diff --git a/spython/main/__init__.py b/spython/main/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed

diff --git a/spython/main/apps.py b/spython/main/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed

diff --git a/spython/main/base/command.py b/spython/main/base/command.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed

diff --git a/spython/main/build.py b/spython/main/build.py
@@ -1,10 +1,9 @@
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed
 # with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 import os
 import re
 

diff --git a/spython/main/execute.py b/spython/main/execute.py
@@ -1,10 +1,9 @@
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed
 # with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 import os
 import shutil
 

diff --git a/spython/main/export.py b/spython/main/export.py
@@ -1,10 +1,9 @@
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed
 # with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 import os
 
 from spython.logger import bot

diff --git a/spython/main/help.py b/spython/main/help.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed

diff --git a/spython/main/inspect.py b/spython/main/inspect.py
@@ -1,9 +1,10 @@
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed
 # with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+
 import json as jsonp
 
 from spython.logger import bot

diff --git a/spython/main/instances.py b/spython/main/instances.py
@@ -1,10 +1,9 @@
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed
 # with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 import json
 
 from spython.logger import bot

diff --git a/spython/main/pull.py b/spython/main/pull.py
@@ -1,10 +1,9 @@
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed
 # with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 import os
 import re
 

diff --git a/spython/main/run.py b/spython/main/run.py
@@ -1,10 +1,9 @@
-# Copyright (C) 2017-2021 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed
 # with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 import json
 
 from spython.logger import bot

diff --git a/spython/oci/__init__.py b/spython/oci/__init__.py
@@ -1,9 +1,10 @@
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed
 # with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+
 from spython.image import ImageBase
 from spython.logger import bot
 

diff --git a/spython/tests/Xtest_oci.py b/spython/tests/Xtest_oci.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (C) 2020-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed

diff --git a/spython/tests/test_base.py b/spython/tests/test_base.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed

diff --git a/spython/tests/test_client.py b/spython/tests/test_client.py
@@ -1,11 +1,12 @@
 #!/usr/bin/python
 
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed
 # with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+
 import os
 import shutil
 from subprocess import CalledProcessError

diff --git a/spython/tests/test_conversion.py b/spython/tests/test_conversion.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed

diff --git a/spython/tests/test_instances.py b/spython/tests/test_instances.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed

diff --git a/spython/tests/test_parsers.py b/spython/tests/test_parsers.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed

diff --git a/spython/tests/test_recipe.py b/spython/tests/test_recipe.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (C) 2019-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed

diff --git a/spython/tests/test_utils.py b/spython/tests/test_utils.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed

diff --git a/spython/tests/test_writers.py b/spython/tests/test_writers.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (C) 2019-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed

diff --git a/spython/utils/fileio.py b/spython/utils/fileio.py
@@ -1,12 +1,8 @@
-"""
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
-# Copyright (C) 2017-2022 Vanessa Sochat.
-
-This Source Code Form is subject to the terms of the
-Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed
-with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-"""
+# This Source Code Form is subject to the terms of the
+# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed
+# with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import errno
 import json

diff --git a/spython/utils/misc.py b/spython/utils/misc.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed

diff --git a/spython/version.py b/spython/version.py
@@ -1,11 +1,11 @@
-# Copyright (C) 2017-2022 Vanessa Sochat.
+# Copyright (C) 2017-2024 Vanessa Sochat.
 
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed
 # with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-__version__ = "0.3.11"
+__version__ = "0.3.12"
 AUTHOR = "Vanessa Sochat"
 AUTHOR_EMAIL = "[email protected]"
 NAME = "spython"