From 4af42f47beb57dc3b0c0e83aa08360b6e5160878 Mon Sep 17 00:00:00 2001
From: Lin Guo <linsword13@gmail.com>
Date: Fri, 31 May 2024 18:03:34 -0700
Subject: [PATCH 1/3] Drop stated support for python2

---
 bin/ramble                              |   7 +-
 lib/ramble/external/py26/ordereddict.py | 127 ------------------------
 pyproject.toml                          |   2 +-
 3 files changed, 3 insertions(+), 133 deletions(-)
 delete mode 100644 lib/ramble/external/py26/ordereddict.py

diff --git a/bin/ramble b/bin/ramble
index fb0ce84e9..db03bd135 100755
--- a/bin/ramble
+++ b/bin/ramble
@@ -30,9 +30,9 @@ from __future__ import print_function
 import os
 import sys
 
-if sys.version_info[:2] < (2, 6):
+if sys.version_info[:2] < (3, 6):
     v_info = sys.version_info[:3]
-    sys.exit("Ramble requires Python 2.6 or higher." "This is Python %d.%d.%d." % v_info)
+    sys.exit("Ramble requires Python 3.6 or higher." "This is Python %d.%d.%d." % v_info)
 
 # Find ramble's location and its prefix.
 ramble_file = os.path.realpath(os.path.expanduser(__file__))
@@ -45,9 +45,6 @@ sys.path.insert(0, ramble_lib_path)
 # Add external libs
 ramble_external_libs = os.path.join(ramble_lib_path, "external")
 
-if sys.version_info[:2] == (2, 6):
-    sys.path.insert(0, os.path.join(ramble_external_libs, "py26"))
-
 sys.path.insert(0, ramble_external_libs)
 
 # Here we delete ruamel.yaml in case it has been already imported from site
diff --git a/lib/ramble/external/py26/ordereddict.py b/lib/ramble/external/py26/ordereddict.py
deleted file mode 100644
index 7242b5060..000000000
--- a/lib/ramble/external/py26/ordereddict.py
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright (c) 2009 Raymond Hettinger
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation files
-# (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify, merge,
-# publish, distribute, sublicense, and/or sell copies of the Software,
-# and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-#     The above copyright notice and this permission notice shall be
-#     included in all copies or substantial portions of the Software.
-#
-#     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-#     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-#     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-#     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-#     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-#     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-#     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-#     OTHER DEALINGS IN THE SOFTWARE.
-
-from UserDict import DictMixin
-
-class OrderedDict(dict, DictMixin):
-
-    def __init__(self, *args, **kwds):
-        if len(args) > 1:
-            raise TypeError('expected at most 1 arguments, got %d' % len(args))
-        try:
-            self.__end
-        except AttributeError:
-            self.clear()
-        self.update(*args, **kwds)
-
-    def clear(self):
-        self.__end = end = []
-        end += [None, end, end]         # sentinel node for doubly linked list
-        self.__map = {}                 # key --> [key, prev, next]
-        dict.clear(self)
-
-    def __setitem__(self, key, value):
-        if key not in self:
-            end = self.__end
-            curr = end[1]
-            curr[2] = end[1] = self.__map[key] = [key, curr, end]
-        dict.__setitem__(self, key, value)
-
-    def __delitem__(self, key):
-        dict.__delitem__(self, key)
-        key, prev, next = self.__map.pop(key)
-        prev[2] = next
-        next[1] = prev
-
-    def __iter__(self):
-        end = self.__end
-        curr = end[2]
-        while curr is not end:
-            yield curr[0]
-            curr = curr[2]
-
-    def __reversed__(self):
-        end = self.__end
-        curr = end[1]
-        while curr is not end:
-            yield curr[0]
-            curr = curr[1]
-
-    def popitem(self, last=True):
-        if not self:
-            raise KeyError('dictionary is empty')
-        if last:
-            key = reversed(self).next()
-        else:
-            key = iter(self).next()
-        value = self.pop(key)
-        return key, value
-
-    def __reduce__(self):
-        items = [[k, self[k]] for k in self]
-        tmp = self.__map, self.__end
-        del self.__map, self.__end
-        inst_dict = vars(self).copy()
-        self.__map, self.__end = tmp
-        if inst_dict:
-            return (self.__class__, (items,), inst_dict)
-        return self.__class__, (items,)
-
-    def keys(self):
-        return list(self)
-
-    setdefault = DictMixin.setdefault
-    update = DictMixin.update
-    pop = DictMixin.pop
-    values = DictMixin.values
-    items = DictMixin.items
-    iterkeys = DictMixin.iterkeys
-    itervalues = DictMixin.itervalues
-    iteritems = DictMixin.iteritems
-
-    def __repr__(self):
-        if not self:
-            return '%s()' % (self.__class__.__name__,)
-        return '%s(%r)' % (self.__class__.__name__, self.items())
-
-    def copy(self):
-        return self.__class__(self)
-
-    @classmethod
-    def fromkeys(cls, iterable, value=None):
-        d = cls()
-        for key in iterable:
-            d[key] = value
-        return d
-
-    def __eq__(self, other):
-        if isinstance(other, OrderedDict):
-            if len(self) != len(other):
-                return False
-            for p, q in  zip(self.items(), other.items()):
-                if p != q:
-                    return False
-            return True
-        return dict.__eq__(self, other)
-
-    def __ne__(self, other):
-        return not self == other
diff --git a/pyproject.toml b/pyproject.toml
index 68f2451b1..924ad8666 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.black]
 line-length = 99
