use existing function convert_deps_to_pip, added 2 params to convert_…

.github/workflows/ci.yaml

@@ -1,4 +1,10 @@
 name: CI
+concurrency:
+  group: >-
+    ${{ github.workflow }}-
+    ${{ github.ref_type }}-
+    ${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
 on:
   push:
     paths-ignore:

news/5070.bugfix.rst

@@ -0,0 +1 @@
+Fixes issue of ``requirements`` command problem by modifying to print ``-e`` and path of the editable package.

news/5076.bugfix.rst

@@ -0,0 +1 @@
+Fixes issue of ``requirements`` command where git requirements cause the command to fail, solved by using existing convert_deps_to_pip function.

news/5078.removal.rst

@@ -0,0 +1 @@
+Remove more usage of misc functions of vistir. Many of this function are availabel in the STL or in another dependency of pipenv.

news/5081.vendor.rst

@@ -0,0 +1 @@
+Vendor in ``requirementslib==1.6.4`` to Fix ``SetuptoolsDeprecationWarning`` ``setuptools.config.read_configuration`` became deprecated.

pipenv/cli/command.py

@@ -26,6 +26,7 @@
 from pipenv.exceptions import PipenvOptionsError
 from pipenv.patched import crayons
 from pipenv.utils.processes import subprocess_run
+from pipenv.utils.dependencies import convert_deps_to_pip
 from pipenv.vendor.click import (
     Choice,
     argument,
@@ -760,20 +761,17 @@ def requirements(state, dev=False, dev_only=False, hash=False):
     for i, package_index in enumerate(lockfile["_meta"]["sources"]):
         prefix = "-i" if i == 0 else "--extra-index-url"
         echo(crayons.normal(" ".join([prefix, package_index["url"]])))
+
+    deps = {}
     if not dev_only:
-        for req_name, value in lockfile["default"].items():
-            if hash:
-                hashes = [f" \\\n    --hash={h}" for h in value.get("hashes", [])]
-            else:
-                hashes = []
-            echo(crayons.normal("".join([req_name, value["version"], *hashes])))
+        deps.update(lockfile['default'])
     if dev or dev_only:
-        for req_name, value in lockfile["develop"].items():
-            if hash:
-                hashes = [f" \\\n    --hash={h}" for h in value.get("hashes", [])]
-            else:
-                hashes = []
-            echo(crayons.normal("".join([req_name, value["version"], *hashes])))
+        deps.update(lockfile['develop'])
+
+    pip_deps = convert_deps_to_pip(deps, r=False, include_index=False, with_hashes=hash, with_markers=False)
+    for pip_dep in pip_deps:
+        echo(crayons.normal(pip_dep))
+
     sys.exit(0)
 
 

pipenv/core.py

@@ -3,6 +3,7 @@
 import os
 import shutil
 import sys
+import tempfile
 import time
 import warnings
 from pathlib import Path
@@ -1394,7 +1395,7 @@ def get_pip_args(
             arg_set.extend(arg_map.get(key))
         elif key == "selective_upgrade" and not locals().get(key):
             arg_set.append("--exists-action=i")
-    return list(vistir.misc.dedup(arg_set))
+    return list(dict.fromkeys(arg_set))
 
 
 def get_requirement_line(
@@ -1440,7 +1441,7 @@ def write_requirement_to_file(
         with_prefix=True, with_hashes=include_hashes, with_markers=True, as_list=False
     )
 
-    f = vistir.compat.NamedTemporaryFile(
+    f = tempfile.NamedTemporaryFile(
         prefix="pipenv-", suffix="-requirement.txt", dir=requirements_dir, delete=False
     )
     if project.s.is_verbose():
@@ -1844,11 +1845,11 @@ def do_py(project, ctx=None, system=False):
 def do_outdated(project, pypi_mirror=None, pre=False, clear=False):
     # TODO: Allow --skip-lock here?
     from collections import namedtuple
+    from collections.abc import Mapping
 
     from .vendor.packaging.utils import canonicalize_name
     from .vendor.requirementslib.models.requirements import Requirement
     from .vendor.requirementslib.models.utils import get_version
-    from .vendor.vistir.compat import Mapping
 
     packages = {}
     package_info = namedtuple("PackageInfo", ["name", "installed", "available"])

pipenv/environment.py

@@ -16,7 +16,7 @@
 from pipenv.utils.indexes import prepare_pip_source_args
 from pipenv.utils.processes import subprocess_run
 from pipenv.utils.shell import make_posix, normalize_path
-from pipenv.vendor import vistir
+from pipenv.vendor import click, vistir
 from pipenv.vendor.cached_property import cached_property
 from pipenv.vendor.packaging.utils import canonicalize_name
 
@@ -410,8 +410,8 @@ def get_paths(self):
                     paths[key] = make_posix(paths[key])
             return paths
         else:
-            vistir.misc.echo(f"Failed to load paths: {c.stderr}", fg="yellow")
-            vistir.misc.echo(f"Output: {c.stdout}", fg="yellow")
+            click.echo(f"Failed to load paths: {c.stderr}", fg="yellow")
+            click.echo(f"Output: {c.stdout}", fg="yellow")
         return None
 
     def get_lib_paths(self):
@@ -439,8 +439,8 @@ def get_lib_paths(self):
                     paths[key] = make_posix(paths[key])
             return paths
         else:
-            vistir.misc.echo(f"Failed to load paths: {c.stderr}", fg="yellow")
-            vistir.misc.echo(f"Output: {c.stdout}", fg="yellow")
+            click.secho(f"Failed to load paths: {c.stderr}", fg="yellow")
+            click.secho(f"Output: {c.stdout}", fg="yellow")
         if not paths:
             if not self.prefix.joinpath("lib").exists():
                 return {}
@@ -499,8 +499,8 @@ def get_include_path(self):
                     paths[key] = make_posix(paths[key])
             return paths
         else:
-            vistir.misc.echo(f"Failed to load paths: {c.stderr}", fg="yellow")
-            vistir.misc.echo(f"Output: {c.stdout}", fg="yellow")
+            click.secho(f"Failed to load paths: {c.stderr}", fg="yellow")
+            click.secho(f"Output: {c.stdout}", fg="yellow")
         return None
 
     @cached_property