From 2f0265d0765d5a67ce30552ec8d07bb242b3462a Mon Sep 17 00:00:00 2001 From: Oz N Tiram Date: Thu, 8 Sep 2022 00:06:55 +0200 Subject: [PATCH 1/2] Bump vendored version of shellingham Fix #5333 --- pipenv/vendor/shellingham/__init__.py | 2 +- pipenv/vendor/shellingham/_core.py | 2 +- pipenv/vendor/shellingham/posix/__init__.py | 2 +- pipenv/vendor/shellingham/posix/proc.py | 2 +- pipenv/vendor/vendor.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pipenv/vendor/shellingham/__init__.py b/pipenv/vendor/shellingham/__init__.py index 20929b2a83..0ce2e193b6 100644 --- a/pipenv/vendor/shellingham/__init__.py +++ b/pipenv/vendor/shellingham/__init__.py @@ -4,7 +4,7 @@ from ._core import ShellDetectionFailure -__version__ = "1.4.0" +__version__ = "1.5.0" def detect_shell(pid=None, max_depth=10): diff --git a/pipenv/vendor/shellingham/_core.py b/pipenv/vendor/shellingham/_core.py index 2c974c8fdf..13b65417c7 100644 --- a/pipenv/vendor/shellingham/_core.py +++ b/pipenv/vendor/shellingham/_core.py @@ -3,7 +3,7 @@ | {"csh", "tcsh"} # C. | {"ksh", "zsh", "fish"} # Common alternatives. | {"cmd", "powershell", "pwsh"} # Microsoft. - | {"elvish", "xonsh"} # More exotic. + | {"elvish", "xonsh", "nu"} # More exotic. ) diff --git a/pipenv/vendor/shellingham/posix/__init__.py b/pipenv/vendor/shellingham/posix/__init__.py index fe1713f989..b81bf085d1 100644 --- a/pipenv/vendor/shellingham/posix/__init__.py +++ b/pipenv/vendor/shellingham/posix/__init__.py @@ -27,7 +27,7 @@ def _iter_process_args(mapping, pid, max_depth): proc = mapping[pid] except KeyError: # We've reached the root process. Give up. break - if proc.args: # Persumably the process should always have a name? + if proc.args: # Presumably the process should always have a name? yield proc.args pid = proc.ppid # Go up one level. diff --git a/pipenv/vendor/shellingham/posix/proc.py b/pipenv/vendor/shellingham/posix/proc.py index 418a3bc237..14cf9da364 100644 --- a/pipenv/vendor/shellingham/posix/proc.py +++ b/pipenv/vendor/shellingham/posix/proc.py @@ -16,7 +16,7 @@ def detect_proc(): """Detect /proc filesystem style. This checks the /proc/{pid} directory for possible formats. Returns one of - the followings as str: + the following as str: * `stat`: Linux-style, i.e. ``/proc/{pid}/stat``. * `status`: BSD-style, i.e. ``/proc/{pid}/status``. diff --git a/pipenv/vendor/vendor.txt b/pipenv/vendor/vendor.txt index 65a8fc13f8..6bfa030f45 100644 --- a/pipenv/vendor/vendor.txt +++ b/pipenv/vendor/vendor.txt @@ -19,7 +19,7 @@ pyparsing==3.0.9 python-dotenv==0.19.0 pythonfinder==1.3.1 requirementslib==2.0.1 -shellingham==1.4.0 +shellingham==1.5.0 six==1.16.0 termcolor==1.1.0 toml==0.10.2 From eaf3d0a1307012da7e6680a2e80f352a508279c4 Mon Sep 17 00:00:00 2001 From: Oz N Tiram Date: Thu, 8 Sep 2022 00:10:16 +0200 Subject: [PATCH 2/2] Add news fragment --- news/5336.vendor.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/5336.vendor.rst diff --git a/news/5336.vendor.rst b/news/5336.vendor.rst new file mode 100644 index 0000000000..876cfbb2d4 --- /dev/null +++ b/news/5336.vendor.rst @@ -0,0 +1 @@ +Bump version of shellingham to support nushell.