-target-version = ["py36", "py37", "py38", "py39", "py310", "py311"]
+target-version = ["py36", "py37", "py38", "py39", "py310", "py311", "py312"]
 include = '''
     \.pyi?$
 '''

From 9b0020f4ab34a6562fb0105c6e1870597bdb5573 Mon Sep 17 00:00:00 2001
From: Lin Guo <linsword13@gmail.com>
Date: Fri, 31 May 2024 18:06:53 -0700
Subject: [PATCH 2/3] Reword commandNotFound erorr from spack's `which` util

---
 lib/ramble/ramble/main.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/ramble/ramble/main.py b/lib/ramble/ramble/main.py
index 8d73da757..0ff80cff6 100644
--- a/lib/ramble/ramble/main.py
+++ b/lib/ramble/ramble/main.py
@@ -44,6 +44,7 @@
 from ramble.util.logger import logger
 import spack.util.debug
 import spack.util.environment
+from spack.util.executable import CommandNotFoundError
 import spack.util.path
 from ramble.error import RambleError
 
@@ -979,6 +980,10 @@ def main(argv=None):
         logger.debug(e)
         e.die()  # gracefully die on any RambleErrors
 
+    except CommandNotFoundError as e:
+        e.message = e.message.replace("spack requires", "ramble requires")
+        raise
+
     except KeyboardInterrupt:
         if ramble.config.get("config:debug"):
             raise

From 0bbab19a6f7d7ca610ca854501baa6246e2e317f Mon Sep 17 00:00:00 2001
From: Lin Guo <linsword13@gmail.com>
Date: Fri, 31 May 2024 18:08:14 -0700
Subject: [PATCH 3/3] Remove wildcard import exemption comment from modifiers

