bug: fix distutils LooseVersion import (#680)

* bug: fix distutils LooseVersion import * ci: ubuntu 24.04 does not allow unshare Problem: distutils was removed python 3.12 Solution: import from packaging Signed-off-by: vsoch <[email protected]>
singularityhub · Jan 2, 2025 · 4bf959f · 4bf959f
1 parent cd2630e
commit 4bf959f
Show file tree

Hide file tree

Showing 63 changed files with 74 additions and 116 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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