5132 Vendor in latest requirementslib. (#5151)

* 5132 Vendor in latest requirementslib.

news/5132.vendor.rst

@@ -0,0 +1 @@
+Vendor in the latest version of ``requirementslib==1.6.5`` which includes bug fixes for beta python versions, projects with an at sign (@) in the path, and a ``setuptools`` deprecation warning.

pipenv/vendor/requirementslib/__init__.py

@@ -10,7 +10,7 @@ from .models.lockfile import Lockfile
 from .models.pipfile import Pipfile
 from .models.requirements import Requirement
 
-__version__ = "1.6.4"
+__version__ = "1.6.5"
 
 
 logger = logging.getLogger(__name__)

pipenv/vendor/requirementslib/models/markers.py

@@ -9,7 +9,7 @@ import pipenv.vendor.attr as attr
 import distlib.markers
 import packaging.version
 from pipenv.vendor.packaging.markers import InvalidMarker, Marker
-from pipenv.vendor.packaging.specifiers import Specifier, SpecifierSet
+from pipenv.vendor.packaging.specifiers import LegacySpecifier, Specifier, SpecifierSet
 from pipenv.vendor.vistir.misc import dedup
 
 from ..environment import MYPY_RUNNING
@@ -21,7 +21,6 @@ if MYPY_RUNNING:
 
     STRING_TYPE = Union[str, bytes, Text]
 
-
 MAX_VERSIONS = {1: 7, 2: 7, 3: 11, 4: 0}
 DEPRECATED_VERSIONS = ["3.0", "3.1", "3.2", "3.3"]
 
@@ -120,8 +119,17 @@ class PipenvMarkers(object):
 
 @lru_cache(maxsize=1024)
 def _tuplize_version(version):
-    # type: (STRING_TYPE) -> Tuple[int, ...]
-    return tuple(int(x) for x in filter(lambda i: i != "*", version.split(".")))
+    # type: (STRING_TYPE) -> Union[Tuple[()], Tuple[int, ...], Tuple[int, int, str]]
+    output = []
+    for idx, part in enumerate(version.split(".")):
+        if part == "*":
+            break
+        if idx in (0, 1):
+            # Only convert the major and minor identifiers into integers (if present),
+            # the patch identifier can include strings like 'b' marking a beta: ex 3.11.0b1
+            part = int(part)
+        output.append(part)
+    return tuple(output)
 
 
 @lru_cache(maxsize=1024)
@@ -140,15 +148,19 @@ REPLACE_RANGES = {">": ">=", "<=": "<"}
 def _format_pyspec(specifier):
     # type: (Union[STRING_TYPE, Specifier]) -> Specifier
     if isinstance(specifier, str):
-        if not any(op in specifier for op in Specifier._operators.keys()):
+        if not specifier.startswith(tuple(Specifier._operators.keys())):
             specifier = "=={0}".format(specifier)
         specifier = Specifier(specifier)
     version = getattr(specifier, "version", specifier).rstrip()
-    if version and version.endswith("*"):
-        if version.endswith(".*"):
-            version = version[:-2]
-        version = version.rstrip("*")
-        specifier = Specifier("{0}{1}".format(specifier.operator, version))
+    if version:
+        if version.startswith("*"):
+            # don't parse invalid identifiers
+            return specifier
+        if version.endswith("*"):
+            if version.endswith(".*"):
+                version = version[:-2]
+            version = version.rstrip("*")
+            specifier = Specifier("{0}{1}".format(specifier.operator, version))
     try:
         op = REPLACE_RANGES[specifier.operator]
     except KeyError:
@@ -172,7 +184,7 @@ def _format_pyspec(specifier):
 def _get_specs(specset):
     if specset is None:
         return
-    if is_instance(specset, Specifier):
+    if is_instance(specset, Specifier) or is_instance(specset, LegacySpecifier):
         new_specset = SpecifierSet()
         specs = set()
         specs.add(specset)

pipenv/vendor/requirementslib/models/utils.py

@@ -567,7 +567,7 @@ def split_ref_from_uri(uri):
     path = parsed.path if parsed.path else ""
     scheme = parsed.scheme if parsed.scheme else ""
     ref = None
-    if scheme != "file" and "@" in path:
+    if scheme != "file" and (re.match("^.*@[^/@]*$", path) or path.count("@") >= 2):
         path, _, ref = path.rpartition("@")
     parsed = parsed._replace(path=path)
     return (parsed.url, ref)

pipenv/vendor/vendor.txt

@@ -28,7 +28,7 @@ pyparsing==3.0.7
 python-dateutil==2.8.2
 python-dotenv==0.19.0
 pythonfinder==1.2.10
-requirementslib==1.6.4
+requirementslib==1.6.5
 shellingham==1.4.0
 six==1.16.0
 termcolor==1.1.0