The exemption is now applied to all modifiers (same as for
applications.)
---
 lib/ramble/ramble/test/cmd/flake8.py                        | 6 +++++-
 .../modifiers/append-env-var-mod-paths/modifier.py          | 2 +-
 .../modifiers/append-env-var-mod-vars/modifier.py           | 2 +-
 .../builtin.mock/modifiers/glob-patterns-mod/modifier.py    | 2 +-
 .../repos/builtin.mock/modifiers/maintained-1/modifier.py   | 2 +-
 .../repos/builtin.mock/modifiers/maintained-2/modifier.py   | 2 +-
 .../repos/builtin.mock/modifiers/mod-phase/modifier.py      | 2 +-
 .../modifiers/multiple-modes-no-default/modifier.py         | 2 +-
 .../modifiers/multiple-modes-with-default/modifier.py       | 2 +-
 .../builtin.mock/modifiers/no-docstring-mod/modifier.py     | 2 +-
 .../builtin.mock/modifiers/no-variable-mods/modifier.py     | 2 +-
 .../builtin.mock/modifiers/prepare-analysis/modifier.py     | 2 +-
 .../modifiers/prepend-env-var-mod-paths/modifier.py         | 2 +-
 .../builtin.mock/modifiers/set-env-var-mod/modifier.py      | 2 +-
 .../builtin.mock/modifiers/spack-failed-reqs/modifier.py    | 2 +-
 .../repos/builtin.mock/modifiers/spack-mod/modifier.py      | 2 +-
 .../builtin.mock/modifiers/success-criteria/modifier.py     | 2 +-
 .../repos/builtin.mock/modifiers/tagged-1/modifier.py       | 2 +-
 .../repos/builtin.mock/modifiers/test-mod/modifier.py       | 2 +-
 .../repos/builtin.mock/modifiers/unmaintained-1/modifier.py | 2 +-
 .../builtin.mock/modifiers/unset-env-var-mod/modifier.py    | 2 +-
 .../repos/builtin.mock/modifiers/untagged-1/modifier.py     | 2 +-
 .../repos/builtin/modifiers/conditional-psm3/modifier.py    | 2 +-
 .../repos/builtin/modifiers/execution-date/modifier.py      | 2 +-
 var/ramble/repos/builtin/modifiers/gcp-metadata/modifier.py | 2 +-
 .../repos/builtin/modifiers/install-ramble/modifier.py      | 2 +-
 .../repos/builtin/modifiers/install-spack/modifier.py       | 2 +-
 var/ramble/repos/builtin/modifiers/intel-aps/modifier.py    | 2 +-
 var/ramble/repos/builtin/modifiers/lscpu/modifier.py        | 2 +-
 .../repos/builtin/modifiers/pre-exec-print/modifier.py      | 2 +-
 30 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/lib/ramble/ramble/test/cmd/flake8.py b/lib/ramble/ramble/test/cmd/flake8.py
index f2bc12449..5ef1fbd35 100644
--- a/lib/ramble/ramble/test/cmd/flake8.py
+++ b/lib/ramble/ramble/test/cmd/flake8.py
@@ -16,4 +16,8 @@
 @deprecation.fail_if_not_removed
 def test_flake8_deprecation():
     # Call `ramble flake8` to trigger the deprecation assertion.
