From 54008a23427064d04e2225110ddeecb5372d7252 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Mon, 5 Dec 2022 07:59:27 -0800 Subject: vermin: remove all novm comments from code (#34308) All the vermin annotations we were using were for optional features introduced in early Python 3 versions. We no longer need any of them, as we only support Python 3.6+. If we start optionally using features from newer Pythons than 3.6, we will need more vermin annotations. Co-authored-by: Harmen Stoppels Co-authored-by: Harmen Stoppels --- lib/spack/spack/build_systems/autotools.py | 2 +- lib/spack/spack/build_systems/makefile.py | 2 +- lib/spack/spack/build_systems/meson.py | 2 +- lib/spack/spack/build_systems/nmake.py | 2 +- lib/spack/spack/cmd/module.py | 2 +- lib/spack/spack/compiler.py | 2 +- lib/spack/spack/compilers/__init__.py | 2 +- lib/spack/spack/compilers/msvc.py | 2 +- lib/spack/spack/compilers/nag.py | 2 +- lib/spack/spack/config.py | 2 +- lib/spack/spack/database.py | 2 +- lib/spack/spack/directives.py | 2 +- lib/spack/spack/fetch_strategy.py | 2 +- lib/spack/spack/modules/common.py | 2 +- lib/spack/spack/modules/lmod.py | 2 +- lib/spack/spack/modules/tcl.py | 2 +- lib/spack/spack/package_base.py | 2 +- lib/spack/spack/repo.py | 8 ++++---- lib/spack/spack/stage.py | 2 +- lib/spack/spack/tengine.py | 2 +- lib/spack/spack/test/schema.py | 2 +- lib/spack/spack/util/spack_json.py | 2 +- lib/spack/spack/util/spack_yaml.py | 2 +- 23 files changed, 26 insertions(+), 26 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/build_systems/autotools.py b/lib/spack/spack/build_systems/autotools.py index a23c58d2ef..8073abef93 100644 --- a/lib/spack/spack/build_systems/autotools.py +++ b/lib/spack/spack/build_systems/autotools.py @@ -7,7 +7,7 @@ import os import os.path import stat import subprocess -from typing import List # novm +from typing import List import llnl.util.filesystem as fs import llnl.util.tty as tty diff --git a/lib/spack/spack/build_systems/makefile.py b/lib/spack/spack/build_systems/makefile.py index 8c4ec20745..d49a6befdf 100644 --- a/lib/spack/spack/build_systems/makefile.py +++ b/lib/spack/spack/build_systems/makefile.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) import inspect -from typing import List # novm +from typing import List import llnl.util.filesystem as fs diff --git a/lib/spack/spack/build_systems/meson.py b/lib/spack/spack/build_systems/meson.py index ef8098f7d6..dc412f8bb9 100644 --- a/lib/spack/spack/build_systems/meson.py +++ b/lib/spack/spack/build_systems/meson.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import inspect import os -from typing import List # novm +from typing import List import llnl.util.filesystem as fs diff --git a/lib/spack/spack/build_systems/nmake.py b/lib/spack/spack/build_systems/nmake.py index 09d57bc8ae..4107fb057a 100644 --- a/lib/spack/spack/build_systems/nmake.py +++ b/lib/spack/spack/build_systems/nmake.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) import inspect -from typing import List # novm +from typing import List import llnl.util.filesystem as fs diff --git a/lib/spack/spack/cmd/module.py b/lib/spack/spack/cmd/module.py index eba30b41b1..9ab4a09f24 100644 --- a/lib/spack/spack/cmd/module.py +++ b/lib/spack/spack/cmd/module.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from typing import Callable, Dict # novm +from typing import Callable, Dict import spack.cmd.modules.lmod import spack.cmd.modules.tcl diff --git a/lib/spack/spack/compiler.py b/lib/spack/spack/compiler.py index 93e645db54..8b3afefa42 100644 --- a/lib/spack/spack/compiler.py +++ b/lib/spack/spack/compiler.py @@ -10,7 +10,7 @@ import platform import re import shutil import tempfile -from typing import List, Optional, Sequence # novm +from typing import List, Optional, Sequence import llnl.util.lang import llnl.util.tty as tty diff --git a/lib/spack/spack/compilers/__init__.py b/lib/spack/spack/compilers/__init__.py index 7d152a28e2..d4aa54282b 100644 --- a/lib/spack/spack/compilers/__init__.py +++ b/lib/spack/spack/compilers/__init__.py @@ -10,7 +10,7 @@ import collections import itertools import multiprocessing.pool import os -from typing import Dict # novm +from typing import Dict import archspec.cpu diff --git a/lib/spack/spack/compilers/msvc.py b/lib/spack/spack/compilers/msvc.py index 8511d70139..f26dcc78ec 100644 --- a/lib/spack/spack/compilers/msvc.py +++ b/lib/spack/spack/compilers/msvc.py @@ -8,7 +8,7 @@ import re import subprocess import sys from distutils.version import StrictVersion -from typing import Dict, List, Set # novm +from typing import Dict, List, Set import spack.compiler import spack.operating_systems.windows_os diff --git a/lib/spack/spack/compilers/nag.py b/lib/spack/spack/compilers/nag.py index 053a775505..35f75adc79 100644 --- a/lib/spack/spack/compilers/nag.py +++ b/lib/spack/spack/compilers/nag.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os -from typing import List # novm +from typing import List import spack.compiler diff --git a/lib/spack/spack/config.py b/lib/spack/spack/config.py index 2ecb500390..3bfd0b18ed 100644 --- a/lib/spack/spack/config.py +++ b/lib/spack/spack/config.py @@ -36,7 +36,7 @@ import os import re import sys from contextlib import contextmanager -from typing import List # novm +from typing import List import ruamel.yaml as yaml from ruamel.yaml.error import MarkedYAMLError diff --git a/lib/spack/spack/database.py b/lib/spack/spack/database.py index 28e5d30331..0fa87f17a4 100644 --- a/lib/spack/spack/database.py +++ b/lib/spack/spack/database.py @@ -26,7 +26,7 @@ import os import socket import sys import time -from typing import Dict # novm +from typing import Dict try: import uuid diff --git a/lib/spack/spack/directives.py b/lib/spack/spack/directives.py index ce47543597..a2d5957dae 100644 --- a/lib/spack/spack/directives.py +++ b/lib/spack/spack/directives.py @@ -32,7 +32,7 @@ import collections.abc import functools import os.path import re -from typing import List, Set # novm +from typing import List, Set import llnl.util.lang import llnl.util.tty.color diff --git a/lib/spack/spack/fetch_strategy.py b/lib/spack/spack/fetch_strategy.py index 11ff951d87..41769f4e87 100644 --- a/lib/spack/spack/fetch_strategy.py +++ b/lib/spack/spack/fetch_strategy.py @@ -30,7 +30,7 @@ import re import shutil import sys import urllib.parse -from typing import List, Optional # novm +from typing import List, Optional import llnl.util import llnl.util.filesystem as fs diff --git a/lib/spack/spack/modules/common.py b/lib/spack/spack/modules/common.py index 05264eef52..060e33efb4 100644 --- a/lib/spack/spack/modules/common.py +++ b/lib/spack/spack/modules/common.py @@ -34,7 +34,7 @@ import datetime import inspect import os.path import re -from typing import Optional # novm +from typing import Optional import llnl.util.filesystem import llnl.util.tty as tty diff --git a/lib/spack/spack/modules/lmod.py b/lib/spack/spack/modules/lmod.py index c7ac9b69c5..38d89f085e 100644 --- a/lib/spack/spack/modules/lmod.py +++ b/lib/spack/spack/modules/lmod.py @@ -7,7 +7,7 @@ import collections import itertools import os.path import posixpath -from typing import Any, Dict # novm +from typing import Any, Dict import llnl.util.lang as lang diff --git a/lib/spack/spack/modules/tcl.py b/lib/spack/spack/modules/tcl.py index 7dea5b18e5..a8775fa99e 100644 --- a/lib/spack/spack/modules/tcl.py +++ b/lib/spack/spack/modules/tcl.py @@ -8,7 +8,7 @@ non-hierarchical modules. """ import posixpath import string -from typing import Any, Dict # novm +from typing import Any, Dict import llnl.util.tty as tty diff --git a/lib/spack/spack/package_base.py b/lib/spack/spack/package_base.py index e98350b407..fe1effde99 100644 --- a/lib/spack/spack/package_base.py +++ b/lib/spack/spack/package_base.py @@ -27,7 +27,7 @@ import time import traceback import types import warnings -from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Type # novm +from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Type import llnl.util.filesystem as fsys import llnl.util.tty as tty diff --git a/lib/spack/spack/repo.py b/lib/spack/spack/repo.py index 92d80b07c2..6538ab0162 100644 --- a/lib/spack/spack/repo.py +++ b/lib/spack/spack/repo.py @@ -9,7 +9,7 @@ import contextlib import errno import functools import importlib -import importlib.machinery # novm +import importlib.machinery import importlib.util import inspect import itertools @@ -24,7 +24,7 @@ import sys import traceback import types import uuid -from typing import Dict # novm +from typing import Dict import ruamel.yaml as yaml @@ -79,7 +79,7 @@ def namespace_from_fullname(fullname): return namespace -class _PrependFileLoader(importlib.machinery.SourceFileLoader): # novm +class _PrependFileLoader(importlib.machinery.SourceFileLoader): def __init__(self, fullname, path, prepend=None): super(_PrependFileLoader, self).__init__(fullname, path) self.prepend = prepend @@ -144,7 +144,7 @@ class ReposFinder(object): loader = self.compute_loader(fullname) if loader is None: return None - return importlib.util.spec_from_loader(fullname, loader) # novm + return importlib.util.spec_from_loader(fullname, loader) def compute_loader(self, fullname): # namespaces are added to repo, and package modules are leaves. diff --git a/lib/spack/spack/stage.py b/lib/spack/spack/stage.py index a5177780c5..b9391ea8f1 100644 --- a/lib/spack/spack/stage.py +++ b/lib/spack/spack/stage.py @@ -14,7 +14,7 @@ import shutil import stat import sys import tempfile -from typing import Dict # novm +from typing import Dict import llnl.util.lang import llnl.util.tty as tty diff --git a/lib/spack/spack/tengine.py b/lib/spack/spack/tengine.py index 7bca23214e..a9ab7533fa 100644 --- a/lib/spack/spack/tengine.py +++ b/lib/spack/spack/tengine.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import itertools import textwrap -from typing import List # novm +from typing import List import llnl.util.lang diff --git a/lib/spack/spack/test/schema.py b/lib/spack/spack/test/schema.py index 4623823609..c7b6693761 100644 --- a/lib/spack/spack/test/schema.py +++ b/lib/spack/spack/test/schema.py @@ -91,7 +91,7 @@ def test_module_suffixes(module_suffixes_schema): ["compilers", "config", "env", "merged", "mirrors", "modules", "packages", "repos"], ) def test_schema_validation(meta_schema, config_name): - import importlib # novm + import importlib module_name = "spack.schema.{0}".format(config_name) module = importlib.import_module(module_name) diff --git a/lib/spack/spack/util/spack_json.py b/lib/spack/spack/util/spack_json.py index 69ad063bae..41f5f1c376 100644 --- a/lib/spack/spack/util/spack_json.py +++ b/lib/spack/spack/util/spack_json.py @@ -5,7 +5,7 @@ """Simple wrapper around JSON to guarantee consistent use of load/dump. """ import json -from typing import Any, Dict, Optional # novm +from typing import Any, Dict, Optional import spack.error diff --git a/lib/spack/spack/util/spack_yaml.py b/lib/spack/spack/util/spack_yaml.py index cb1e9398b0..3448f3a1ba 100644 --- a/lib/spack/spack/util/spack_yaml.py +++ b/lib/spack/spack/util/spack_yaml.py @@ -17,7 +17,7 @@ import collections.abc import ctypes import io import re -from typing import List # novm +from typing import List import ruamel.yaml as yaml from ruamel.yaml import RoundTripDumper, RoundTripLoader -- cgit v1.2.3-70-g09d2