Merge pull request #13439 from ichard26/vendoring-bumps-25.2-a

ichard26 · web-flow · commit 92b6a52839ae · 2025-06-22T12:32:37.000-04:00
Vendoring bumps for pip 25.2
diff --git a/news/CacheControl.vendor.rst b/news/CacheControl.vendor.rst
@@ -0,0 +1 @@
+Upgrade CacheControl to 0.14.3
diff --git a/news/certifi.vendor.rst b/news/certifi.vendor.rst
@@ -0,0 +1 @@
+Upgrade certifi to 2025.6.15
diff --git a/news/msgpack.vendor.rst b/news/msgpack.vendor.rst
@@ -0,0 +1 @@
+Upgrade msgpack to 1.1.1
diff --git a/news/platformdirs.vendor.rst b/news/platformdirs.vendor.rst
@@ -0,0 +1 @@
+Upgrade platformdirs to 4.3.8
diff --git a/news/pygments.vendor.rst b/news/pygments.vendor.rst
@@ -0,0 +1 @@
+Upgrade pygments to 2.19.2
diff --git a/news/requests.vendor.rst b/news/requests.vendor.rst
@@ -0,0 +1 @@
+Upgrade requests to 2.32.4
diff --git a/news/typing_extensions.vendor.rst b/news/typing_extensions.vendor.rst
@@ -0,0 +1 @@
+Upgrade typing_extensions to 4.14.0
diff --git a/src/pip/_vendor/cachecontrol/__init__.py b/src/pip/_vendor/cachecontrol/__init__.py
@@ -9,7 +9,7 @@
 
 __author__ = "Eric Larson"
 __email__ = "eric@ionrock.org"
-__version__ = "0.14.2"
+__version__ = "0.14.3"
 
 from pip._vendor.cachecontrol.adapter import CacheControlAdapter
 from pip._vendor.cachecontrol.controller import CacheController
diff --git a/src/pip/_vendor/certifi/__init__.py b/src/pip/_vendor/certifi/__init__.py
@@ -1,4 +1,4 @@
 from .core import contents, where
 
 __all__ = ["contents", "where"]
-__version__ = "2025.01.31"
+__version__ = "2025.06.15"
diff --git a/src/pip/_vendor/certifi/cacert.pem b/src/pip/_vendor/certifi/cacert.pem
diff --git a/src/pip/_vendor/certifi/core.py b/src/pip/_vendor/certifi/core.py
@@ -46,7 +46,7 @@ def where() -> str:
     def contents() -> str:
         return files("pip._vendor.certifi").joinpath("cacert.pem").read_text(encoding="ascii")
 
-elif sys.version_info >= (3, 7):
+else:
 
     from importlib.resources import path as get_path, read_text
 
@@ -81,34 +81,3 @@ def where() -> str:
 
     def contents() -> str:
         return read_text("pip._vendor.certifi", "cacert.pem", encoding="ascii")
-
-else:
-    import os
-    import types
-    from typing import Union
-
-    Package = Union[types.ModuleType, str]
-    Resource = Union[str, "os.PathLike"]
-
-    # This fallback will work for Python versions prior to 3.7 that lack the
-    # importlib.resources module but relies on the existing `where` function
-    # so won't address issues with environments like PyOxidizer that don't set
-    # __file__ on modules.
-    def read_text(
-        package: Package,
-        resource: Resource,
-        encoding: str = 'utf-8',
-        errors: str = 'strict'
-    ) -> str:
-        with open(where(), encoding=encoding) as data:
-            return data.read()
-
-    # If we don't have importlib.resources, then we will just do the old logic
-    # of assuming we're on the filesystem and munge the path directly.
-    def where() -> str:
-        f = os.path.dirname(__file__)
-
-        return os.path.join(f, "cacert.pem")
-
-    def contents() -> str:
-        return read_text("pip._vendor.certifi", "cacert.pem", encoding="ascii")
diff --git a/src/pip/_vendor/msgpack/__init__.py b/src/pip/_vendor/msgpack/__init__.py
@@ -4,8 +4,8 @@
 from .exceptions import *  # noqa: F403
 from .ext import ExtType, Timestamp
 
-version = (1, 1, 0)
-__version__ = "1.1.0"
+version = (1, 1, 1)
+__version__ = "1.1.1"
 
 
 if os.environ.get("MSGPACK_PUREPYTHON"):
