Merge pull request #519 from linsword13/py12-support

Cleanup items
GoogleCloudPlatform · Jun 1, 2024 · 90490cb · 90490cb
2 parents 4fb6c71 + 0bbab19
commit 90490cb
Show file tree

Hide file tree

Showing 34 changed files with 42 additions and 163 deletions.
diff --git 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
diff --git 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

diff --git 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/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?$
 '''

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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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):