From 21641e19449bced1375a33e00df1fc654621d998 Mon Sep 17 00:00:00 2001
From: Ashwin Kumar Karnad <ashwin-kumar.karnad@mpsd.mpg.de>
Date: Fri, 9 Jun 2023 13:15:04 +0000
Subject: [PATCH] use `mpsd_release` instead of `release`. Good idea to have
this consistent throughout the script.
---
mpsd-software-environment.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/mpsd-software-environment.py b/mpsd-software-environment.py
index acbadea..0c7b7d8 100755
--- a/mpsd-software-environment.py
+++ b/mpsd-software-environment.py
@@ -315,7 +315,7 @@ def set_up_logging(loglevel="warning", file_path=None):
)
-def get_available_toolchains(release: str) -> List[str]:
+def get_available_toolchains(mpsd_release: str) -> List[str]:
"""Given a release, return the available toolchains.
This is based on the spack-environment's repository [1]. For this function
@@ -343,8 +343,8 @@ def get_available_toolchains(release: str) -> List[str]:
'global_generic']
"""
- logging.debug(f"get_available_toolchains({release=})")
- logging.info(f"Retrieving available toolchains for release {release}")
+ logging.debug(f"get_available_toolchains({mpsd_release=})")
+ logging.info(f"Retrieving available toolchains for release {mpsd_release}")
print_log = logging.getLogger("print")
# create temporary directory
@@ -352,7 +352,7 @@ def get_available_toolchains(release: str) -> List[str]:
tmp_dir_path = Path(tmp_dir.name)
# find toolchains by cloning repository and checking out right branch
- clone_repo(tmp_dir_path, config_vars["spack_environments_repo"], branch=release)
+ clone_repo(tmp_dir_path, config_vars["spack_environments_repo"], branch=mpsd_release)
# look for directories defining the toolchains
toolchains = os.listdir(tmp_dir_path / "toolchains")
@@ -360,7 +360,7 @@ def get_available_toolchains(release: str) -> List[str]:
logging.debug(msg)
# summarise toolchains found for use
- print_log.info(f"MPSD software release {release} provides")
+ print_log.info(f"MPSD software release {mpsd_release} provides")
for toolchain in sorted(toolchains):
print_log.info(" " + toolchain)
--
GitLab