Skip to content
Snippets Groups Projects
Commit f60b6edb authored by Ashwin Kumar Karnad's avatar Ashwin Kumar Karnad
Browse files

black

parent 27e1e27a
No related branches found
No related tags found
2 merge requests!19Move linux-debian11 into main,!1Resolve "First draft for user interface for top level install command"
...@@ -33,8 +33,8 @@ class builder: ...@@ -33,8 +33,8 @@ class builder:
self, release, cmd, toolchain_list=None, target_dir=None, skip_build_cache=False self, release, cmd, toolchain_list=None, target_dir=None, skip_build_cache=False
) -> None: ) -> None:
# Variables taken from cli arguments # Variables taken from cli arguments
self.mpsd_os = os.getenv("MPSD_OS","UNKNOWN_OS") self.mpsd_os = os.getenv("MPSD_OS", "UNKNOWN_OS")
self.mpsd_microarch = os.getenv("MPSD_MICROARCH","UNKNOWN_MICROARCH") self.mpsd_microarch = os.getenv("MPSD_MICROARCH", "UNKNOWN_MICROARCH")
self.mpsd_spack_ver = release self.mpsd_spack_ver = release
self.toolchain_list = toolchain_list self.toolchain_list = toolchain_list
if target_dir == "DEFAULT" or target_dir is None: if target_dir == "DEFAULT" or target_dir is None:
...@@ -70,7 +70,6 @@ class builder: ...@@ -70,7 +70,6 @@ class builder:
self.cmd_log_file = "logs/install-software-environment.log" self.cmd_log_file = "logs/install-software-environment.log"
self.build_log_file = f"build_toolchains_{self.mpsd_spack_ver}_{time.strftime('%Y%m%d-%H%M%S')}.log" self.build_log_file = f"build_toolchains_{self.mpsd_spack_ver}_{time.strftime('%Y%m%d-%H%M%S')}.log"
# run the script # run the script
# self.run() # better to call this seperately after creating the object # self.run() # better to call this seperately after creating the object
...@@ -84,7 +83,6 @@ class builder: ...@@ -84,7 +83,6 @@ class builder:
else: else:
self.prepare_env() self.prepare_env()
def prepare_env(self): def prepare_env(self):
if not os.path.exists(self.toolchain_base_dir): if not os.path.exists(self.toolchain_base_dir):
os.makedirs(self.toolchain_base_dir) os.makedirs(self.toolchain_base_dir)
...@@ -96,7 +94,11 @@ class builder: ...@@ -96,7 +94,11 @@ class builder:
) )
with os_chdir(self.toolchain_base_dir): with os_chdir(self.toolchain_base_dir):
subprocess.run( subprocess.run(
["git", "clone", "https://gitlab.gwdg.de/mpsd-cs/spack-environments.git"] [
"git",
"clone",
"https://gitlab.gwdg.de/mpsd-cs/spack-environments.git",
]
) )
with os_chdir("spack-environments"): with os_chdir("spack-environments"):
subprocess.run(["git", "checkout", self.mpsd_spack_ver]) subprocess.run(["git", "checkout", self.mpsd_spack_ver])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment