Revert "Introducing version_naming property that makes modulefile as version …"

This reverts commit 7af1150.

Author: vsoch

CHANGELOG.md

@@ -14,7 +14,6 @@ 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)
- - Adding in version_naming feature (0.1.31)
  - Fix `module-info shell` Tcl test for Lmod<=8.7.55 (0.1.30)
  - 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)

shpc/main/modules/base.py

@@ -458,10 +458,7 @@ def install(
         module.load_override_file()
 
         # Create the module and container directory
-        if self.settings.version_naming:
-            utils.mkdirp([os.path.dirname(module.module_dir), module.container_dir])
-        else:
-            utils.mkdirp([module.module_dir, module.container_dir])
+        utils.mkdirp([module.module_dir, module.container_dir])
 
         # Add a .version file to indicate the level of versioning
         self.versionfile.write(
@@ -473,12 +470,7 @@ def install(
 
         # Get the template based on the module and container type
         template = self.template.load(self.templatefile)
-        if self.settings.version_naming:
-            module_path = os.path.join(
-                os.path.dirname(module.module_dir), name.split(":")[1]
-            )
-        else:
-            module_path = os.path.join(module.module_dir, self.modulefile)
+        module_path = os.path.join(module.module_dir, self.modulefile)
 
         # Install the container
         # This could be simplified to take the module

shpc/main/schemas.py

@@ -170,7 +170,6 @@
     "wrapper_shell": {"type": "string", "enum": shells},
     "module_sys": {"type": "string", "enum": ["lmod", "tcl", None]},
     "container_features": container_features,
-    "version_naming":  {"type": "boolean"}, 
 }
 
 settings = {

shpc/settings.yml

@@ -38,9 +38,6 @@ module_name: '{{ parsed_name.tool }}'
 # first_installed: use the first installed
 default_version: module_sys
 
-#Experimental version naming tag so that modulefile is changed to version number . Default value is false. Issue number 26
-version_naming: false
-
 # store containers separately from module files
 # It's recommended to do this for faster loading
 container_base: $root_dir/containers
@@ -71,7 +68,6 @@ singularity_shell: /bin/sh
 podman_shell: /bin/sh
 docker_shell: /bin/sh
 
-
 # shell for test.sh file
 test_shell: /bin/bash
 

shpc/tests/test_version_naming.py

@@ -2,7 +2,7 @@
 __copyright__ = "Copyright 2021-2025, Vanessa Sochat"
 __license__ = "MPL 2.0"
 
-__version__ = "0.1.31"
+__version__ = "0.1.30"
 AUTHOR = "Vanessa Sochat"
 EMAIL = "[email protected]"
 NAME = "singularity-hpc"