Test 7

Author: dtriand

src/xtl/common/os.py

@@ -24,6 +24,16 @@ def get_os_name_and_version() -> str:
         return f'{platform.system()} {platform.version()}'
 
 
+def get_username() -> str:
+    try:
+        return os.getlogin()
+    except OSError:
+        # Fallback for CI/CD environments where `os.getlogin()` fails
+        import getpass
+        return getpass.getuser()
+
+
+
 class FileType(StrEnum):
     """
     POSIX file type representation.

src/xtl/diffraction/automate/autoproc.py

@@ -16,7 +16,7 @@
 from xtl.automate.shells import Shell, BashShell
 from xtl.automate.sites import ComputeSite
 from xtl.automate.jobs import Job, limited_concurrency
-from xtl.common.os import get_os_name_and_version, chmod_recursively
+from xtl.common.os import get_os_name_and_version, chmod_recursively, get_username
 from xtl.diffraction.images.datasets import DiffractionDataset
 from xtl.diffraction.automate.autoproc_utils import AutoPROCConfig, AutoPROCJobResults
 from xtl.exceptions.utils import Catcher
@@ -259,7 +259,7 @@ def _get_macro_content(self) -> str:
         content = [
             f'# autoPROC macro file',
             f'# Generated by xtl v.{__version__} on {datetime.now().isoformat()}',
-            f'#  {os.getlogin()}@{platform.node()} [{get_os_name_and_version()}]',
+            f'#  {get_username()}@{platform.node()} [{get_os_name_and_version()}]',
             f''
         ]
 
@@ -664,7 +664,7 @@ def _get_macro_content(self) -> str:
         content = [
             f'# aP_wf_process macro file',
             f'# Generated by xtl v.{__version__} on {datetime.now().isoformat()}',
-            f'#  {os.getlogin()}@{platform.node()} [{get_os_name_and_version()}]',
+            f'#  {get_username()}@{platform.node()} [{get_os_name_and_version()}]',
             f''
         ]