diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6d596ec43..994353643 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,8 +13,18 @@ jobs: container_tech: [podman, singularity, docker] steps: - name: Install Dependencies + run: sudo apt-get install lua5.2 liblua5.2-dev lua-filesystem lua-posix tcl tcl-dev tcsh + + # https://github.com/actions/runner-images/issues/10443 + - name: Update Unshare Permission + if: ${{ matrix.container_tech == 'singularity' }} run: | - sudo apt-get install lua5.2 liblua5.2-dev lua-filesystem lua-posix tcl tcl-dev tcsh + cat /etc/subuid + echo $(whoami) + cp /etc/sysctl.conf ./sysctl.conf + echo "kernel.unprivileged_userns_clone=1" >> ./sysctl.conf + sudo mv ./sysctl.conf /etc/sysctl.conf + sudo sysctl -p - name: Install Environment Modules if: ${{ matrix.module[0] == 'tcl' }} @@ -40,11 +50,12 @@ jobs: cd Lmod-${PKG_VERSION} ./configure --prefix=/usr/share && make && make install - - uses: eWaterCycle/setup-singularity@v7 + - name: Install Singularity if: ${{ matrix.container_tech == 'singularity' }} - name: Install Singularity + uses: singularityhub/install-singularity@main with: - singularity-version: 3.7.1 + singularity-version: '4.2.2' + go-version: '1.22.0' - name: Create conda environment run: conda create --quiet -c conda-forge --name shpc spython diff --git a/CHANGELOG.md b/CHANGELOG.md index c03e4723d..9987e3e24 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) + - Allow import of LooseVersion from packaging (bug) (0.1.29) - use quay.io api to list tags since does not conform to oci (0.1.28) - filter out vex and sbom tags (0.1.27) - unpin yaml dependency (0.1.26) diff --git a/shpc/client/__init__.py b/shpc/client/__init__.py index bd7bd2871..655132ab1 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-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import argparse diff --git a/shpc/client/add.py b/shpc/client/add.py index b074bed3a..f40f4de51 100644 --- a/shpc/client/add.py +++ b/shpc/client/add.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import shpc.utils diff --git a/shpc/client/check.py b/shpc/client/check.py index d936ec034..1ad31b14c 100644 --- a/shpc/client/check.py +++ b/shpc/client/check.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import shpc.utils diff --git a/shpc/client/config.py b/shpc/client/config.py index 8f04743e1..41e5a7b23 100644 --- a/shpc/client/config.py +++ b/shpc/client/config.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import sys diff --git a/shpc/client/docgen.py b/shpc/client/docgen.py index 516f00fde..e95b9a6fc 100644 --- a/shpc/client/docgen.py +++ b/shpc/client/docgen.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import shpc.utils diff --git a/shpc/client/get.py b/shpc/client/get.py index 84e9b5294..047d3fad7 100644 --- a/shpc/client/get.py +++ b/shpc/client/get.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import shpc.utils diff --git a/shpc/client/inspect.py b/shpc/client/inspect.py index 902c7f60c..060c8ba3c 100644 --- a/shpc/client/inspect.py +++ b/shpc/client/inspect.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/client/install.py b/shpc/client/install.py index 89299db6e..bd8b77290 100644 --- a/shpc/client/install.py +++ b/shpc/client/install.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import shpc.utils diff --git a/shpc/client/listing.py b/shpc/client/listing.py index 87cc0bc63..f1b4d8eb1 100644 --- a/shpc/client/listing.py +++ b/shpc/client/listing.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/client/namespace.py b/shpc/client/namespace.py index 2b9fd4316..c3167016b 100644 --- a/shpc/client/namespace.py +++ b/shpc/client/namespace.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/client/pull.py b/shpc/client/pull.py index c4d6fa831..c027cdfb1 100644 --- a/shpc/client/pull.py +++ b/shpc/client/pull.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import re diff --git a/shpc/client/remove.py b/shpc/client/remove.py index 6c8dd0567..cc52c842e 100644 --- a/shpc/client/remove.py +++ b/shpc/client/remove.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import shpc.utils diff --git a/shpc/client/shell.py b/shpc/client/shell.py index 132bd4e7e..3e10ee53e 100644 --- a/shpc/client/shell.py +++ b/shpc/client/shell.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import shpc.utils diff --git a/shpc/client/show.py b/shpc/client/show.py index a228d233b..0b4ec3ba0 100644 --- a/shpc/client/show.py +++ b/shpc/client/show.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import shpc.utils diff --git a/shpc/client/sync.py b/shpc/client/sync.py index 64a4ff755..77fff52d4 100644 --- a/shpc/client/sync.py +++ b/shpc/client/sync.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import os diff --git a/shpc/client/test.py b/shpc/client/test.py index b2906ab42..f097175df 100644 --- a/shpc/client/test.py +++ b/shpc/client/test.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import shpc.utils diff --git a/shpc/client/uninstall.py b/shpc/client/uninstall.py index e379c817f..8dbb28b54 100644 --- a/shpc/client/uninstall.py +++ b/shpc/client/uninstall.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import shpc.utils diff --git a/shpc/client/update.py b/shpc/client/update.py index 534171fc5..26380ed95 100644 --- a/shpc/client/update.py +++ b/shpc/client/update.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import shpc.utils diff --git a/shpc/client/view.py b/shpc/client/view.py index afde59fed..3d2d3460c 100644 --- a/shpc/client/view.py +++ b/shpc/client/view.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2023-2024, Vanessa Sochat" +__copyright__ = "Copyright 2023-2025, Vanessa Sochat" __license__ = "MPL 2.0" import os diff --git a/shpc/defaults.py b/shpc/defaults.py index 45e11e7b0..9e0385276 100644 --- a/shpc/defaults.py +++ b/shpc/defaults.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import os diff --git a/shpc/logger.py b/shpc/logger.py index 84b7def2b..4a536d26c 100644 --- a/shpc/logger.py +++ b/shpc/logger.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import inspect diff --git a/shpc/main/__init__.py b/shpc/main/__init__.py index 3262abe59..ea5252f8c 100644 --- a/shpc/main/__init__.py +++ b/shpc/main/__init__.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/client.py b/shpc/main/client.py index 7ef602b92..4e1539810 100644 --- a/shpc/main/client.py +++ b/shpc/main/client.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/container/base.py b/shpc/main/container/base.py index 199305561..932a9d23d 100644 --- a/shpc/main/container/base.py +++ b/shpc/main/container/base.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/container/config.py b/shpc/main/container/config.py index 9c0a52b8b..82946d7c8 100644 --- a/shpc/main/container/config.py +++ b/shpc/main/container/config.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/container/docker.py b/shpc/main/container/docker.py index 55823c1e6..5c58be952 100644 --- a/shpc/main/container/docker.py +++ b/shpc/main/container/docker.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/container/podman.py b/shpc/main/container/podman.py index 68ed0d139..9a8861471 100644 --- a/shpc/main/container/podman.py +++ b/shpc/main/container/podman.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/container/singularity.py b/shpc/main/container/singularity.py index e41e4a444..7ca0f3d9b 100644 --- a/shpc/main/container/singularity.py +++ b/shpc/main/container/singularity.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/container/update/__init__.py b/shpc/main/container/update/__init__.py index eac275f5c..11ecd561a 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-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, 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 f2d846eb9..e5351e0fa 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-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, 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 35bd98077..c63ea0999 100644 --- a/shpc/main/container/update/docker.py +++ b/shpc/main/container/update/docker.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import re diff --git a/shpc/main/container/update/versions.py b/shpc/main/container/update/versions.py index a6355b99f..c32d99068 100644 --- a/shpc/main/container/update/versions.py +++ b/shpc/main/container/update/versions.py @@ -1,9 +1,13 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import re -from distutils.version import LooseVersion + +try: + from distutils.version import LooseVersion +except ModuleNotFoundError: + from packaging.version import Version as LooseVersion def not_all_letters(version): diff --git a/shpc/main/modules/base.py b/shpc/main/modules/base.py index fa26ba987..12231455c 100644 --- a/shpc/main/modules/base.py +++ b/shpc/main/modules/base.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import inspect diff --git a/shpc/main/modules/lmod.py b/shpc/main/modules/lmod.py index 760fcbcf3..bf4f675bc 100644 --- a/shpc/main/modules/lmod.py +++ b/shpc/main/modules/lmod.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, 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 7bcf710e0..7eed63c46 100644 --- a/shpc/main/modules/module.py +++ b/shpc/main/modules/module.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import os diff --git a/shpc/main/modules/tcl.py b/shpc/main/modules/tcl.py index 8d012ee89..8984c40c1 100644 --- a/shpc/main/modules/tcl.py +++ b/shpc/main/modules/tcl.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, 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 f5ecfbf1d..b623a1b79 100644 --- a/shpc/main/modules/template.py +++ b/shpc/main/modules/template.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/modules/versions.py b/shpc/main/modules/versions.py index 1e66a10fa..c43985417 100644 --- a/shpc/main/modules/versions.py +++ b/shpc/main/modules/versions.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import os diff --git a/shpc/main/modules/views.py b/shpc/main/modules/views.py index 5527ca691..e67f921b1 100644 --- a/shpc/main/modules/views.py +++ b/shpc/main/modules/views.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import os diff --git a/shpc/main/registry/__init__.py b/shpc/main/registry/__init__.py index d5dc102a8..4c0a86064 100644 --- a/shpc/main/registry/__init__.py +++ b/shpc/main/registry/__init__.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/registry/filesystem.py b/shpc/main/registry/filesystem.py index f0824f1cd..ffe1cdb01 100644 --- a/shpc/main/registry/filesystem.py +++ b/shpc/main/registry/filesystem.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/registry/provider.py b/shpc/main/registry/provider.py index 80005c882..bcd1fa348 100644 --- a/shpc/main/registry/provider.py +++ b/shpc/main/registry/provider.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/registry/remote.py b/shpc/main/registry/remote.py index 18b090265..abcb9483f 100644 --- a/shpc/main/registry/remote.py +++ b/shpc/main/registry/remote.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/schemas.py b/shpc/main/schemas.py index 8a62c4378..7195ef715 100644 --- a/shpc/main/schemas.py +++ b/shpc/main/schemas.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/settings.py b/shpc/main/settings.py index 7049bfc30..6a26493f6 100644 --- a/shpc/main/settings.py +++ b/shpc/main/settings.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/templates.py b/shpc/main/templates.py index da0a8d6c4..9dc04a908 100644 --- a/shpc/main/templates.py +++ b/shpc/main/templates.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import re diff --git a/shpc/main/wrappers/__init__.py b/shpc/main/wrappers/__init__.py index 78e060a87..ec3e5e399 100644 --- a/shpc/main/wrappers/__init__.py +++ b/shpc/main/wrappers/__init__.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/main/wrappers/base.py b/shpc/main/wrappers/base.py index b155379a9..0dcb846a6 100644 --- a/shpc/main/wrappers/base.py +++ b/shpc/main/wrappers/base.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import os diff --git a/shpc/main/wrappers/generators.py b/shpc/main/wrappers/generators.py index 071cb11a1..5728eb6fe 100644 --- a/shpc/main/wrappers/generators.py +++ b/shpc/main/wrappers/generators.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" import os diff --git a/shpc/tests/helpers.py b/shpc/tests/helpers.py index 81ef2980f..3b4822484 100644 --- a/shpc/tests/helpers.py +++ b/shpc/tests/helpers.py @@ -1,11 +1,5 @@ #!/usr/bin/python -# Copyright (C) 2021-2023 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/shpc/tests/test_client.py b/shpc/tests/test_client.py index 6cdfc85cf..b672d89ac 100644 --- a/shpc/tests/test_client.py +++ b/shpc/tests/test_client.py @@ -1,11 +1,5 @@ #!/usr/bin/python -# Copyright (C) 2021-2023 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 io import os import shutil diff --git a/shpc/tests/test_config.py b/shpc/tests/test_config.py index 24dca64dd..0407406b3 100644 --- a/shpc/tests/test_config.py +++ b/shpc/tests/test_config.py @@ -1,10 +1,5 @@ #!/usr/bin/python -# Copyright (C) 2021-2023 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 pytest from .helpers import init_client diff --git a/shpc/tests/test_container.py b/shpc/tests/test_container.py index 5b22715a5..cd4542036 100644 --- a/shpc/tests/test_container.py +++ b/shpc/tests/test_container.py @@ -1,11 +1,5 @@ #!/usr/bin/python -# 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 -# with this file, You can obtain one at http://mozilla.org/MPL/2.0/. - import os import pytest diff --git a/shpc/tests/test_container_config.py b/shpc/tests/test_container_config.py index 9b42598e3..3bff42b57 100644 --- a/shpc/tests/test_container_config.py +++ b/shpc/tests/test_container_config.py @@ -1,11 +1,5 @@ #!/usr/bin/python -# Copyright (C) 2021-2023 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 jsonschema diff --git a/shpc/tests/test_settings.py b/shpc/tests/test_settings.py index 5912274e0..2f64b7f4c 100644 --- a/shpc/tests/test_settings.py +++ b/shpc/tests/test_settings.py @@ -1,11 +1,5 @@ #!/usr/bin/python -# Copyright (C) 2021-2023 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 pytest diff --git a/shpc/tests/test_sync.py b/shpc/tests/test_sync.py index dd6761b49..a5ef5966a 100644 --- a/shpc/tests/test_sync.py +++ b/shpc/tests/test_sync.py @@ -1,11 +1,5 @@ #!/usr/bin/python -# Copyright (C) 2021-2023 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 pytest diff --git a/shpc/tests/test_utils.py b/shpc/tests/test_utils.py index ad4ddb277..84c81f7a5 100644 --- a/shpc/tests/test_utils.py +++ b/shpc/tests/test_utils.py @@ -1,11 +1,5 @@ #!/usr/bin/python -# Copyright (C) 2021-2023 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/shpc/tests/test_views.py b/shpc/tests/test_views.py index 4f3fbf413..3fdbfe3d5 100644 --- a/shpc/tests/test_views.py +++ b/shpc/tests/test_views.py @@ -1,11 +1,5 @@ #!/usr/bin/python -# Copyright (C) 2021-2023 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 pytest diff --git a/shpc/tests/test_wrappers.py b/shpc/tests/test_wrappers.py index 0bb421fc0..8f0a67445 100644 --- a/shpc/tests/test_wrappers.py +++ b/shpc/tests/test_wrappers.py @@ -1,11 +1,5 @@ #!/usr/bin/python -# Copyright (C) 2021-2023 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 pytest diff --git a/shpc/utils/terminal.py b/shpc/utils/terminal.py index 1f5e8c295..fd0b4009f 100644 --- a/shpc/utils/terminal.py +++ b/shpc/utils/terminal.py @@ -1,5 +1,5 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" diff --git a/shpc/version.py b/shpc/version.py index 1fec20f9f..3b1366328 100644 --- a/shpc/version.py +++ b/shpc/version.py @@ -1,8 +1,8 @@ __author__ = "Vanessa Sochat" -__copyright__ = "Copyright 2021-2024, Vanessa Sochat" +__copyright__ = "Copyright 2021-2025, Vanessa Sochat" __license__ = "MPL 2.0" -__version__ = "0.1.28" +__version__ = "0.1.29" AUTHOR = "Vanessa Sochat" EMAIL = "vsoch@users.noreply.github.com" NAME = "singularity-hpc" @@ -19,6 +19,7 @@ INSTALL_REQUIRES = ( # 0.1.18 added support for oras ("spython", {"min_version": "0.2.0"}), + ("packaging", {"min_version": None}), ("Jinja2", {"min_version": None}), ("jsonschema", {"min_version": None}), ("ruamel.yaml", {"min_version": None}),