Merge pull request #9170 from pradyunsg/vendoring/nov-2020-again

Author: pradyunsg

news/9011.bugfix.rst

@@ -0,0 +1 @@
+New Resolver: Rework backtracking and state management, to avoid getting stuck in an infinite loop.

news/9077.feature.rst

@@ -0,0 +1 @@
+Add support for :pep:`600`: Future 'manylinux' Platform Tags for Portable Linux Built Distributions.

news/9138.feature.rst

@@ -0,0 +1 @@
+Add support for MacOS Big Sur compatibility tags.

news/packaging.vendor.rst

@@ -0,0 +1 @@
+Upgrade packaging to 20.7

news/resolvelib.vendor.rst

@@ -1 +1 @@
-Upgrade resolvelib to 0.5.2
+Upgrade resolvelib to 0.5.3

noxfile.py

@@ -168,6 +168,9 @@ def pinned_requirements(path):
 
     vendor_txt = Path("src/pip/_vendor/vendor.txt")
     for name, old_version in pinned_requirements(vendor_txt):
+        if name == "setuptools":
+            continue
+
         # update requirements.txt
         session.run("vendoring", "update", ".", name)
 

src/pip/_vendor/packaging/__about__.py

@@ -1,26 +1,5 @@
 # This file is dual licensed under the terms of the Apache License, Version
 # 2.0, and the BSD License. See the LICENSE file in the root of this repository
 # for complete details.
-from __future__ import absolute_import, division, print_function
-
-from .__about__ import (
-    __author__,
-    __copyright__,
-    __email__,
-    __license__,
-    __summary__,
-    __title__,
-    __uri__,
-    __version__,
-)
-
-__all__ = [
-    "__title__",
-    "__summary__",
-    "__uri__",
-    "__version__",
-    "__author__",
-    "__email__",
-    "__license__",
-    "__copyright__",
-]
+"""Core utilities for Python packages"""
+__version__ = "20.7"

src/pip/_vendor/packaging/__init__.py

@@ -5,16 +5,22 @@
 
 import string
 import re
+import sys
 
 from pip._vendor.pyparsing import stringStart, stringEnd, originalTextFor, ParseException
 from pip._vendor.pyparsing import ZeroOrMore, Word, Optional, Regex, Combine
 from pip._vendor.pyparsing import Literal as L  # noqa
-from pip._vendor.six.moves.urllib import parse as urlparse
 
 from ._typing import TYPE_CHECKING
 from .markers import MARKER_EXPR, Marker
 from .specifiers import LegacySpecifier, Specifier, SpecifierSet
 
+if sys.version_info[0] >= 3:
+    from urllib import parse as urlparse  # pragma: no cover
+else:  # pragma: no cover
+    import urlparse
+
+
 if TYPE_CHECKING:  # pragma: no cover
     from typing import List
 

src/pip/_vendor/packaging/requirements.py

@@ -7,24 +7,15 @@
 import functools
 import itertools
 import re
+import warnings
 
 from ._compat import string_types, with_metaclass
 from ._typing import TYPE_CHECKING
 from .utils import canonicalize_version
 from .version import Version, LegacyVersion, parse
 
 if TYPE_CHECKING:  # pragma: no cover
-    from typing import (
-        List,
-        Dict,
-        Union,
-        Iterable,
-        Iterator,
-        Optional,
-        Callable,
-        Tuple,
-        FrozenSet,
-    )
+    from typing import List, Dict, Union, Iterable, Iterator, Optional, Callable, Tuple
 
     ParsedVersion = Union[Version, LegacyVersion]
     UnparsedVersion = Union[Version, LegacyVersion, str]
@@ -285,6 +276,16 @@ class LegacySpecifier(_IndividualSpecifier):
         ">": "greater_than",
     }
 
+    def __init__(self, spec="", prereleases=None):
+        # type: (str, Optional[bool]) -> None
+        super(LegacySpecifier, self).__init__(spec, prereleases)
+
+        warnings.warn(
+            "Creating a LegacyVersion has been deprecated and will be "
+            "removed in the next major release",
+            DeprecationWarning,
+        )
+
     def _coerce_version(self, version):
         # type: (Union[ParsedVersion, str]) -> LegacyVersion
         if not isinstance(version, LegacyVersion):
@@ -317,7 +318,7 @@ def _compare_greater_than(self, prospective, spec):
 
 
 def _require_version_compare(
-    fn  # type: (Callable[[Specifier, ParsedVersion, str], bool])
+    fn,  # type: (Callable[[Specifier, ParsedVersion, str], bool])
 ):
     # type: (...) -> Callable[[Specifier, ParsedVersion, str], bool]
     @functools.wraps(fn)
@@ -750,7 +751,7 @@ def __len__(self):
         return len(self._specs)
 
     def __iter__(self):
-        # type: () -> Iterator[FrozenSet[_IndividualSpecifier]]
+        # type: () -> Iterator[_IndividualSpecifier]
         return iter(self._specs)
 
     @property