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 <[email protected]>
singularityhub · Feb 8, 2024 · 4870b9f · 4870b9f
1 parent 8c540f8
commit 4870b9f
Show file tree

Hide file tree

Showing 62 changed files with 76 additions and 64 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 __author__ = "Vanessa Sochat"
-__copyright__ = "Copyright 2021-2023, Vanessa Sochat"
+__copyright__ = "Copyright 2021-2024, Vanessa Sochat"
 __license__ = "MPL 2.0"