-    flake8("-U")
+    # Do not test on actual sources, since we don't actually want
+    # to verify styles using this command, which may diverge from
+    # `ramble style`. One such divergence is on modifiers, where
+    # the style command has additional flake8 exemptions.
+    flake8("-U", "/dev/null")
diff --git a/var/ramble/repos/builtin.mock/modifiers/append-env-var-mod-paths/modifier.py b/var/ramble/repos/builtin.mock/modifiers/append-env-var-mod-paths/modifier.py
index bf35ea6e4..c3f225027 100644
--- a/var/ramble/repos/builtin.mock/modifiers/append-env-var-mod-paths/modifier.py
+++ b/var/ramble/repos/builtin.mock/modifiers/append-env-var-mod-paths/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class AppendEnvVarModPaths(BasicModifier):
diff --git a/var/ramble/repos/builtin.mock/modifiers/append-env-var-mod-vars/modifier.py b/var/ramble/repos/builtin.mock/modifiers/append-env-var-mod-vars/modifier.py
index c09904889..a2cb0e96d 100644
--- a/var/ramble/repos/builtin.mock/modifiers/append-env-var-mod-vars/modifier.py
+++ b/var/ramble/repos/builtin.mock/modifiers/append-env-var-mod-vars/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class AppendEnvVarModVars(BasicModifier):
diff --git a/var/ramble/repos/builtin.mock/modifiers/glob-patterns-mod/modifier.py b/var/ramble/repos/builtin.mock/modifiers/glob-patterns-mod/modifier.py
index b6f8c9e2e..0d62d4046 100644
--- a/var/ramble/repos/builtin.mock/modifiers/glob-patterns-mod/modifier.py
+++ b/var/ramble/repos/builtin.mock/modifiers/glob-patterns-mod/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class GlobPatternsMod(BasicModifier):
diff --git a/var/ramble/repos/builtin.mock/modifiers/maintained-1/modifier.py b/var/ramble/repos/builtin.mock/modifiers/maintained-1/modifier.py
index cb9c1e49c..47124c7b8 100644
--- a/var/ramble/repos/builtin.mock/modifiers/maintained-1/modifier.py
+++ b/var/ramble/repos/builtin.mock/modifiers/maintained-1/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class Maintained1(BasicModifier):
diff --git a/var/ramble/repos/builtin.mock/modifiers/maintained-2/modifier.py b/var/ramble/repos/builtin.mock/modifiers/maintained-2/modifier.py
index 2bbca1987..66cd5a7cd 100644
--- a/var/ramble/repos/builtin.mock/modifiers/maintained-2/modifier.py
+++ b/var/ramble/repos/builtin.mock/modifiers/maintained-2/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class Maintained2(BasicModifier):
diff --git a/var/ramble/repos/builtin.mock/modifiers/mod-phase/modifier.py b/var/ramble/repos/builtin.mock/modifiers/mod-phase/modifier.py
index c488087e8..382c2e3f9 100644
--- a/var/ramble/repos/builtin.mock/modifiers/mod-phase/modifier.py
+++ b/var/ramble/repos/builtin.mock/modifiers/mod-phase/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 from ramble.util.logger import logger
 
 
diff --git a/var/ramble/repos/builtin.mock/modifiers/multiple-modes-no-default/modifier.py b/var/ramble/repos/builtin.mock/modifiers/multiple-modes-no-default/modifier.py
index dc2c785ec..95c3e05d4 100644
--- a/var/ramble/repos/builtin.mock/modifiers/multiple-modes-no-default/modifier.py
+++ b/var/ramble/repos/builtin.mock/modifiers/multiple-modes-no-default/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class MultipleModesNoDefault(BasicModifier):
diff --git a/var/ramble/repos/builtin.mock/modifiers/multiple-modes-with-default/modifier.py b/var/ramble/repos/builtin.mock/modifiers/multiple-modes-with-default/modifier.py
index da25c0115..3e0be401d 100644
--- a/var/ramble/repos/builtin.mock/modifiers/multiple-modes-with-default/modifier.py
+++ b/var/ramble/repos/builtin.mock/modifiers/multiple-modes-with-default/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class MultipleModesWithDefault(BasicModifier):
diff --git a/var/ramble/repos/builtin.mock/modifiers/no-docstring-mod/modifier.py b/var/ramble/repos/builtin.mock/modifiers/no-docstring-mod/modifier.py
index 773f5c765..a1b522a24 100644
--- a/var/ramble/repos/builtin.mock/modifiers/no-docstring-mod/modifier.py
+++ b/var/ramble/repos/builtin.mock/modifiers/no-docstring-mod/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class NoDocstringMod(BasicModifier):
diff --git a/var/ramble/repos/builtin.mock/modifiers/no-variable-mods/modifier.py b/var/ramble/repos/builtin.mock/modifiers/no-variable-mods/modifier.py
index c1f83c8b7..a0aee9ffe 100644
--- a/var/ramble/repos/builtin.mock/modifiers/no-variable-mods/modifier.py
+++ b/var/ramble/repos/builtin.mock/modifiers/no-variable-mods/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class NoVariableMods(BasicModifier):
diff --git a/var/ramble/repos/builtin.mock/modifiers/prepare-analysis/modifier.py b/var/ramble/repos/builtin.mock/modifiers/prepare-analysis/modifier.py
index da5ee9ab7..a58d16fe7 100644
--- a/var/ramble/repos/builtin.mock/modifiers/prepare-analysis/modifier.py
+++ b/var/ramble/repos/builtin.mock/modifiers/prepare-analysis/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class PrepareAnalysis(BasicModifier):
diff --git a/var/ramble/repos/builtin.mock/modifiers/prepend-env-var-mod-paths/modifier.py b/var/ramble/repos/builtin.mock/modifiers/prepend-env-var-mod-paths/modifier.py
index 81e6232c0..23e60f9f5 100644
--- a/var/ramble/repos/builtin.mock/modifiers/prepend-env-var-mod-paths/modifier.py
+++ b/var/ramble/repos/builtin.mock/modifiers/prepend-env-var-mod-paths/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class PrependEnvVarModPaths(BasicModifier):
diff --git a/var/ramble/repos/builtin.mock/modifiers/set-env-var-mod/modifier.py b/var/ramble/repos/builtin.mock/modifiers/set-env-var-mod/modifier.py
index 53fa54cee..4db104a65 100644
--- a/var/ramble/repos/builtin.mock/modifiers/set-env-var-mod/modifier.py
+++ b/var/ramble/repos/builtin.mock/modifiers/set-env-var-mod/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class SetEnvVarMod(BasicModifier):
diff --git a/var/ramble/repos/builtin.mock/modifiers/spack-failed-reqs/modifier.py b/var/ramble/repos/builtin.mock/modifiers/spack-failed-reqs/modifier.py
index cd3fa7d0e..8820fab1d 100644
--- a/var/ramble/repos/builtin.mock/modifiers/spack-failed-reqs/modifier.py
+++ b/var/ramble/repos/builtin.mock/modifiers/spack-failed-reqs/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class SpackFailedReqs(SpackModifier):
diff --git a/var/ramble/repos/builtin.mock/modifiers/spack-mod/modifier.py b/var/ramble/repos/builtin.mock/modifiers/spack-mod/modifier.py
index 20c8c3bd3..a0d3844e7 100644
--- a/var/ramble/repos/builtin.mock/modifiers/spack-mod/modifier.py
+++ b/var/ramble/repos/builtin.mock/modifiers/spack-mod/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class SpackMod(SpackModifier):
diff --git a/var/ramble/repos/builtin.mock/modifiers/success-criteria/modifier.py b/var/ramble/repos/builtin.mock/modifiers/success-criteria/modifier.py
index 5fec219c4..3454343af 100644
--- a/var/ramble/repos/builtin.mock/modifiers/success-criteria/modifier.py
+++ b/var/ramble/repos/builtin.mock/modifiers/success-criteria/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class SuccessCriteria(BasicModifier):
diff --git a/var/ramble/repos/builtin.mock/modifiers/tagged-1/modifier.py b/var/ramble/repos/builtin.mock/modifiers/tagged-1/modifier.py
index 1dd6b1bef..3c8706b2e 100644
--- a/var/ramble/repos/builtin.mock/modifiers/tagged-1/modifier.py
+++ b/var/ramble/repos/builtin.mock/modifiers/tagged-1/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class Tagged1(BasicModifier):
diff --git a/var/ramble/repos/builtin.mock/modifiers/test-mod/modifier.py b/var/ramble/repos/builtin.mock/modifiers/test-mod/modifier.py
index ef4b29f4e..44be66531 100644
--- a/var/ramble/repos/builtin.mock/modifiers/test-mod/modifier.py
+++ b/var/ramble/repos/builtin.mock/modifiers/test-mod/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class TestMod(BasicModifier):
diff --git a/var/ramble/repos/builtin.mock/modifiers/unmaintained-1/modifier.py b/var/ramble/repos/builtin.mock/modifiers/unmaintained-1/modifier.py
index 71ff53bbb..92be2893d 100644
--- a/var/ramble/repos/builtin.mock/modifiers/unmaintained-1/modifier.py
+++ b/var/ramble/repos/builtin.mock/modifiers/unmaintained-1/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class Unmaintained1(BasicModifier):
diff --git a/var/ramble/repos/builtin.mock/modifiers/unset-env-var-mod/modifier.py b/var/ramble/repos/builtin.mock/modifiers/unset-env-var-mod/modifier.py
index bdabc25fe..0ddbd252e 100644
--- a/var/ramble/repos/builtin.mock/modifiers/unset-env-var-mod/modifier.py
+++ b/var/ramble/repos/builtin.mock/modifiers/unset-env-var-mod/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class UnsetEnvVarMod(BasicModifier):
diff --git a/var/ramble/repos/builtin.mock/modifiers/untagged-1/modifier.py b/var/ramble/repos/builtin.mock/modifiers/untagged-1/modifier.py
index 8d942c46e..64fd6e10d 100644
--- a/var/ramble/repos/builtin.mock/modifiers/untagged-1/modifier.py
+++ b/var/ramble/repos/builtin.mock/modifiers/untagged-1/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class Untagged1(BasicModifier):
diff --git a/var/ramble/repos/builtin/modifiers/conditional-psm3/modifier.py b/var/ramble/repos/builtin/modifiers/conditional-psm3/modifier.py
index bccde326a..05057561d 100644
--- a/var/ramble/repos/builtin/modifiers/conditional-psm3/modifier.py
+++ b/var/ramble/repos/builtin/modifiers/conditional-psm3/modifier.py
@@ -8,7 +8,7 @@
 
 import re
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class ConditionalPsm3(BasicModifier):
diff --git a/var/ramble/repos/builtin/modifiers/execution-date/modifier.py b/var/ramble/repos/builtin/modifiers/execution-date/modifier.py
index 093438968..8b6cdfda1 100644
--- a/var/ramble/repos/builtin/modifiers/execution-date/modifier.py
+++ b/var/ramble/repos/builtin/modifiers/execution-date/modifier.py
@@ -7,7 +7,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class ExecutionDate(BasicModifier):
diff --git a/var/ramble/repos/builtin/modifiers/gcp-metadata/modifier.py b/var/ramble/repos/builtin/modifiers/gcp-metadata/modifier.py
index 617f3002c..552e732ec 100644
--- a/var/ramble/repos/builtin/modifiers/gcp-metadata/modifier.py
+++ b/var/ramble/repos/builtin/modifiers/gcp-metadata/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class GcpMetadata(BasicModifier):
diff --git a/var/ramble/repos/builtin/modifiers/install-ramble/modifier.py b/var/ramble/repos/builtin/modifiers/install-ramble/modifier.py
index 5ba3c2e9e..a4132482c 100644
--- a/var/ramble/repos/builtin/modifiers/install-ramble/modifier.py
+++ b/var/ramble/repos/builtin/modifiers/install-ramble/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class InstallRamble(BasicModifier):
diff --git a/var/ramble/repos/builtin/modifiers/install-spack/modifier.py b/var/ramble/repos/builtin/modifiers/install-spack/modifier.py
index adc27a4de..10e7ded1a 100644
--- a/var/ramble/repos/builtin/modifiers/install-spack/modifier.py
+++ b/var/ramble/repos/builtin/modifiers/install-spack/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class InstallSpack(BasicModifier):
diff --git a/var/ramble/repos/builtin/modifiers/intel-aps/modifier.py b/var/ramble/repos/builtin/modifiers/intel-aps/modifier.py
index 370ca7841..135bdb83f 100644
--- a/var/ramble/repos/builtin/modifiers/intel-aps/modifier.py
+++ b/var/ramble/repos/builtin/modifiers/intel-aps/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class IntelAps(SpackModifier):
diff --git a/var/ramble/repos/builtin/modifiers/lscpu/modifier.py b/var/ramble/repos/builtin/modifiers/lscpu/modifier.py
index 59690bd48..d43c8004b 100644
--- a/var/ramble/repos/builtin/modifiers/lscpu/modifier.py
+++ b/var/ramble/repos/builtin/modifiers/lscpu/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class Lscpu(BasicModifier):
diff --git a/var/ramble/repos/builtin/modifiers/pre-exec-print/modifier.py b/var/ramble/repos/builtin/modifiers/pre-exec-print/modifier.py
index cdbd6182f..c5eda7b27 100644
--- a/var/ramble/repos/builtin/modifiers/pre-exec-print/modifier.py
+++ b/var/ramble/repos/builtin/modifiers/pre-exec-print/modifier.py
@@ -6,7 +6,7 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
-from ramble.modkit import *  # noqa: F403
+from ramble.modkit import *
 
 
 class PreExecPrint(BasicModifier):