Merge pull request #11916 from pfmoore/vendoring-updates

Vendoring updates for 23.1
pypa · Apr 3, 2023 · 81f6a9f · 81f6a9f
2 parents 84d3591 + c0ba818
commit 81f6a9f
Show file tree

Hide file tree

Showing 73 changed files with 1,481 additions and 752 deletions.
diff --git a/news/msgpack.vendor.rst b/news/msgpack.vendor.rst
@@ -0,0 +1 @@
+Upgrade msgpack to 1.0.5
diff --git a/news/platformdirs.vendor.rst b/news/platformdirs.vendor.rst
@@ -0,0 +1 @@
+Upgrade platformdirs to 3.2.0
diff --git a/news/pygments.vendor.rst b/news/pygments.vendor.rst
@@ -0,0 +1 @@
+Upgrade pygments to 2.14.0
diff --git a/news/rich.vendor.rst b/news/rich.vendor.rst
@@ -0,0 +1 @@
+Upgrade rich to 13.3.3
diff --git a/news/setuptools.vendor.rst b/news/setuptools.vendor.rst
@@ -1 +1 @@
-Update pkg_resources (via setuptools) to 65.6.3
+Upgrade setuptools to 67.6.1
diff --git a/news/tenacity.vendor.rst b/news/tenacity.vendor.rst
@@ -0,0 +1 @@
+Upgrade tenacity to 8.2.2
diff --git a/news/typing_extensions.vendor.rst b/news/typing_extensions.vendor.rst
@@ -0,0 +1 @@
+Upgrade typing_extensions to 4.5.0
diff --git a/news/urllib3.vendor.rst b/news/urllib3.vendor.rst
@@ -0,0 +1 @@
+Upgrade urllib3 to 1.26.15
diff --git a/src/pip/_vendor/msgpack/__init__.py b/src/pip/_vendor/msgpack/__init__.py
@@ -6,8 +6,8 @@
 import sys
 
 
-version = (1, 0, 4)
-__version__ = "1.0.4"
+version = (1, 0, 5)
+__version__ = "1.0.5"
 
 
 if os.environ.get("MSGPACK_PUREPYTHON") or sys.version_info[0] == 2:

diff --git a/src/pip/_vendor/msgpack/ext.py b/src/pip/_vendor/msgpack/ext.py
@@ -56,7 +56,7 @@ def __init__(self, seconds, nanoseconds=0):
         Note: Negative times (before the UNIX epoch) are represented as negative seconds + positive ns.
         """
         if not isinstance(seconds, int_types):
-            raise TypeError("seconds must be an interger")
+            raise TypeError("seconds must be an integer")
         if not isinstance(nanoseconds, int_types):
             raise TypeError("nanoseconds must be an integer")
         if not (0 <= nanoseconds < 10**9):

diff --git a/src/pip/_vendor/msgpack/fallback.py b/src/pip/_vendor/msgpack/fallback.py
@@ -814,7 +814,7 @@ def _pack(
                 self._pack_raw_header(n)
                 return self._buffer.write(obj)
             if check(obj, memoryview):
-                n = len(obj) * obj.itemsize
+                n = obj.nbytes
                 if n >= 2**32:
                     raise ValueError("Memoryview is too large")
                 self._pack_bin_header(n)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Update pkg_resources (via setuptools) to 65.6.3
		Upgrade setuptools to 67.6.1