diff --git a/mpsd-software-environment.py b/mpsd-software-environment.py index 1c26789a50395b979e1d6b8f0a8a58bcd0c2a634..efdd2c47fab1192fe5f0fd6810419c353e6e75da 100755 --- a/mpsd-software-environment.py +++ b/mpsd-software-environment.py @@ -1,7 +1,6 @@ #!/usr/bin/env python3 import os import subprocess -import time import datetime import argparse import sys @@ -241,7 +240,7 @@ def install_environment( # Set required variables release_base_dir = script_dir / mpsd_release - mpsd_os = os.environ.get("MPSD_OS", "UNKNOWN_OS") + os.environ.get("MPSD_OS", "UNKNOWN_OS") mpsd_microarch = os.environ.get("MPSD_MICROARCH", "UNKNOWN_MICROARCH") toolchain_dir = release_base_dir / mpsd_microarch toolchain_dir.mkdir(parents=True, exist_ok=True) diff --git a/tests.py b/tests.py index 4cac5a0565bcaf3f229207088bf38eaad66e254e..73b881bb9b18d24d0d714628baff94f09f7a3e69 100644 --- a/tests.py +++ b/tests.py @@ -2,7 +2,6 @@ import os import pytest import importlib import subprocess -import time import shutil from pathlib import Path @@ -73,7 +72,6 @@ def test_setup_log_cmd(tmp_path): log_file = "install.log" script_dir = tmp_path / "test_prepare_env" - spack_environments = "spack-environments" mpsd_release_to_test = "dev-23a" release_base_dir = script_dir / mpsd_release_to_test if os.path.exists(release_base_dir / log_file): @@ -82,9 +80,7 @@ def test_setup_log_cmd(tmp_path): initial_bytes = 0 # run the prepare_env functionality - result = mod.prepare_environment( - mpsd_release=mpsd_release_to_test, script_dir=(script_dir) - ) + mod.prepare_environment(mpsd_release=mpsd_release_to_test, script_dir=(script_dir)) # check that logs/install-software-environment.log is updated assert os.path.exists(release_base_dir / log_file) @@ -122,14 +118,11 @@ def test_install_environment(tmp_path): if script_dir.exists(): shutil.rmtree(script_dir) script_dir.mkdir(exist_ok=True, parents=True) - spack_environments = "spack-environments" mpsd_release_to_test = "dev-23a" toolchain_to_test = "global_generic" mpsd_microarch = os.getenv("MPSD_MICROARCH", "UNKNOWN_MICROARCH") release_base_dir = script_dir / mpsd_release_to_test - prepare_result = mod.prepare_environment( - mpsd_release=mpsd_release_to_test, script_dir=(script_dir) - ) + mod.prepare_environment(mpsd_release=mpsd_release_to_test, script_dir=(script_dir)) # Patch the spack environments to create a fake global_generic # create a test toolchain toolchain_src_dir = release_base_dir / "spack-environments" / "toolchains" @@ -165,7 +158,7 @@ def test_install_environment(tmp_path): with open(setup_file, "w") as f: f.write(lines) # install global_generic toolchain - install_result = mod.install_environment( + mod.install_environment( mpsd_release=mpsd_release_to_test, toolchains=[toolchain_to_test], script_dir=script_dir, @@ -192,7 +185,7 @@ def test_install_environment(tmp_path): assert os.path.exists(release_base_dir / "install.log") # assert that the build log is written to the install log file - build_log_file_name = os.path.basename(build_log) + os.path.basename(build_log) with open(release_base_dir / "install.log", "r") as f: lines = f.read() assert (