Merge pull request #83 from sarugaku:frostming/issue81

fix: always detect the host shell on MacOS

.github/workflows/ci.yml

@@ -6,12 +6,12 @@ on:
 
 jobs:
   lint:
-    runs-on: ubuntu-latest 
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v4
     - run: pip install black ruff
-    - run: | 
+    - run: |
         ruff check src
         black --check src
   build:
@@ -20,13 +20,13 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.7, 3.8, 3.9, '3.10', '3.11']
+        python-version: [3.7, 3.8, 3.9, '3.10', '3.11', '3.12']
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 

.github/workflows/publish.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install build dependencies
       run: python -m pip install --upgrade build

news/81.bugfix.rst

@@ -0,0 +1 @@
+Fix a bug that ``detect_shell()`` always returns the host shell on MacOS.

setup.cfg

@@ -22,6 +22,7 @@ classifier =
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
     Topic :: Software Development :: Libraries :: Python Modules
 
 [options]

src/shellingham/posix/ps.py

@@ -31,7 +31,7 @@ def iter_process_parents(pid, max_depth=10):
     processes_mapping = {}
     for line in output.split("\n"):
         try:
-            pid, ppid, args = line.strip().split(None, 2)
+            _pid, ppid, args = line.strip().split(None, 2)
             # XXX: This is not right, but we are really out of options.
             # ps does not offer a sane way to decode the argument display,
             # and this is "Good Enough" for obtaining shell names. Hopefully
@@ -40,7 +40,7 @@ def iter_process_parents(pid, max_depth=10):
             args = tuple(a.strip() for a in args.split(" "))
         except ValueError:
             continue
-        processes_mapping[pid] = Process(args=args, pid=pid, ppid=ppid)
+        processes_mapping[_pid] = Process(args=args, pid=_pid, ppid=ppid)
 
     for _ in range(max_depth):
         try:

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py37, py38, py39, py310, py311
+envlist = py37, py38, py39, py310, py311, py312
 
 [gh-actions]
 python =
@@ -8,6 +8,7 @@ python =
     3.9: py39
     3.10: py310
     3.11: py311
+    3.12: py312
 
 [testenv]
 allowlist_externals = pipenv