diff --git a/src/pip/_vendor/platformdirs/version.py b/src/pip/_vendor/platformdirs/version.py
@@ -17,5 +17,5 @@
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '4.3.7'
-__version_tuple__ = version_tuple = (4, 3, 7)
+__version__ = version = '4.3.8'
+__version_tuple__ = version_tuple = (4, 3, 8)
diff --git a/src/pip/_vendor/pygments/__init__.py b/src/pip/_vendor/pygments/__init__.py
@@ -26,7 +26,7 @@
 """
 from io import StringIO, BytesIO
 
-__version__ = '2.19.1'
+__version__ = '2.19.2'
 __docformat__ = 'restructuredtext'
 
 __all__ = ['lex', 'format', 'highlight']
diff --git a/src/pip/_vendor/requests/__version__.py b/src/pip/_vendor/requests/__version__.py
@@ -5,8 +5,8 @@
 __title__ = "requests"
 __description__ = "Python HTTP for Humans."
 __url__ = "https://requests.readthedocs.io"
-__version__ = "2.32.3"
-__build__ = 0x023203
+__version__ = "2.32.4"
+__build__ = 0x023204
 __author__ = "Kenneth Reitz"
 __author_email__ = "me@kennethreitz.org"
 __license__ = "Apache-2.0"
diff --git a/src/pip/_vendor/requests/compat.py b/src/pip/_vendor/requests/compat.py
@@ -9,6 +9,18 @@
 
 import sys
 
+# -------
+# urllib3
+# -------
+from pip._vendor.urllib3 import __version__ as urllib3_version
+
+# Detect which major version of urllib3 is being used.
+try:
+    is_urllib3_1 = int(urllib3_version.split(".")[0]) == 1
+except (TypeError, AttributeError):
+    # If we can't discern a version, prefer old functionality.
+    is_urllib3_1 = True
+
 # -------------------
 # Character Detection
 # -------------------
diff --git a/src/pip/_vendor/requests/models.py b/src/pip/_vendor/requests/models.py
@@ -945,7 +945,9 @@ def text(self):
         return content
 
     def json(self, **kwargs):
-        r"""Returns the json-encoded content of a response, if any.
+        r"""Decodes the JSON response body (if any) as a Python object.
+
+        This may return a dictionary, list, etc. depending on what is in the response.
 
         :param \*\*kwargs: Optional arguments that ``json.loads`` takes.
         :raises requests.exceptions.JSONDecodeError: If the response body does not
diff --git a/src/pip/_vendor/requests/utils.py b/src/pip/_vendor/requests/utils.py
@@ -38,6 +38,7 @@
     getproxies,
     getproxies_environment,
     integer_types,
+    is_urllib3_1,
 )
 from .compat import parse_http_list as _parse_list_header
 from .compat import (
@@ -136,7 +137,9 @@ def super_len(o):
     total_length = None
     current_position = 0
 
-    if isinstance(o, str):
+    if not is_urllib3_1 and isinstance(o, str):
+        # urllib3 2.x+ treats all strings as utf-8 instead
+        # of latin-1 (iso-8859-1) like http.client.
         o = o.encode("utf-8")
 
     if hasattr(o, "__len__"):
@@ -216,14 +219,7 @@ def get_netrc_auth(url, raise_errors=False):
         netrc_path = None
 
         for f in netrc_locations:
-            try:
-                loc = os.path.expanduser(f)
-            except KeyError:
-                # os.path.expanduser can fail when $HOME is undefined and
-                # getpwuid fails. See https://bugs.python.org/issue20164 &
-                # https://github.com/psf/requests/issues/1846
-                return
-
+            loc = os.path.expanduser(f)
             if os.path.exists(loc):
                 netrc_path = loc
                 break
@@ -233,13 +229,7 @@ def get_netrc_auth(url, raise_errors=False):
             return
 
         ri = urlparse(url)
-
-        # Strip port numbers from netloc. This weird `if...encode`` dance is
-        # used for Python 3.2, which doesn't support unicode literals.
-        splitstr = b":"
-        if isinstance(url, str):
-            splitstr = splitstr.decode("ascii")
-        host = ri.netloc.split(splitstr)[0]
+        host = ri.hostname
 
         try:
             _netrc = netrc(netrc_path).authenticators(host)
diff --git a/src/pip/_vendor/typing_extensions.py b/src/pip/_vendor/typing_extensions.py
diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
diff --git a/tools/vendoring/patches/certifi.patch b/tools/vendoring/patches/certifi.patch
diff --git a/tools/vendoring/patches/requests.patch b/tools/vendoring/patches/requests.patch
