From 95ad713276e604592cd2dd89140680670a878cbb Mon Sep 17 00:00:00 2001
From: iamashwin99 <ashwin-kumar.karnad@mpsd.mpg.de>
Date: Mon, 19 Jun 2023 14:08:42 +0200
Subject: [PATCH 1/5] clone releases/{mpsd_release}
---
src/mpsd_software_manager/mpsd_software.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/mpsd_software_manager/mpsd_software.py b/src/mpsd_software_manager/mpsd_software.py
index c9e5055..1ce3a2c 100755
--- a/src/mpsd_software_manager/mpsd_software.py
+++ b/src/mpsd_software_manager/mpsd_software.py
@@ -392,8 +392,9 @@ def get_available_package_sets(mpsd_release: str) -> List[str]:
tmp_dir_path = Path(tmp_dir.name)
# find package_sets by cloning repository and checking out right branch
+ brach_name = f"releases/{mpsd_release}"
clone_repo(
- tmp_dir_path, config_vars["spack_environments_repo"], branch=mpsd_release
+ tmp_dir_path, config_vars["spack_environments_repo"], branch=brach_name
)
# look for directories defining the package_sets
--
GitLab
From 0b8c6f24c97db9aef785554ef0a2fd264885ce4a Mon Sep 17 00:00:00 2001
From: iamashwin99 <ashwin-kumar.karnad@mpsd.mpg.de>
Date: Mon, 19 Jun 2023 14:10:10 +0200
Subject: [PATCH 2/5] clone the right branch
---
src/mpsd_software_manager/mpsd_software.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/mpsd_software_manager/mpsd_software.py b/src/mpsd_software_manager/mpsd_software.py
index 1ce3a2c..aec8052 100755
--- a/src/mpsd_software_manager/mpsd_software.py
+++ b/src/mpsd_software_manager/mpsd_software.py
@@ -803,7 +803,7 @@ def prepare_environment(mpsd_release: str, root_dir: Path) -> List[str]:
else:
repo_url = config_vars["spack_environments_repo"]
logging.info(f"cloning repository {repo_path} from {repo_url}")
- clone_repo(repo_path, repo_url, branch=mpsd_release)
+ clone_repo(repo_path, repo_url, branch=f"releases/{mpsd_release})
logging.getLogger("print").info(
f"Release {mpsd_release} is prepared in {release_base_dir}"
--
GitLab
From 76a015d3802ccda60595f590f3da968617871b49 Mon Sep 17 00:00:00 2001
From: iamashwin99 <ashwin-kumar.karnad@mpsd.mpg.de>
Date: Mon, 19 Jun 2023 14:10:40 +0200
Subject: [PATCH 3/5] balck and fix typo
---
src/mpsd_software_manager/mpsd_software.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/mpsd_software_manager/mpsd_software.py b/src/mpsd_software_manager/mpsd_software.py
index aec8052..b1b5cdd 100755
--- a/src/mpsd_software_manager/mpsd_software.py
+++ b/src/mpsd_software_manager/mpsd_software.py
@@ -393,9 +393,7 @@ def get_available_package_sets(mpsd_release: str) -> List[str]:
# find package_sets by cloning repository and checking out right branch
brach_name = f"releases/{mpsd_release}"
- clone_repo(
- tmp_dir_path, config_vars["spack_environments_repo"], branch=brach_name
- )
+ clone_repo(tmp_dir_path, config_vars["spack_environments_repo"], branch=brach_name)
# look for directories defining the package_sets
package_sets = os.listdir(tmp_dir_path / "toolchains")
@@ -803,7 +801,7 @@ def prepare_environment(mpsd_release: str, root_dir: Path) -> List[str]:
else:
repo_url = config_vars["spack_environments_repo"]
logging.info(f"cloning repository {repo_path} from {repo_url}")
- clone_repo(repo_path, repo_url, branch=f"releases/{mpsd_release})
+ clone_repo(repo_path, repo_url, branch=f"releases/{mpsd_release}")
logging.getLogger("print").info(
f"Release {mpsd_release} is prepared in {release_base_dir}"
--
GitLab
From 831c005f441a55a0ba376768ed4186ea6eeb2e73 Mon Sep 17 00:00:00 2001
From: iamashwin99 <ashwin-kumar.karnad@mpsd.mpg.de>
Date: Mon, 19 Jun 2023 14:17:12 +0200
Subject: [PATCH 4/5] update tests
---
tests/test_mpsd_software.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/test_mpsd_software.py b/tests/test_mpsd_software.py
index 6c6c713..6c9c882 100644
--- a/tests/test_mpsd_software.py
+++ b/tests/test_mpsd_software.py
@@ -146,7 +146,7 @@ def test_prepare_environment(tmp_path):
capture_output=True,
)
git_branch_stdout = git_branch_output_raw.stdout.decode("utf-8")
- assert f"* {mpsd_release_to_test}" in git_branch_stdout
+ assert f"* releases/{mpsd_release_to_test}" in git_branch_stdout
# check that result is a list and contains atleast ['global','foss2021a-mpi']
assert isinstance(result, list)
@@ -185,7 +185,7 @@ def test_record_script_execution_summary(tmp_path):
# Check that the log file has "Spack environments branch: dev-23a " in the last line
with open(root_dir / cmd_log_file, "r") as f:
last_line = f.readlines()[-1]
- assert "Spack environments branch: dev-23a " in last_line
+ assert "Spack environments branch: releases/dev-23a" in last_line
def test_install_environment_wrong_package_set(tmp_path):
--
GitLab
From ff2720d610644a41e34668e79d913eb2141d65ef Mon Sep 17 00:00:00 2001
From: iamashwin99 <ashwin-kumar.karnad@mpsd.mpg.de>
Date: Mon, 19 Jun 2023 14:21:40 +0200
Subject: [PATCH 5/5] avoid using a seperate variable
---
src/mpsd_software_manager/mpsd_software.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/mpsd_software_manager/mpsd_software.py b/src/mpsd_software_manager/mpsd_software.py
index b1b5cdd..836e9e4 100755
--- a/src/mpsd_software_manager/mpsd_software.py
+++ b/src/mpsd_software_manager/mpsd_software.py
@@ -392,8 +392,11 @@ def get_available_package_sets(mpsd_release: str) -> List[str]:
tmp_dir_path = Path(tmp_dir.name)
# find package_sets by cloning repository and checking out right branch
- brach_name = f"releases/{mpsd_release}"
- clone_repo(tmp_dir_path, config_vars["spack_environments_repo"], branch=brach_name)
+ clone_repo(
+ tmp_dir_path,
+ config_vars["spack_environments_repo"],
+ branch=f"releases/{mpsd_release}",
+ )
# look for directories defining the package_sets
package_sets = os.listdir(tmp_dir_path / "toolchains")
--
GitLab