From f11778bb02ae7394cdc9ac24357073d76077a403 Mon Sep 17 00:00:00 2001
From: Greg Becker <becker33@llnl.gov>
Date: Thu, 10 Nov 2022 23:35:33 -0800
Subject: remove deprecated top-level module config (#33828)

* remove deprecated top-level module config per deprecation in 0.18
---
 lib/spack/spack/modules/lmod.py   |  3 --
 lib/spack/spack/modules/tcl.py    |  3 --
 lib/spack/spack/schema/modules.py | 62 ++-------------------------------------
 3 files changed, 2 insertions(+), 66 deletions(-)

diff --git a/lib/spack/spack/modules/lmod.py b/lib/spack/spack/modules/lmod.py
index 3378e53354..f98db9614c 100644
--- a/lib/spack/spack/modules/lmod.py
+++ b/lib/spack/spack/modules/lmod.py
@@ -26,9 +26,6 @@ from .common import BaseConfiguration, BaseContext, BaseFileLayout, BaseModuleFi
 def configuration(module_set_name):
     config_path = "modules:%s:lmod" % module_set_name
     config = spack.config.get(config_path, {})
-    if not config and module_set_name == "default":
-        # return old format for backward compatibility
-        return spack.config.get("modules:lmod", {})
     return config
 
 
diff --git a/lib/spack/spack/modules/tcl.py b/lib/spack/spack/modules/tcl.py
index f49f6209ef..8d49f10ae1 100644
--- a/lib/spack/spack/modules/tcl.py
+++ b/lib/spack/spack/modules/tcl.py
@@ -23,9 +23,6 @@ from .common import BaseConfiguration, BaseContext, BaseFileLayout, BaseModuleFi
 def configuration(module_set_name):
     config_path = "modules:%s:tcl" % module_set_name
     config = spack.config.get(config_path, {})
-    if not config and module_set_name == "default":
-        # return old format for backward compatibility
-        return spack.config.get("modules:tcl", {})
     return config
 
 
diff --git a/lib/spack/spack/schema/modules.py b/lib/spack/spack/schema/modules.py
index d355970f30..965195c40b 100644
--- a/lib/spack/spack/schema/modules.py
+++ b/lib/spack/spack/schema/modules.py
@@ -8,8 +8,6 @@
 .. literalinclude:: _spack_root/lib/spack/spack/schema/modules.py
    :lines: 13-
 """
-import warnings
-
 import spack.schema.environment
 import spack.schema.projections
 
@@ -26,9 +24,7 @@ spec_regex = (
 )
 
 #: Matches a valid name for a module set
-valid_module_set_name = (
-    r"^(?!arch_folder$|lmod$|roots$|enable$|prefix_inspections$|" r"tcl$|use_view$)\w[\w-]*$"
-)
+valid_module_set_name = r"^(?!prefix_inspections$)\w[\w-]*$"
 
 #: Matches an anonymous spec, i.e. a spec without a root name
 anonymous_spec_regex = r"^[\^@%+~]"
@@ -156,15 +152,6 @@ module_config_properties = {
 }
 
 
-def deprecation_msg_default_module_set(instance, props):
-    return (
-        'Top-level properties "{0}" in module config are ignored as of Spack v0.18. '
-        'They should be set on the "default" module set. Run\n\n'
-        "\t$ spack config update modules\n\n"
-        "to update the file to the new format".format('", "'.join(instance))
-    )
-
-
 # Properties for inclusion into other schemas (requires definitions)
 properties = {
     "modules": {
@@ -187,13 +174,6 @@ properties = {
                 "additionalProperties": False,
                 "properties": module_config_properties,
             },
-            # Deprecated top-level keys (ignored in 0.18 with a warning)
-            "^(arch_folder|lmod|roots|enable|tcl|use_view)$": {},
-        },
-        "deprecatedProperties": {
-            "properties": ["arch_folder", "lmod", "roots", "enable", "tcl", "use_view"],
-            "message": deprecation_msg_default_module_set,
-            "error": False,
         },
     }
 }
@@ -249,39 +229,6 @@ def update_keys(data, key_translations):
     return changed
 
 
-def update_default_module_set(data):
-    """Update module configuration to move top-level keys inside default module set.
-
-    This change was introduced in v0.18 (see 99083f1706 or #28659).
-    """
-    changed = False
-
-    deprecated_top_level_keys = ("arch_folder", "lmod", "roots", "enable", "tcl", "use_view")
-
-    # Don't update when we already have a default module set
-    if "default" in data:
-        if any(key in data for key in deprecated_top_level_keys):
-            warnings.warn(
-                'Did not move top-level module properties into "default" '
-                'module set, because the "default" module set is already '
-                "defined"
-            )
-        return changed
-
-    default = {}
-
-    # Move deprecated top-level keys under "default" module set.
-    for key in deprecated_top_level_keys:
-        if key in data:
-            default[key] = data.pop(key)
-
-    if default:
-        changed = True
-        data["default"] = default
-
-    return changed
-
-
 def update(data):
     """Update the data in place to remove deprecated properties.
 
@@ -291,10 +238,5 @@ def update(data):
     Returns:
         True if data was changed, False otherwise
     """
-    # deprecated top-level module config (everything in default module set)
-    changed = update_default_module_set(data)
-
     # translate blacklist/whitelist to exclude/include
-    changed |= update_keys(data, exclude_include_translations)
-
-    return changed
+    return update_keys(data, exclude_include_translations)
-- 
cgit v1.2.3-60-g2f50