Merge branch 'use-mpsd-microarch-consistently' into 'main'

Use mpsd microarch consistently

Closes #33

See merge request !108

src/mpsd_software_manager/mpsd_software.py

@@ -132,7 +132,6 @@ def read_metadata_from_logfile(logfile: Union[str, Path]) -> dict:
 
 def create_log_file_name(
     mpsd_release: str,
-    microarch: str,
     action: str,
     date: str = call_date_iso,
     package_set: Union[str, None] = None,
@@ -152,8 +151,6 @@ def create_log_file_name(
     ----------
     mpsd_release : str
         MPSD software stack version
-    microarch : str
-        system architecture
     date : str
         date of the call ins iso format
     action : str
@@ -176,7 +173,6 @@ def create_log_file_name(
     # installer log file name for `mpsd-software install dev-23a foss2021a-mpi`
     >>> create_log_file_name(
     ...         "dev-23a",
-    ...         "sandybridge",
     ...         "install",
     ...         "2023-07-03T12-27-52",
     ...     )
@@ -185,7 +181,6 @@ def create_log_file_name(
     # build log file name for `mpsd-software install dev-23a foss2021a-mpi`
     >>> create_log_file_name(
     ...     "dev-23a",
-    ...     "sandybridge",
     ...     "install",
     ...     "2023-07-03T12-27-52",
     ...     "foss2021a-mpi",
@@ -195,7 +190,6 @@ def create_log_file_name(
     # installer log file name for `mpsd-software status dev-23a`
     >>> create_log_file_name(
     ...     "dev-23a",
-    ...     "sandybridge",
     ...     "status",
     ...     "2023-07-03T12-27-52",
     ... )
@@ -204,13 +198,13 @@ def create_log_file_name(
     # build log file name for `mpsd-software status dev-23a` (no log file is created)
     >>> create_log_file_name(
     ...     "dev-23a",
-    ...     "sandybridge",
     ...     "status",
     ...     "2023-07-03T12-27-52",
     ...     "foss2021a-mpi",
     ... )
     (None)
     """
+    microarch = get_native_microarchitecture()
     if package_set:
         # if package_set is given, then  we build the build_log_file_name
         if action in ["install", "remove"]:
@@ -301,11 +295,8 @@ def get_log_file_path(
     ... )
     (None)
     """
-    # Get machine configs
-    microarch = get_native_microarchitecture()
     log_file_name = create_log_file_name(
         mpsd_release=mpsd_release,
-        microarch=microarch,
         action=cmd,
         package_set=package_set,
     )

tests/test_mpsd_software.py

@@ -421,13 +421,12 @@ def test_create_log_file_name():
     """Test that the log file names are created correctly."""
     create_log_file_name = mod.create_log_file_name
     mpsd_release = "dev-23a"
-    microarch = "sandybridge"
+    microarch = mod.get_native_microarchitecture()
     date = datetime.datetime.now().replace(microsecond=0).isoformat()
     action = "install"
     package_set = "foss2021a"
     # test build_log_file_name  generation
     build_log_file_name = create_log_file_name(
-        microarch=microarch,
         mpsd_release=mpsd_release,
         date=date,
         action=action,
@@ -438,7 +437,6 @@ def test_create_log_file_name():
         == f"{mpsd_release}_{microarch}_{date}_BUILD_{package_set}_{action}.log"
     )
     installer_log_file_name = create_log_file_name(
-        microarch=microarch,
         mpsd_release=mpsd_release,
         date=date,
         action=action,
@@ -449,7 +447,6 @@ def test_create_log_file_name():
     )
     # test no build log file for incorrect action
     build_log_file_name = create_log_file_name(
-        microarch=microarch,
         mpsd_release=mpsd_release,
         date=date,
         action="status",