Merge branch 'develop' into feat/yaml-config

reframe-hpc · Feb 4, 2025 · 83c2d2b · 83c2d2b
2 parents 69618ff + 687cd49
commit 83c2d2b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -6,7 +6,8 @@ jsonschema==3.2.0
 PyYAML==6.0.1; python_version < '3.8'
 PyYAML==6.0.2; python_version >= '3.8'
 semver==2.13.0; python_version == '3.6'
-semver==3.0.2; python_version >= '3.7'
+semver==3.0.4; python_version >= '3.7'
+Sphinx==5.3.0; python_version < '3.8'
 Sphinx==7.1.2; python_version == '3.8'
 Sphinx==7.3.7; python_version >= '3.9'
 sphinx-rtd-theme==2.0.0
diff --git a/reframe/utility/osext.py b/reframe/utility/osext.py
@@ -66,7 +66,17 @@ def start(self):
         args, kwargs = self._cmd_args
         self._proc = run_command_async(*args, **kwargs)
 
-        if os.getsid(self._proc.pid) == self._proc.pid:
+        # On Python 3.7/3.8 on MacOS, getsid may fail with ESRCH,
+        # so insist on getting the session leader
+        while True:
+            try:
+                sid = os.getsid(self._proc.pid)
+            except ProcessLookupError:
+                continue
+            else:
+                break
+
+        if sid == self._proc.pid:
             self._session = True
         else:
             self._session = False

diff --git a/requirements.txt b/requirements.txt
@@ -3,7 +3,8 @@ argcomplete==3.1.2; python_version < '3.8'
 argcomplete==3.5.3; python_version >= '3.8'
 filelock==3.4.1; python_version == '3.6'
 filelock==3.12.2; python_version == '3.7'
-filelock==3.16.1; python_version >= '3.8'
+filelock==3.16.1; python_version == '3.8'
+filelock==3.17.0; python_version > '3.8'
 importlib_metadata==4.0.1; python_version < '3.8'
 jinja2==3.0.3; python_version == '3.6'
 jinja2==3.1.4; python_version >= '3.7'
@@ -24,10 +25,11 @@ requests==2.27.1; python_version == '3.6'
 requests==2.31.0; python_version == '3.7'
 requests==2.32.2; python_version >= '3.8'
 semver==2.13.0; python_version == '3.6'
-semver==3.0.2; python_version >= '3.7'
+semver==3.0.4; python_version >= '3.7'
 setuptools==59.6.0; python_version == '3.6'
 setuptools==68.0.0; python_version == '3.7'
-setuptools==75.3.0; python_version >= '3.8'
+setuptools==75.3.0; python_version == '3.8'
+setuptools==75.8.0; python_version >= '3.9'
 tabulate==0.8.10; python_version == '3.6'
 tabulate==0.9.0; python_version >= '3.7'
 wcwidth==0.2.13

diff --git a/setup.cfg b/setup.cfg
@@ -31,6 +31,7 @@ install_requires =
     argcomplete
     argcomplete <= 3.1.2; python_version < '3.8'
     filelock
+    filelock<=3.16.1; python_version == '3.8'
     filelock<=3.12.2; python_version == '3.7'
     filelock<=3.4.1; python_version == '3.6'
     jinja2==3.0.3; python_version == '3.6'