Merge pull request #676 from amoffat/develop

2.0.4 release
amoffat · May 15, 2023 · adb0af3 · adb0af3
2 parents 4ecfd8a + db126f2
commit adb0af3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 
-## 2.0.2 - 2/13/22
+## 2.0.4 - 5/13/22
+
+- Allow `ok_code` to be used with `fg` [#655](https://github.com/amoffat/sh/pull/655)
+- Make sure `new_group` never creates a new session [#675](https://github.com/amoffat/sh/pull/675)
+
+## 2.0.2 / 2.0.3 (misversioned) - 2/13/22
 
 - Performance regression when using a generator with `_in` [#650](https://github.com/amoffat/sh/pull/650)
 - Adding test support for python 3.11

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sh"
-version = "2.0.3"
+version = "2.0.4"
 description = "Python subprocess replacement"
 authors = ["Andrew Moffat <[email protected]>"]
 readme = "README.rst"

diff --git a/sh.py b/sh.py
@@ -1116,7 +1116,7 @@ def fg_validator(passed_kwargs, merged_kwargs):
 _fg is invalid with nearly every other option, see warning and workaround here:
 
     https://amoffat.github.io/sh/sections/special_arguments.html#fg"""
-    allowlist = {"env", "fg", "cwd"}
+    allowlist = {"env", "fg", "cwd", "ok_code"}
     offending = set(passed_kwargs.keys()) - allowlist
 
     if "fg" in passed_kwargs and passed_kwargs["fg"] and offending:
@@ -2037,7 +2037,7 @@ def __init__(
                 if new_session:
                     os.setsid()
                 elif new_group:
-                    os.setpgrp()
+                    os.setpgid(0, 0)
 
                 sid = os.getsid(0)
                 pgid = os.getpgid(0)