Merge pull request #12670 from pradyunsg/vendoring-upgrade

Upgrade various vendored dependencies

Author: pradyunsg

news/CacheControl.vendor.rst

@@ -0,0 +1 @@
+Upgrade CacheControl to 0.14.0

news/idna.vendor.rst

@@ -1 +1 @@
-Upgrade idna to 3.6
+Upgrade idna to 3.7

news/platformdirs.vendor.rst

@@ -1 +1 @@
-Upgrade platformdirs to 4.2.0
+Upgrade platformdirs to 4.2.1

news/pyparsing.vendor.rst

@@ -0,0 +1 @@
+Upgrade pyparsing to 3.1.2

news/rich.vendor.rst

@@ -1 +1 @@
-Upgrade rich to 13.7.0
+Upgrade rich to 13.7.1

news/setuptools.vendor.rst

@@ -1 +1 @@
-Upgrade setuptools to 69.1.1
+Upgrade setuptools to 69.5.1

news/typing_extensions.vendor.rst

@@ -1 +1 @@
-Upgrade typing_extensions to 4.9.0
+Upgrade typing_extensions to 4.11.0

pyproject.toml

@@ -144,7 +144,6 @@ distro = []
 setuptools = "pkg_resources"
 
 [tool.vendoring.license.fallback-urls]
-CacheControl = "https://raw.githubusercontent.com/ionrock/cachecontrol/v0.12.6/LICENSE.txt"
 distlib = "https://bitbucket.org/pypa/distlib/raw/master/LICENSE.txt"
 webencodings = "https://github.com/SimonSapin/python-webencodings/raw/master/LICENSE"
 

src/pip/_vendor/cachecontrol/__init__.py

@@ -8,7 +8,7 @@
 """
 __author__ = "Eric Larson"
 __email__ = "[email protected]"
-__version__ = "0.13.1"
+__version__ = "0.14.0"
 
 from pip._vendor.cachecontrol.adapter import CacheControlAdapter
 from pip._vendor.cachecontrol.controller import CacheController

src/pip/_vendor/cachecontrol/adapter.py

@@ -125,21 +125,21 @@ def build_response(
             else:
                 # Wrap the response file with a wrapper that will cache the
                 #   response when the stream has been consumed.
-                response._fp = CallbackFileWrapper(  # type: ignore[attr-defined]
-                    response._fp,  # type: ignore[attr-defined]
+                response._fp = CallbackFileWrapper(  # type: ignore[assignment]
+                    response._fp,  # type: ignore[arg-type]
                     functools.partial(
                         self.controller.cache_response, request, response
                     ),
                 )
                 if response.chunked:
-                    super_update_chunk_length = response._update_chunk_length  # type: ignore[attr-defined]
+                    super_update_chunk_length = response._update_chunk_length
 
                     def _update_chunk_length(self: HTTPResponse) -> None:
                         super_update_chunk_length()
                         if self.chunk_left == 0:
-                            self._fp._close()  # type: ignore[attr-defined]
+                            self._fp._close()  # type: ignore[union-attr]
 
-                    response._update_chunk_length = types.MethodType(  # type: ignore[attr-defined]
+                    response._update_chunk_length = types.MethodType(  # type: ignore[method-assign]
                         _update_chunk_length, response
                     )