Adding oras and bumping license years (#186)

vsoch · web-flow · commit 0fac96b8768e · 2022-01-19T19:41:49.000-07:00
* adding oras and bumping license years
Signed-off-by: vsoch &lt;vsoch@users.noreply.github.com&gt;
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -38,8 +38,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: eWaterCycle/setup-singularity@1631b12cf3878381179be0eab9624219bc12979e # v6 release
-
+      - uses: eWaterCycle/setup-singularity@bebf1d6f54f9d2d159ac5c15385912dc39b23711 # v7 release
+        with:
+         singularity-version: 3.8.4
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:
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)
+ - 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)
  - ensure options and args from instance init are honored (0.1.15)
diff --git a/spython/__init__.py b/spython/__init__.py
@@ -1,6 +1,6 @@
 """
 
-Copyright (C) 2017-2021 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
diff --git a/spython/client/__init__.py b/spython/client/__init__.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (C) 2017-2021 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
diff --git a/spython/client/recipe.py b/spython/client/recipe.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/client/shell.py b/spython/client/shell.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/client/test.py b/spython/client/test.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/image/__init__.py b/spython/image/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/image/cmd/__init__.py b/spython/image/cmd/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/image/cmd/create.py b/spython/image/cmd/create.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/image/cmd/export.py b/spython/image/cmd/export.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/image/cmd/importcmd.py b/spython/image/cmd/importcmd.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/image/cmd/utils.py b/spython/image/cmd/utils.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/instance/__init__.py b/spython/instance/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/instance/cmd/__init__.py b/spython/instance/cmd/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/instance/cmd/logs.py b/spython/instance/cmd/logs.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2021 Vanessa Sochat.
+# Copyright (C) 2019-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
diff --git a/spython/instance/cmd/start.py b/spython/instance/cmd/start.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/instance/cmd/stop.py b/spython/instance/cmd/stop.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/logger/compatibility.py b/spython/logger/compatibility.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/logger/message.py b/spython/logger/message.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/logger/spinner.py b/spython/logger/spinner.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/__init__.py b/spython/main/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/apps.py b/spython/main/apps.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/base/__init__.py b/spython/main/base/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/base/command.py b/spython/main/base/command.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/base/flags.py b/spython/main/base/flags.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/base/generate.py b/spython/main/base/generate.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/base/logger.py b/spython/main/base/logger.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/base/sutils.py b/spython/main/base/sutils.py
@@ -1,7 +1,7 @@
 # Singularity Image utils for interacting with the Image/Instance
 #           classes from the client
 
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/build.py b/spython/main/build.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/execute.py b/spython/main/execute.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/export.py b/spython/main/export.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/help.py b/spython/main/help.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/inspect.py b/spython/main/inspect.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/instances.py b/spython/main/instances.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/parse/parsers/__init__.py b/spython/main/parse/parsers/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/parse/parsers/base.py b/spython/main/parse/parsers/base.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/parse/parsers/docker.py b/spython/main/parse/parsers/docker.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/parse/parsers/singularity.py b/spython/main/parse/parsers/singularity.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/parse/recipe.py b/spython/main/parse/recipe.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/parse/writers/__init__.py b/spython/main/parse/writers/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/parse/writers/base.py b/spython/main/parse/writers/base.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/parse/writers/docker.py b/spython/main/parse/writers/docker.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/parse/writers/singularity.py b/spython/main/parse/writers/singularity.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/main/pull.py b/spython/main/pull.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
@@ -60,10 +60,8 @@ def pull(
         bot.exit("You must provide an image uri, or use client.load() first.")
 
     # Singularity Only supports shub, docker and library pull
-    if not re.search("^(shub|docker|library|https)://", image):
-        bot.exit(
-            "pull only valid for docker, https, shub and library. Use sregistry client."
-        )
+    if not re.search("^(shub|docker|library|https|oras)://", image):
+        bot.exit("pull only valid for docker, oras, https, shub and library.")
 
     # If we still don't have a custom name, base off of image uri.
     if name is None:
diff --git a/spython/oci/__init__.py b/spython/oci/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/oci/cmd/__init__.py b/spython/oci/cmd/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/oci/cmd/actions.py b/spython/oci/cmd/actions.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/oci/cmd/mounts.py b/spython/oci/cmd/mounts.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2021 Vanessa Sochat.
+# Copyright (C) 2019-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
diff --git a/spython/oci/cmd/states.py b/spython/oci/cmd/states.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2021 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
diff --git a/spython/tests/conftest.py b/spython/tests/conftest.py
@@ -24,6 +24,14 @@ def test_data(installdir):  # pylint: disable=redefined-outer-name
     }
 
 
+@pytest.fixture(scope="session")
+def oras_container(tmp_path_factory):
+    folder = tmp_path_factory.mktemp("oras-img")
+    return folder, Client.pull(
+        "oras://ghcr.io/singularityhub/github-ci:latest", pull_folder=str(folder)
+    )
+
+
 @pytest.fixture(scope="session")
 def docker_container(tmp_path_factory):
     folder = tmp_path_factory.mktemp("docker-img")
diff --git a/spython/tests/test_base.py b/spython/tests/test_base.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (C) 2017-2021 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
diff --git a/spython/tests/test_client.py b/spython/tests/test_client.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (C) 2017-2021 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
@@ -35,8 +35,14 @@ def test_export():
 def test_docker_pull(docker_container):
     tmp_path, container = docker_container
     print(container)
-    ext = "sif" if Client.version_info().major >= 3 else "simg"
-    assert container == str(tmp_path / ("busybox:1.30.1." + ext))
+    assert container == str(tmp_path / ("busybox:1.30.1.sif"))
+    assert os.path.exists(container)
+
+
+def test_oras_pull(oras_container):
+    tmp_path, container = oras_container
+    print(container)
+    assert container == str(tmp_path / ("github-ci:latest.sif"))
     assert os.path.exists(container)
 
 
diff --git a/spython/tests/test_conversion.py b/spython/tests/test_conversion.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (C) 2017-2021 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
diff --git a/spython/tests/test_instances.py b/spython/tests/test_instances.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# Copyright (C) 2017-2021 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
diff --git a/spython/tests/test_oci.py b/spython/tests/test_oci.py
diff --git a/spython/tests/test_parsers.py b/spython/tests/test_parsers.py
diff --git a/spython/tests/test_recipe.py b/spython/tests/test_recipe.py
diff --git a/spython/tests/test_utils.py b/spython/tests/test_utils.py
diff --git a/spython/tests/test_writers.py b/spython/tests/test_writers.py
diff --git a/spython/utils/fileio.py b/spython/utils/fileio.py
diff --git a/spython/utils/misc.py b/spython/utils/misc.py
diff --git a/spython/utils/terminal.py b/spython/utils/terminal.py
diff --git a/spython/version.py b/spython/version.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright (C) 2017-2021 Vanessa Sochat.`
	`1`	`+# Copyright (C) 2017-2022 Vanessa Sochat.`
`2`	`2`
`3`	`3`	`# This Source Code Form is subject to the terms of the`
`4`	`4`	`# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed`