From 4870b9fb964c92faaf9b7bd15df66578b9a25f79 Mon Sep 17 00:00:00 2001 From: Vanessasaurus <814322+vsoch@users.noreply.github.com> Date: Wed, 7 Feb 2024 19:45:25 -0800 Subject: [PATCH] fix: filter tags to not include sbom/vex (#669) * fix: filter tags to not include sbom/vex now that registries are adding artifact tags (it seems nvidia is the main one for now) we need to filter them out. Signed-off-by: vsoch --- .github/workflows/alert-action-updates.yaml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/main.yml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/test-container.yml | 4 ++-- .github/workflows/test-core.yml | 3 ++- .github/workflows/test.yml | 2 +- .github/workflows/update-contributors.yaml | 2 +- CHANGELOG.md | 1 + shpc/client/__init__.py | 2 +- shpc/client/add.py | 2 +- shpc/client/check.py | 2 +- shpc/client/config.py | 2 +- shpc/client/docgen.py | 2 +- shpc/client/get.py | 2 +- shpc/client/inspect.py | 2 +- shpc/client/install.py | 2 +- shpc/client/listing.py | 2 +- shpc/client/namespace.py | 2 +- shpc/client/pull.py | 2 +- shpc/client/remove.py | 2 +- shpc/client/shell.py | 2 +- shpc/client/show.py | 2 +- shpc/client/sync.py | 2 +- shpc/client/test.py | 2 +- shpc/client/uninstall.py | 2 +- shpc/client/update.py | 2 +- shpc/client/view.py | 2 +- shpc/defaults.py | 2 +- shpc/logger.py | 2 +- shpc/main/__init__.py | 2 +- shpc/main/client.py | 2 +- shpc/main/container/base.py | 2 +- shpc/main/container/config.py | 2 +- shpc/main/container/docker.py | 2 +- shpc/main/container/podman.py | 2 +- shpc/main/container/singularity.py | 2 +- shpc/main/container/update/__init__.py | 2 +- shpc/main/container/update/diff.py | 2 +- shpc/main/container/update/docker.py | 9 +++++++-- shpc/main/container/update/versions.py | 2 +- shpc/main/modules/base.py | 2 +- shpc/main/modules/lmod.py | 2 +- shpc/main/modules/module.py | 2 +- shpc/main/modules/tcl.py | 2 +- shpc/main/modules/template.py | 2 +- shpc/main/modules/versions.py | 2 +- shpc/main/modules/views.py | 2 +- shpc/main/registry/__init__.py | 2 +- shpc/main/registry/filesystem.py | 2 +- shpc/main/registry/provider.py | 2 +- shpc/main/registry/remote.py | 2 +- shpc/main/schemas.py | 2 +- shpc/main/settings.py | 2 +- shpc/main/templates.py | 2 +- shpc/main/wrappers/__init__.py | 2 +- shpc/main/wrappers/base.py | 2 +- shpc/main/wrappers/generators.py | 2 +- shpc/tests/test_container.py | 7 ++++++- shpc/utils/fileio.py | 2 +- shpc/utils/terminal.py | 2 +- shpc/version.py | 4 ++-- 62 files changed, 76 insertions(+), 64 deletions(-) diff --git a/.github/workflows/alert-action-updates.yaml b/.github/workflows/alert-action-updates.yaml index e20c7e4ff..1bcb36f52 100644 --- a/.github/workflows/alert-action-updates.yaml +++ b/.github/workflows/alert-action-updates.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Detect and Update uses: vsoch/action-updater@2c2216e27ee963aaa31ff0ff81de007acb84b9c2 # 0.0.11 with: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index b6177106a..42b1576a1 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -8,7 +8,7 @@ jobs: generate-docs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: gh-pages diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e86c739fd..52b40a866 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,7 @@ jobs: formatting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup black linter run: conda create --quiet --name black pyflakes diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index d92cd541d..4cb3a3ee7 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install run: conda create --quiet --name shpc twine diff --git a/.github/workflows/test-container.yml b/.github/workflows/test-container.yml index 76d89b695..3f9f3b0bb 100644 --- a/.github/workflows/test-container.yml +++ b/.github/workflows/test-container.yml @@ -41,7 +41,7 @@ jobs: - name: Checkout if: ${{ env.keepgoing == 'true' }} - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Make Space For Build if: ${{ env.keepgoing == 'true' }} @@ -74,7 +74,7 @@ jobs: if: ${{ env.keepgoing == 'true' }} run: conda create --quiet -c conda-forge --name shpc spython - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 if: ${{ env.keepgoing == 'true' }} - name: Install shpc diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml index b48f5c1dc..3de7c1ee2 100644 --- a/.github/workflows/test-core.yml +++ b/.github/workflows/test-core.yml @@ -13,7 +13,7 @@ jobs: - name: Create conda environment run: conda create --quiet -c conda-forge --name shpc spython - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install shpc run: | export PATH="/usr/share/miniconda/bin:$PATH" @@ -27,4 +27,5 @@ jobs: source activate shpc which shpc cd shpc/tests + export GITHUB_CI=yes pytest -sxv test_*.py diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 038c25258..6d596ec43 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,7 +49,7 @@ jobs: - name: Create conda environment run: conda create --quiet -c conda-forge --name shpc spython - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install shpc run: | export PATH="/usr/share/miniconda/bin:$PATH" diff --git a/.github/workflows/update-contributors.yaml b/.github/workflows/update-contributors.yaml index 57a623dc8..387a3ed20 100644 --- a/.github/workflows/update-contributors.yaml +++ b/.github/workflows/update-contributors.yaml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Tributors Update uses: con/tributors@master env: diff --git a/CHANGELOG.md b/CHANGELOG.md index 8123fe75a..dde68f5d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ and **Merged pull requests**. Critical items to know are: The versions coincide with releases on pip. Only major versions will be released as tags on Github. ## [0.0.x](https://github.com/singularityhub/singularity-hpc/tree/main) (0.0.x) + - filter out vex and sbom tags (0.1.27) - unpin yaml dependency (0.1.26) - Change format of config command output to only show setting values, not keys, for parseability (0.1.25) - Allow custom location for wrapper scripts (0.1.24) diff --git a/shpc/client/__init__.py b/shpc/client/__init__.py index de803e5ff..bd7bd2871 100644 --- a/shpc/client/__init__.py +++ b/shpc/client/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/env python __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import argparse diff --git a/shpc/client/add.py b/shpc/client/add.py index fdb0ab55a..b074bed3a 100644 --- a/shpc/client/add.py +++ b/shpc/client/add.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import shpc.utils diff --git a/shpc/client/check.py b/shpc/client/check.py index 7f9de4904..d936ec034 100644 --- a/shpc/client/check.py +++ b/shpc/client/check.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import shpc.utils diff --git a/shpc/client/config.py b/shpc/client/config.py index baaca0fcf..8f04743e1 100644 --- a/shpc/client/config.py +++ b/shpc/client/config.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import sys diff --git a/shpc/client/docgen.py b/shpc/client/docgen.py index eb17f85a0..516f00fde 100644 --- a/shpc/client/docgen.py +++ b/shpc/client/docgen.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import shpc.utils diff --git a/shpc/client/get.py b/shpc/client/get.py index 8a5c1f9eb..84e9b5294 100644 --- a/shpc/client/get.py +++ b/shpc/client/get.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import shpc.utils diff --git a/shpc/client/inspect.py b/shpc/client/inspect.py index 5116960b8..902c7f60c 100644 --- a/shpc/client/inspect.py +++ b/shpc/client/inspect.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/client/install.py b/shpc/client/install.py index b453f3fc5..89299db6e 100644 --- a/shpc/client/install.py +++ b/shpc/client/install.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import shpc.utils diff --git a/shpc/client/listing.py b/shpc/client/listing.py index 245f3d820..87cc0bc63 100644 --- a/shpc/client/listing.py +++ b/shpc/client/listing.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/client/namespace.py b/shpc/client/namespace.py index 42609bb33..2b9fd4316 100644 --- a/shpc/client/namespace.py +++ b/shpc/client/namespace.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/client/pull.py b/shpc/client/pull.py index eeab7870f..c4d6fa831 100644 --- a/shpc/client/pull.py +++ b/shpc/client/pull.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import re diff --git a/shpc/client/remove.py b/shpc/client/remove.py index 8ed687fcd..6c8dd0567 100644 --- a/shpc/client/remove.py +++ b/shpc/client/remove.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import shpc.utils diff --git a/shpc/client/shell.py b/shpc/client/shell.py index 8d5a536f2..132bd4e7e 100644 --- a/shpc/client/shell.py +++ b/shpc/client/shell.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import shpc.utils diff --git a/shpc/client/show.py b/shpc/client/show.py index e9380d775..a228d233b 100644 --- a/shpc/client/show.py +++ b/shpc/client/show.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import shpc.utils diff --git a/shpc/client/sync.py b/shpc/client/sync.py index e90606db8..64a4ff755 100644 --- a/shpc/client/sync.py +++ b/shpc/client/sync.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import os diff --git a/shpc/client/test.py b/shpc/client/test.py index 6ee02c9a4..b2906ab42 100644 --- a/shpc/client/test.py +++ b/shpc/client/test.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import shpc.utils diff --git a/shpc/client/uninstall.py b/shpc/client/uninstall.py index 8c943883d..e379c817f 100644 --- a/shpc/client/uninstall.py +++ b/shpc/client/uninstall.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import shpc.utils diff --git a/shpc/client/update.py b/shpc/client/update.py index 7758867fc..534171fc5 100644 --- a/shpc/client/update.py +++ b/shpc/client/update.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import shpc.utils diff --git a/shpc/client/view.py b/shpc/client/view.py index cabdb82df..afde59fed 100644 --- a/shpc/client/view.py +++ b/shpc/client/view.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2023, Vanessa Sochat" +__copyright__ = "Copyright 2023-2024, Vanessa Sochat" __license__ = "MPL 2.0" import os diff --git a/shpc/defaults.py b/shpc/defaults.py index a190eded3..45e11e7b0 100644 --- a/shpc/defaults.py +++ b/shpc/defaults.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import os diff --git a/shpc/logger.py b/shpc/logger.py index 4a4855211..84b7def2b 100644 --- a/shpc/logger.py +++ b/shpc/logger.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import inspect diff --git a/shpc/main/__init__.py b/shpc/main/__init__.py index 9b596068a..3262abe59 100644 --- a/shpc/main/__init__.py +++ b/shpc/main/__init__.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/client.py b/shpc/main/client.py index d89823a36..7ef602b92 100644 --- a/shpc/main/client.py +++ b/shpc/main/client.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/container/base.py b/shpc/main/container/base.py index f7d383886..199305561 100644 --- a/shpc/main/container/base.py +++ b/shpc/main/container/base.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/container/config.py b/shpc/main/container/config.py index 85bbe6654..9c0a52b8b 100644 --- a/shpc/main/container/config.py +++ b/shpc/main/container/config.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/container/docker.py b/shpc/main/container/docker.py index a55fc1bfb..55823c1e6 100644 --- a/shpc/main/container/docker.py +++ b/shpc/main/container/docker.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/container/podman.py b/shpc/main/container/podman.py index 44748f119..68ed0d139 100644 --- a/shpc/main/container/podman.py +++ b/shpc/main/container/podman.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/container/singularity.py b/shpc/main/container/singularity.py index 1d5a5d428..e41e4a444 100644 --- a/shpc/main/container/singularity.py +++ b/shpc/main/container/singularity.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/container/update/__init__.py b/shpc/main/container/update/__init__.py index 559291ccb..eac275f5c 100644 --- a/shpc/main/container/update/__init__.py +++ b/shpc/main/container/update/__init__.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" from shpc.logger import logger diff --git a/shpc/main/container/update/diff.py b/shpc/main/container/update/diff.py index e95f46935..f2d846eb9 100644 --- a/shpc/main/container/update/diff.py +++ b/shpc/main/container/update/diff.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import difflib diff --git a/shpc/main/container/update/docker.py b/shpc/main/container/update/docker.py index b6ccded79..06b3e1598 100644 --- a/shpc/main/container/update/docker.py +++ b/shpc/main/container/update/docker.py @@ -1,7 +1,9 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" +import re + import requests from shpc.logger import logger @@ -34,7 +36,10 @@ def tags(self): """ url = "%s/ls/%s" % (self.apiroot, self.container_name) response = self.get_request(url) - return [x.strip() for x in response.text.split("\n") if x.strip()] + tags = [x.strip() for x in response.text.split("\n") if x.strip()] + # Don't include tags for vex or sbom + tags = [x for x in tags if not re.search("[.](sbom|vex)$", x)] + return tags def manifest(self, tag): url = "%s/manifest/%s:%s" % (self.apiroot, self.container_name, tag) diff --git a/shpc/main/container/update/versions.py b/shpc/main/container/update/versions.py index 39ac93097..a6355b99f 100644 --- a/shpc/main/container/update/versions.py +++ b/shpc/main/container/update/versions.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import re diff --git a/shpc/main/modules/base.py b/shpc/main/modules/base.py index 52908c380..fa26ba987 100644 --- a/shpc/main/modules/base.py +++ b/shpc/main/modules/base.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import inspect diff --git a/shpc/main/modules/lmod.py b/shpc/main/modules/lmod.py index 6f7f7e315..760fcbcf3 100644 --- a/shpc/main/modules/lmod.py +++ b/shpc/main/modules/lmod.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" from .base import ModuleBase diff --git a/shpc/main/modules/module.py b/shpc/main/modules/module.py index 1a16b671b..7bcf710e0 100644 --- a/shpc/main/modules/module.py +++ b/shpc/main/modules/module.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2022-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import os diff --git a/shpc/main/modules/tcl.py b/shpc/main/modules/tcl.py index a46aeb14f..8d012ee89 100644 --- a/shpc/main/modules/tcl.py +++ b/shpc/main/modules/tcl.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" from .base import ModuleBase diff --git a/shpc/main/modules/template.py b/shpc/main/modules/template.py index a9a60396d..f5ecfbf1d 100644 --- a/shpc/main/modules/template.py +++ b/shpc/main/modules/template.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/modules/versions.py b/shpc/main/modules/versions.py index ad3e8601b..1e66a10fa 100644 --- a/shpc/main/modules/versions.py +++ b/shpc/main/modules/versions.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import os diff --git a/shpc/main/modules/views.py b/shpc/main/modules/views.py index 3596b5fcc..5527ca691 100644 --- a/shpc/main/modules/views.py +++ b/shpc/main/modules/views.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2022-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import os diff --git a/shpc/main/registry/__init__.py b/shpc/main/registry/__init__.py index 5c2adc7bf..d5dc102a8 100644 --- a/shpc/main/registry/__init__.py +++ b/shpc/main/registry/__init__.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/registry/filesystem.py b/shpc/main/registry/filesystem.py index 64f4f8f33..f0824f1cd 100644 --- a/shpc/main/registry/filesystem.py +++ b/shpc/main/registry/filesystem.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/registry/provider.py b/shpc/main/registry/provider.py index b3e0dc6a9..80005c882 100644 --- a/shpc/main/registry/provider.py +++ b/shpc/main/registry/provider.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/registry/remote.py b/shpc/main/registry/remote.py index 0b3e44e9b..18b090265 100644 --- a/shpc/main/registry/remote.py +++ b/shpc/main/registry/remote.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/schemas.py b/shpc/main/schemas.py index cc234550b..8a62c4378 100644 --- a/shpc/main/schemas.py +++ b/shpc/main/schemas.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/settings.py b/shpc/main/settings.py index 0970d459f..7049bfc30 100644 --- a/shpc/main/settings.py +++ b/shpc/main/settings.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/templates.py b/shpc/main/templates.py index 1507bc318..da0a8d6c4 100644 --- a/shpc/main/templates.py +++ b/shpc/main/templates.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import re diff --git a/shpc/main/wrappers/__init__.py b/shpc/main/wrappers/__init__.py index 9a9aa12ab..78e060a87 100644 --- a/shpc/main/wrappers/__init__.py +++ b/shpc/main/wrappers/__init__.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2022-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/wrappers/base.py b/shpc/main/wrappers/base.py index 98e1e0414..b155379a9 100644 --- a/shpc/main/wrappers/base.py +++ b/shpc/main/wrappers/base.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2022-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import os diff --git a/shpc/main/wrappers/generators.py b/shpc/main/wrappers/generators.py index 064cecbbd..071cb11a1 100644 --- a/shpc/main/wrappers/generators.py +++ b/shpc/main/wrappers/generators.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2022-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import os diff --git a/shpc/tests/test_container.py b/shpc/tests/test_container.py index cf513d9dc..5b22715a5 100644 --- a/shpc/tests/test_container.py +++ b/shpc/tests/test_container.py @@ -1,6 +1,6 @@ #!/usr/bin/python -# Copyright (C) 2021-2023 Vanessa Sochat. +# Copyright (C) 2021-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 @@ -8,11 +8,15 @@ import os +import pytest + import shpc.main.container as container here = os.path.dirname(os.path.abspath(__file__)) root = os.path.dirname(here) +ci = os.environ.get("GITHUB_CI") + def test_pull_gh(tmp_path): """ @@ -53,6 +57,7 @@ def test_podman(tmp_path): assert not cli.exists(result) +@pytest.mark.skipif(ci is not None, reason="GitHub actions docker socket not working") def test_docker(tmp_path): """ Test a singularity container command diff --git a/shpc/utils/fileio.py b/shpc/utils/fileio.py index ab3f9801e..bfbb6c25f 100644 --- a/shpc/utils/fileio.py +++ b/shpc/utils/fileio.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" import errno diff --git a/shpc/utils/terminal.py b/shpc/utils/terminal.py index 058265859..1f5e8c295 100644 --- a/shpc/utils/terminal.py +++ b/shpc/utils/terminal.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/version.py b/shpc/version.py index 237e405c6..a9174ac13 100644 --- a/shpc/version.py +++ b/shpc/version.py @@ -1,8 +1,8 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2023, Vanessa Sochat" +__copyright__ = "Copyright 2021-2024, Vanessa Sochat" __license__ = "MPL 2.0" -__version__ = "0.1.26" +__version__ = "0.1.27" AUTHOR = "Vanessa Sochat" EMAIL = "vsoch@users.noreply.github.com" NAME = "singularity-hpc"