Show what the new requirementslib changes look like.

Author: matteius

pipenv/vendor/requirementslib/__init__.py

@@ -5,7 +5,7 @@
 from .models.pipfile import Pipfile
 from .models.requirements import Requirement
 
-__version__ = "2.0.1"
+__version__ = "2.0.2.dev0"
 
 
 logger = logging.getLogger(__name__)

pipenv/vendor/requirementslib/models/cache.py

@@ -3,14 +3,12 @@
 import hashlib
 import json
 import os
-import pathlib
-import sys
 
 import pipenv.vendor.vistir as vistir
-from pipenv.patched.pip._vendor.packaging.requirements import Requirement
 from pipenv.patched.pip._internal.utils.hashes import FAVORITE_HASH
 from pipenv.patched.pip._internal.vcs.versioncontrol import VcsSupport
 from pipenv.patched.pip._vendor.cachecontrol.cache import DictCache
+from pipenv.patched.pip._vendor.packaging.requirements import Requirement
 from pipenv.vendor.platformdirs import user_cache_dir
 
 from .utils import as_tuple, get_pinned_version, key_from_req, lookup_table
@@ -130,7 +128,7 @@ class HashCache(DictCache):
     def __init__(self, *args, **kwargs):
         session = kwargs.pop("session", None)
         if not session:
-            import pipenv.patched.pip._vendor.requests as requests
+            import requests
 
             session = requests.session()
             atexit.register(session.close)

pipenv/vendor/requirementslib/models/dependencies.py

@@ -1,25 +1,22 @@
-# -*- coding=utf-8 -*-
-
 import atexit
 import contextlib
 import copy
 import functools
 import os
-from contextlib import ExitStack
 from json import JSONDecodeError
 
 import pipenv.vendor.attr as attr
 import pipenv.patched.pip._vendor.requests as requests
-from pipenv.patched.pip._vendor.packaging.markers import Marker
-from pipenv.patched.pip._vendor.packaging.utils import canonicalize_name
-from pipenv.patched.pip._vendor.packaging.version import parse
 from pipenv.patched.pip._internal.cache import WheelCache
 from pipenv.patched.pip._internal.models.format_control import FormatControl
 from pipenv.patched.pip._internal.operations.build.build_tracker import get_build_tracker
 from pipenv.patched.pip._internal.req.constructors import install_req_from_line
 from pipenv.patched.pip._internal.req.req_install import InstallRequirement
 from pipenv.patched.pip._internal.req.req_set import RequirementSet
 from pipenv.patched.pip._internal.utils.temp_dir import TempDirectory, global_tempdir_manager
+from pipenv.patched.pip._vendor.packaging.markers import Marker
+from pipenv.patched.pip._vendor.packaging.utils import canonicalize_name
+from pipenv.patched.pip._vendor.packaging.version import parse
 from pipenv.vendor.vistir.compat import fs_str
 from pipenv.vendor.vistir.contextmanagers import temp_environ
 from pipenv.vendor.vistir.path import create_tracked_tempdir
@@ -35,7 +32,6 @@
 from .setup_info import SetupInfo
 from .utils import (
     clean_requires_python,
-    fix_requires_python_marker,
     format_requirement,
     full_groupby,
     is_pinned_requirement,
@@ -46,23 +42,12 @@
 )
 
 if MYPY_RUNNING:
-    from typing import (
-        Any,
-        Dict,
-        Generator,
-        List,
-        Optional,
-        Set,
-        Text,
-        Tuple,
-        TypeVar,
-        Union,
-    )
+    from typing import Any, Dict, List, Optional, Set, Text, TypeVar, Union
 
-    from pipenv.patched.pip._vendor.packaging.requirements import Requirement as PackagingRequirement
-    from pipenv.patched.pip._internal.commands.base_command import Command
+    from pipenv.patched.pip._internal.commands import Command
     from pipenv.patched.pip._internal.index.package_finder import PackageFinder
     from pipenv.patched.pip._internal.models.candidate import InstallationCandidate
