removing checks for versions across all files and 2.x image commands … (#191)

* removing checks for versions across all files and 2.x image commands import, export

the reason being so we can easily support apptainer and singularityce installs,
which both provide an executable singularity but with different versions! Also,
people should not be using the 2.x command groups at this point because there are too
many security issues. We can support this in some small way by not making it easy/possible
to do here, unless they want to install an older version. This will fix #190

Signed-off-by: vsoch <[email protected]>

Author: vsoch

.github/workflows/main.yml

@@ -27,7 +27,7 @@ jobs:
         run: |
           export PATH="/usr/share/miniconda/bin:$PATH"
           source activate black
-          pyflakes spython/oci spython/image spython/instance spython/main
+          pyflakes spython/oci spython/image.py spython/instance spython/main
 
   pytest:
     runs-on: ubuntu-latest

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)
+ - version checks removed to support Singularity 3.x and above (0.2.0)
  - adding support for SIF (oras pull) (0.1.18)
  - updating CI/tests and fixing deprecations (warnings) (0.1.17)
  - fixing bug with defining comments earlier (0.1.16)

spython/README.md

@@ -4,7 +4,7 @@ This will briefly outline the content of the folders here.
 ## Main Functions
 
  - [main](main) holds the primary client functions to interact with Singularity (e.g., exec, run, pull), and the subfolders within represent command groups (e.g., instance, image) along with the base of the client ([base](main/base)). This folder is where **commands** go!
- - [image](image) is a class that represents and holds an image object, in the case that the user wants to initialize a client with an image. This holds the ImageClass, which is only needed to instantiate an image.
+ - [image](image.py) is a class that represents and holds an image object, in the case that the user wants to initialize a client with an image. This holds the ImageClass, which is only needed to instantiate an image.
  - [instance](instance) is a class that represents and holds an instance object. The user can instantiate the class, and then run it's sub functions to interact with it. The higher level "list" command is provided on the level of the client.
  - [cli](cli): is the actual entry point that connects the user to the python API client from the command line. The user inputs are parsed, and then passed into functions from main.
 

spython/image/__init__.py spython/image.pyspython/image/__init__.py renamed to spython/image.py

@@ -10,7 +10,7 @@
 from spython.utils import split_uri
 
 
-class ImageBase(object):
+class ImageBase:
     def __str__(self):
         protocol = getattr(self, "protocol", None)
         if protocol:

spython/image/cmd/__init__.py

@@ -56,12 +56,7 @@ def start(
 
         image = self._image
 
-    # Derive subgroup command based on singularity version
-    subgroup = "instance.start"
-    if "version 3" in self.version():
-        subgroup = ["instance", "start"]
-
-    cmd = self._init_command(subgroup, singularity_options)
+    cmd = self._init_command(["instance", "start"], singularity_options)
 
     # Set options and args
     args = args or self.args