From 4e69c7497eb00b45a278fa6ccfd769967b77aa41 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Thu, 11 Jul 2024 16:40:22 +0200 Subject: [PATCH] parse_with_version_concrete: remove `compiler=` switch --- lib/spack/spack/compilers/__init__.py | 4 ++-- lib/spack/spack/spec.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/spack/spack/compilers/__init__.py b/lib/spack/spack/compilers/__init__.py index bfb781685f8..d98dcb8b1e5 100644 --- a/lib/spack/spack/compilers/__init__.py +++ b/lib/spack/spack/compilers/__init__.py @@ -233,7 +233,7 @@ def all_compilers_config( def all_compiler_specs(scope=None, init_config=True): # Return compiler specs from the merged config. return [ - spack.spec.parse_with_version_concrete(s["compiler"]["spec"], compiler=True) + spack.spec.parse_with_version_concrete(s["compiler"]["spec"]) for s in all_compilers_config(spack.config.CONFIG, scope=scope, init_config=init_config) ] @@ -459,7 +459,7 @@ def __eq__(self, other): def compiler_from_dict(items): - cspec = spack.spec.parse_with_version_concrete(items["spec"], compiler=True) + cspec = spack.spec.parse_with_version_concrete(items["spec"]) os = items.get("operating_system", None) target = items.get("target", None) diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py index 0c87a87679a..cc396dac2eb 100644 --- a/lib/spack/spack/spec.py +++ b/lib/spack/spack/spec.py @@ -4725,9 +4725,9 @@ def substitute_abstract_variants(spec: Spec): ) -def parse_with_version_concrete(spec_like: Union[str, Spec], compiler: bool = False): +def parse_with_version_concrete(spec_like: Union[str, Spec]): """Same as Spec(string), but interprets @x as @=x""" - s: Union[CompilerSpec, Spec] = CompilerSpec(spec_like) if compiler else Spec(spec_like) + s = Spec(spec_like) interpreted_version = s.versions.concrete_range_as_version if interpreted_version: s.versions = vn.VersionList([interpreted_version])