+    from pipenv.patched.pip._vendor.packaging.requirements import Requirement as PackagingRequirement
 
     TRequirement = TypeVar("TRequirement")
     RequirementType = TypeVar(
@@ -95,11 +80,11 @@ def find_all_matches(finder, ireq, pre=False):
     ireq.
 
     :param finder: A package finder for discovering matching candidates.
-    :type finder: :class:`~pipenv.patched.pip._internal.index.PackageFinder`
+    :type finder: :class:`~pip._internal.index.PackageFinder`
     :param ireq: An install requirement.
-    :type ireq: :class:`~pipenv.patched.pip._internal.req.req_install.InstallRequirement`
+    :type ireq: :class:`~pip._internal.req.req_install.InstallRequirement`
     :return: A list of matching candidates.
-    :rtype: list[:class:`~pipenv.patched.pip._internal.index.InstallationCandidate`]
+    :rtype: list[:class:`~pip._internal.index.InstallationCandidate`]
     """
 
     candidates = clean_requires_python(finder.find_all_candidates(ireq.name))
@@ -207,7 +192,7 @@ def get_deps(self, candidate):
         """Get the dependencies of the supplied candidate.
 
         :param candidate: An installrequirement
-        :type candidate: :class:`~pipenv.patched.pip._internal.req.req_install.InstallRequirement`
+        :type candidate: :class:`~pip._internal.req.req_install.InstallRequirement`
         :return: A list of abstract dependencies
         :rtype: list[:class:`~requirementslib.models.dependency.AbstractDependency`]
         """
@@ -316,11 +301,11 @@ def get_dependencies(ireq, sources=None, parent=None):
     """Get all dependencies for a given install requirement.
 
     :param ireq: A single InstallRequirement
-    :type ireq: :class:`~pipenv.patched.pip._internal.req.req_install.InstallRequirement`
+    :type ireq: :class:`~pip._internal.req.req_install.InstallRequirement`
     :param sources: Pipfile-formatted sources, defaults to None
     :type sources: list[dict], optional
     :param parent: The parent of this list of dependencies, defaults to None
-    :type parent: :class:`~pipenv.patched.pip._internal.req.req_install.InstallRequirement`
+    :type parent: :class:`~pip._internal.req.req_install.InstallRequirement`
     :return: A set of dependency lines for generating new InstallRequirements.
     :rtype: set(str)
     """
@@ -350,7 +335,7 @@ def get_dependencies_from_wheel_cache(ireq):
     cache.
 
     :param ireq: A single InstallRequirement
-    :type ireq: :class:`~pipenv.patched.pip._internal.req.req_install.InstallRequirement`
+    :type ireq: :class:`~pip._internal.req.req_install.InstallRequirement`
     :return: A set of dependency lines for generating new InstallRequirements.
     :rtype: set(str) or None
     """
@@ -377,7 +362,7 @@ def get_dependencies_from_json(ireq):
     api.
 
     :param ireq: A single InstallRequirement
-    :type ireq: :class:`~pipenv.patched.pip._internal.req.req_install.InstallRequirement`
+    :type ireq: :class:`~pip._internal.req.req_install.InstallRequirement`
     :return: A set of dependency lines for generating new InstallRequirements.
     :rtype: set(str) or None
     """
@@ -427,7 +412,7 @@ def get_dependencies_from_cache(ireq):
     dependency cache.
 
     :param ireq: A single InstallRequirement
-    :type ireq: :class:`~pipenv.patched.pip._internal.req.req_install.InstallRequirement`
+    :type ireq: :class:`~pip._internal.req.req_install.InstallRequirement`
     :return: A set of dependency lines for generating new InstallRequirements.
     :rtype: set(str) or None
     """
@@ -531,7 +516,7 @@ def get_dependencies_from_index(dep, sources=None, pip_options=None, wheel_cache
     resolver.
 
     :param dep: A single InstallRequirement
-    :type dep: :class:`~pipenv.patched.pip._internal.req.req_install.InstallRequirement`
+    :type dep: :class:`~pip._internal.req.req_install.InstallRequirement`
     :param sources: Pipfile-formatted sources, defaults to None
     :type sources: list[dict], optional
     :return: A set of dependency lines for generating new InstallRequirements.
@@ -570,9 +555,9 @@ def get_pip_options(args=None, sources=None, pip_command=None):
     :param sources: A list of pipfile-formatted sources, defaults to None
     :param sources: list[dict], optional
     :param pip_command: A pre-built pip command instance
-    :type pip_command: :class:`~pipenv.patched.pip._internal.cli.base_command.Command`
+    :type pip_command: :class:`~pip._internal.cli.base_command.Command`
     :return: An instance of pip_options using the supplied arguments plus sane defaults
-    :rtype: :class:`~pipenv.patched.pip._internal.cli.cmdoptions`
+    :rtype: :class:`~pip._internal.cli.cmdoptions`
     """
 
     if not pip_command:
@@ -594,11 +579,11 @@ def get_finder(sources=None, pip_command=None, pip_options=None):
     :param sources: A list of pipfile-formatted sources, defaults to None
     :param sources: list[dict], optional
     :param pip_command: A pip command instance, defaults to None
-    :type pip_command: :class:`~pipenv.patched.pip._internal.cli.base_command.Command`
+    :type pip_command: :class:`~pip._internal.cli.base_command.Command`
     :param pip_options: A pip options, defaults to None
-    :type pip_options: :class:`~pipenv.patched.pip._internal.cli.cmdoptions`
+    :type pip_options: :class:`~pip._internal.cli.cmdoptions`
     :return: A package finder
-    :rtype: :class:`~pipenv.patched.pip._internal.index.PackageFinder`
+    :rtype: :class:`~pip._internal.index.PackageFinder`
     """
 
     if not pip_command:
@@ -618,12 +603,12 @@ def start_resolver(finder=None, session=None, wheel_cache=None):
     """Context manager to produce a resolver.
 
     :param finder: A package finder to use for searching the index
-    :type finder: :class:`~pipenv.patched.pip._internal.index.PackageFinder`
+    :type finder: :class:`~pip._internal.index.PackageFinder`
     :param :class:`~requests.Session` session: A session instance
-    :param :class:`~pipenv.patched.pip._internal.cache.WheelCache` wheel_cache: A pip WheelCache instance
+    :param :class:`~pip._internal.cache.WheelCache` wheel_cache: A pip WheelCache instance
     :return: A 3-tuple of finder, preparer, resolver
-    :rtype: (:class:`~pipenv.patched.pip._internal.operations.prepare.RequirementPreparer`,
-             :class:`~pipenv.patched.pip._internal.resolve.Resolver`)
+    :rtype: (:class:`~pip._internal.operations.prepare.RequirementPreparer`,
+             :class:`~pip._internal.resolve.Resolver`)
     """
 
     pip_command = get_pip_command()

pipenv/vendor/requirementslib/models/markers.py

@@ -1,12 +1,11 @@
-# -*- coding: utf-8 -*-
 import itertools
 import operator
 import re
 from collections.abc import Mapping, Set
 from functools import lru_cache, reduce
 
 import pipenv.vendor.attr as attr
-import distlib.markers
+from pipenv.vendor.distlib import markers
 from pipenv.patched.pip._vendor.packaging.markers import InvalidMarker, Marker
 from pipenv.patched.pip._vendor.packaging.specifiers import LegacySpecifier, Specifier, SpecifierSet
 from pipenv.patched.pip._vendor.packaging.version import parse
@@ -514,7 +513,7 @@ def get_contained_pyversions(marker):
         return set()
     # Use the distlib dictionary parser to create a dictionary 'trie' which is a bit
     # easier to reason about
-    marker_dict = distlib.markers.parse_marker(marker_str)[0]
+    marker_dict = markers.parse_marker(marker_str)[0]
     version_set = set()
     pyversions, _ = parse_marker_dict(marker_dict)
     if isinstance(pyversions, set):

pipenv/vendor/requirementslib/models/metadata.py

@@ -1,4 +1,3 @@
-# -*- coding=utf-8 -*-
 import datetime
 import functools
 import io
@@ -12,10 +11,10 @@
 from typing import Sequence
 
 import pipenv.vendor.attr as attr
-import distlib.metadata
-import distlib.wheel
 import pipenv.patched.pip._vendor.requests as requests
 import pipenv.vendor.vistir as vistir
+from pipenv.vendor.distlib import wheel
+from pipenv.vendor.distlib.metadata import Metadata
 from pipenv.patched.pip._vendor.packaging.markers import Marker
 from pipenv.patched.pip._vendor.packaging.requirements import Requirement as PackagingRequirement
 from pipenv.patched.pip._vendor.packaging.specifiers import Specifier, SpecifierSet
@@ -47,7 +46,6 @@
         Any,
         Callable,
         Dict,
-        Generator,
         Generic,
         Iterator,
         List,
@@ -59,7 +57,7 @@
         Union,
     )
 
-    from pipenv.vendor.attr import Attribute  # noqa
+    from attr import Attribute  # noqa
 
     from .setup_info import SetupInfo
 
@@ -137,7 +135,7 @@ def validate_digest(inst, attrib, value):
 
 
 def get_local_wheel_metadata(wheel_file):
-    # type: (str) -> Optional[distlib.metadata.Metadata]
+    # type: (str) -> Optional[Metadata]
     parsed_metadata = None
     with io.open(wheel_file, "rb") as fh:
         with zipfile.ZipFile(fh, mode="r", compression=zipfile.ZIP_DEFLATED) as zf:
@@ -149,7 +147,7 @@ def get_local_wheel_metadata(wheel_file):
             if metadata is None:
                 raise RuntimeError("No metadata found in wheel: {0}".format(wheel_file))
             with zf.open(metadata, "r") as metadata_fh:
-                parsed_metadata = distlib.metadata.Metadata(fileobj=metadata_fh)
+                parsed_metadata = Metadata(fileobj=metadata_fh)
     return parsed_metadata
 
 
@@ -165,7 +163,7 @@ def get_remote_sdist_metadata(line):
 
 
 def get_remote_wheel_metadata(whl_file):
-    # type: (str) -> Optional[distlib.metadata.Metadata]
+    # type: (str) -> Optional[Metadata]
     parsed_metadata = None
     data = io.BytesIO()
     with vistir.contextmanagers.open_file(whl_file) as fp:
@@ -180,7 +178,7 @@ def get_remote_wheel_metadata(whl_file):
         if metadata is None:
             raise RuntimeError("No metadata found in wheel: {0}".format(whl_file))
         with zf.open(metadata, "r") as metadata_fh:
-            parsed_metadata = distlib.metadata.Metadata(fileobj=metadata_fh)
+            parsed_metadata = Metadata(fileobj=metadata_fh)
     return parsed_metadata
 
 
@@ -258,11 +256,11 @@ def as_line(self):
                 markers = [marker_from_specifier(str(s)) for s in specifiers]
             py_version_part = reduce(merge_markers, markers)
         if self.markers:
-            line_str = "{0}; {1}".format(line_str, str(self.markers))
+            line_str = "{0} ; {1}".format(line_str, str(self.markers))
             if py_version_part:
                 line_str = "{0} and {1}".format(line_str, py_version_part)
         elif py_version_part and not self.markers:
-            line_str = "{0}; {1}".format(line_str, py_version_part)
+            line_str = "{0} ; {1}".format(line_str, py_version_part)
         return line_str
 
     def pin(self):
@@ -350,7 +348,7 @@ def from_info(cls, info):
                     marker_str = "{0!s}".format(marker)
         req_str = "{0}=={1}".format(info.name, info.version)
         if marker_str:
-            req_str = "{0}; {1}".format(req_str, marker_str)
+            req_str = "{0} ; {1}".format(req_str, marker_str)
         req = PackagingRequirement(req_str)
         requires_python_str = (
             info.requires_python if info.requires_python is not None else ""
@@ -570,7 +568,7 @@ def pep508_url(self):
         markers = self.markers
         req_str = "{0} @ {1}#egg={0}".format(self.name, self.url)
         if markers:
-            req_str = "{0}; {1}".format(req_str, markers)
+            req_str = "{0} ; {1}".format(req_str, markers)
         return req_str
 
     def get_markers_from_wheel(self):
@@ -644,7 +642,7 @@ def create(cls, release_dict, name=None):
         release_url = cls(**filter_dict(creation_kwargs))  # type: ignore
         if release_url.is_wheel:
             supported_tags = [
-                parse_tag(Tag(*tag)) for tag in distlib.wheel.Wheel(release_url.url).tags
+                parse_tag(Tag(*tag)) for tag in wheel.Wheel(release_url.url).tags
             ]
             release_url = attr.evolve(release_url, tags=supported_tags)
         return release_url
@@ -858,8 +856,8 @@ def get_latest_lockfile(self):
     def wheels(self):
         # type: () -> Iterator[ReleaseUrl]
         for release in self.sort_releases():
-            for wheel in release.wheels:
-                yield wheel
+            for w in release.wheels:
+                yield w
 
     def sdists(self):
         # type: () -> Iterator[ReleaseUrl]
@@ -1060,8 +1058,8 @@ def latest_sdist(self):
     @property
     def latest_wheels(self):
         # type: () -> Iterator[ReleaseUrl]
-        for wheel in self.urls.wheels:
-            yield wheel
+        for w in self.urls.wheels:
+            yield w
 
     @property
     def dependencies(self):

pipenv/vendor/requirementslib/models/project.py

@@ -135,7 +135,7 @@ def contains_key_in_pipfile(self, key):
         )
 
     def add_line_to_pipfile(self, line, develop):
-        from pipenv.vendor.requirementslib import Requirement
+        from requirementslib import Requirement
 
         requirement = Requirement.from_line(line)
         section = self._get_pipfile_section(develop=develop)