From ce5289a8b8dd358f5ec22dde31d062ebdebc2cab Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Sun, 4 Dec 2022 03:53:54 -0500 Subject: [PATCH 1/2] vendor in Pip 22.3.1 --- pipenv/patched/patched.txt | 2 +- pipenv/patched/pip/__init__.py | 2 +- pipenv/patched/pip/_internal/operations/install/wheel.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pipenv/patched/patched.txt b/pipenv/patched/patched.txt index 11eda87ad8..e5ae066eb2 100644 --- a/pipenv/patched/patched.txt +++ b/pipenv/patched/patched.txt @@ -1,2 +1,2 @@ -pip==22.3 +pip==22.3.1 safety==2.3.2 diff --git a/pipenv/patched/pip/__init__.py b/pipenv/patched/pip/__init__.py index cd662e9842..d5f9bc0c4a 100644 --- a/pipenv/patched/pip/__init__.py +++ b/pipenv/patched/pip/__init__.py @@ -1,6 +1,6 @@ from typing import List, Optional -__version__ = "22.3" +__version__ = "22.3.1" def main(args: Optional[List[str]] = None) -> int: diff --git a/pipenv/patched/pip/_internal/operations/install/wheel.py b/pipenv/patched/pip/_internal/operations/install/wheel.py index c5c76a8329..588a40a882 100644 --- a/pipenv/patched/pip/_internal/operations/install/wheel.py +++ b/pipenv/patched/pip/_internal/operations/install/wheel.py @@ -325,7 +325,7 @@ def get_console_script_specs(console: Dict[str, str]) -> List[str]: scripts_to_generate.append(f"pip{get_major_minor_version()} = {pip_script}") # Delete any other versioned pip entry points - pip_ep = [k for k in console if re.match(r"pip(\d(\.\d)?)?$", k)] + pip_ep = [k for k in console if re.match(r"pip(\d+(\.\d+)?)?$", k)] for k in pip_ep: del console[k] easy_install_script = console.pop("easy_install", None) @@ -340,7 +340,7 @@ def get_console_script_specs(console: Dict[str, str]) -> List[str]: ) # Delete any other versioned easy_install entry points easy_install_ep = [ - k for k in console if re.match(r"easy_install(-\d\.\d)?$", k) + k for k in console if re.match(r"easy_install(-\d+\.\d+)?$", k) ] for k in easy_install_ep: del console[k] From 87e79d2d8a2edeba5da9ffe4ff7091a088071e02 Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Sun, 4 Dec 2022 03:57:10 -0500 Subject: [PATCH 2/2] Add news fragment. --- news/5520.vendor.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/5520.vendor.rst diff --git a/news/5520.vendor.rst b/news/5520.vendor.rst new file mode 100644 index 0000000000..d8d2d450ed --- /dev/null +++ b/news/5520.vendor.rst @@ -0,0 +1 @@ +Vendor in ``pip==22.3.1`` which is currently the latest version of ``pip``.