Update packaging patch to reflect changes from code review.

Author: freakboy3742

src/pip/_vendor/packaging/tags.py

@@ -509,30 +509,35 @@ def ios_platforms(
 
     ios_platform_template = "ios_{major}_{minor}_{multiarch}"
 
-    # Consider any major.minor version from iOS 12.0 to the version prior to the
-    # version requested by platform. 12.0 is the first iOS version that is known
-    # to have enough features to support CPython. Consider every possible minor
-    # release up to X.9. There highest the minor has ever gone is 8 (14.8 and
-    # 15.8) but having some extra candidates that won't ever match doesn't
-    # really hurt, and it saves us from having to keep an explicit list of known
-    # iOS versions in the code.
-    for major in range(12, version[0]):
-        for minor in range(0, 10):
-            yield ios_platform_template.format(
-                major=major, minor=minor, multiarch=multiarch
-            )
+    # Consider any iOS major.minor version from the version requested, down to
+    # 12.0. 12.0 is the first iOS version that is known to have enough features
+    # to support CPython. Consider every possible minor release up to X.9. There
+    # highest the minor has ever gone is 8 (14.8 and 15.8) but having some extra
+    # candidates that won't ever match doesn't really hurt, and it saves us from
+    # having to keep an explicit list of known iOS versions in the code. Return
+    # the results descending order of version number.
+
+    # If the requested major version is less than 12, there won't be any matches.
+    if version[0] < 12:
+        return
+
+    # Consider the actual X.Y version that was requested.
+    yield ios_platform_template.format(
+            major=version[0], minor=version[1], multiarch=multiarch
+        )
 
     # Consider every minor version from X.0 to the minor version prior to the
     # version requested by the platform.
-    for minor in range(0, version[1]):
+    for minor in range(version[1] - 1, -1, -1):
         yield ios_platform_template.format(
             major=version[0], minor=minor, multiarch=multiarch
         )
 
-    # Consider the actual X.Y version that was requested.
-    yield ios_platform_template.format(
-        major=version[0], minor=version[1], multiarch=multiarch
-    )
+    for major in range(version[0] - 1, 11, -1):
+        for minor in range(9, -1, -1):
+            yield ios_platform_template.format(
+                major=major, minor=minor, multiarch=multiarch
+            )
 
 
 def _linux_platforms(is_32bit: bool = _32_BIT_INTERPRETER) -> Iterator[str]:

tools/vendoring/patches/packaging.patch

@@ -1,28 +1,28 @@
 diff --git a/src/pip/_vendor/packaging/tags.py b/src/pip/_vendor/packaging/tags.py
-index 6667d2990..bcc6ea041 100644
+index 6667d2990..cb11c60b8 100644
 --- a/src/pip/_vendor/packaging/tags.py
 +++ b/src/pip/_vendor/packaging/tags.py
 @@ -25,7 +25,7 @@ from . import _manylinux, _musllinux
  logger = logging.getLogger(__name__)
-
+ 
  PythonVersion = Sequence[int]
 -MacVersion = Tuple[int, int]
 +AppleVersion = Tuple[int, int]
-
+ 
  INTERPRETER_SHORT_NAMES: dict[str, str] = {
      "python": "py",  # Generic.
 @@ -363,7 +363,7 @@ def _mac_arch(arch: str, is_32bit: bool = _32_BIT_INTERPRETER) -> str:
      return "i386"
-
-
+ 
+ 
 -def _mac_binary_formats(version: MacVersion, cpu_arch: str) -> list[str]:
 +def _mac_binary_formats(version: AppleVersion, cpu_arch: str) -> list[str]:
      formats = [cpu_arch]
      if cpu_arch == "x86_64":
          if version < (10, 4):
 @@ -396,7 +396,7 @@ def _mac_binary_formats(version: MacVersion, cpu_arch: str) -> list[str]:
-
-
+ 
+ 
  def mac_platforms(
 -    version: MacVersion | None = None, arch: str | None = None
 +    version: AppleVersion | None = None, arch: str | None = None
@@ -47,10 +47,10 @@ index 6667d2990..bcc6ea041 100644
      else:
          version = version
      if arch is None:
-@@ -483,6 +483,58 @@ def mac_platforms(
+@@ -483,6 +483,63 @@ def mac_platforms(
                  )
-
-
+ 
+ 
 +def ios_platforms(
 +    version: AppleVersion | None = None, multiarch: str | None = None
 +) -> Iterator[str]:
@@ -77,36 +77,41 @@ index 6667d2990..bcc6ea041 100644
 +
 +    ios_platform_template = "ios_{major}_{minor}_{multiarch}"
 +
-+    # Consider any major.minor version from iOS 12.0 to the version prior to the
-+    # version requested by platform. 12.0 is the first iOS version that is known
-+    # to have enough features to support CPython. Consider every possible minor
-+    # release up to X.9. There highest the minor has ever gone is 8 (14.8 and
-+    # 15.8) but having some extra candidates that won't ever match doesn't
-+    # really hurt, and it saves us from having to keep an explicit list of known
-+    # iOS versions in the code.
-+    for major in range(12, version[0]):
-+        for minor in range(0, 10):
-+            yield ios_platform_template.format(
-+                major=major, minor=minor, multiarch=multiarch
-+            )
++    # Consider any iOS major.minor version from the version requested, down to
++    # 12.0. 12.0 is the first iOS version that is known to have enough features
++    # to support CPython. Consider every possible minor release up to X.9. There
++    # highest the minor has ever gone is 8 (14.8 and 15.8) but having some extra
++    # candidates that won't ever match doesn't really hurt, and it saves us from
++    # having to keep an explicit list of known iOS versions in the code. Return
++    # the results descending order of version number.
++
++    # If the requested major version is less than 12, there won't be any matches.
++    if version[0] < 12:
++        return
++
++    # Consider the actual X.Y version that was requested.
++    yield ios_platform_template.format(
++            major=version[0], minor=version[1], multiarch=multiarch
++        )
 +
 +    # Consider every minor version from X.0 to the minor version prior to the
 +    # version requested by the platform.
-+    for minor in range(0, version[1]):
++    for minor in range(version[1] - 1, -1, -1):
 +        yield ios_platform_template.format(
 +            major=version[0], minor=minor, multiarch=multiarch
 +        )
 +
-+    # Consider the actual X.Y version that was requested.
-+    yield ios_platform_template.format(
-+        major=version[0], minor=version[1], multiarch=multiarch
-+    )
++    for major in range(version[0] - 1, 11, -1):
++        for minor in range(9, -1, -1):
++            yield ios_platform_template.format(
++                major=major, minor=minor, multiarch=multiarch
++            )
 +
 +
  def _linux_platforms(is_32bit: bool = _32_BIT_INTERPRETER) -> Iterator[str]:
      linux = _normalize_string(sysconfig.get_platform())
      if not linux.startswith("linux_"):
-@@ -512,6 +563,8 @@ def platform_tags() -> Iterator[str]:
+@@ -512,6 +569,8 @@ def platform_tags() -> Iterator[str]:
      """
      if platform.system() == "Darwin":
          return mac_platforms()