Add back updated patches that are relvant

Author: matteius

tasks/vendoring/patches/patched/import_scope.patch

@@ -0,0 +1,143 @@
+diff --git a/pipenv/patched/pip/_internal/commands/__init__.py b/pipenv/patched/pip/_internal/commands/__init__.py
+index bc4f216a8..156846015 100644
+--- a/pipenv/patched/pip/_internal/commands/__init__.py
++++ b/pipenv/patched/pip/_internal/commands/__init__.py
+@@ -14,97 +14,97 @@ CommandInfo = namedtuple("CommandInfo", "module_path, class_name, summary")
+ # - Enables avoiding additional (costly) imports for presenting `--help`.
+ # - The ordering matters for help display.
+ #
+-# Even though the module path starts with the same "pip._internal.commands"
++# Even though the module path starts with the same "pipenv.patched.pip_internal.commands"
+ # prefix, the full path makes testing easier (specifically when modifying
+ # `commands_dict` in test setup / teardown).
+ commands_dict: Dict[str, CommandInfo] = {
+     "install": CommandInfo(
+-        "pip._internal.commands.install",
++        "pipenv.patched.pip_internal.commands.install",
+         "InstallCommand",
+         "Install packages.",
+     ),
+     "lock": CommandInfo(
+-        "pip._internal.commands.lock",
++        "pipenv.patched.pip_internal.commands.lock",
+         "LockCommand",
+         "Generate a lock file.",
+     ),
+     "download": CommandInfo(
+-        "pip._internal.commands.download",
++        "pipenv.patched.pip_internal.commands.download",
+         "DownloadCommand",
+         "Download packages.",
+     ),
+     "uninstall": CommandInfo(
+-        "pip._internal.commands.uninstall",
++        "pipenv.patched.pip_internal.commands.uninstall",
+         "UninstallCommand",
+         "Uninstall packages.",
+     ),
+     "freeze": CommandInfo(
+-        "pip._internal.commands.freeze",
++        "pipenv.patched.pip_internal.commands.freeze",
+         "FreezeCommand",
+         "Output installed packages in requirements format.",
+     ),
+     "inspect": CommandInfo(
+-        "pip._internal.commands.inspect",
++        "pipenv.patched.pip_internal.commands.inspect",
+         "InspectCommand",
+         "Inspect the python environment.",
+     ),
+     "list": CommandInfo(
+-        "pip._internal.commands.list",
++        "pipenv.patched.pip_internal.commands.list",
+         "ListCommand",
+         "List installed packages.",
+     ),
+     "show": CommandInfo(
+-        "pip._internal.commands.show",
++        "pipenv.patched.pip_internal.commands.show",
+         "ShowCommand",
+         "Show information about installed packages.",
+     ),
+     "check": CommandInfo(
+-        "pip._internal.commands.check",
++        "pipenv.patched.pip_internal.commands.check",
+         "CheckCommand",
+         "Verify installed packages have compatible dependencies.",
+     ),
+     "config": CommandInfo(
+-        "pip._internal.commands.configuration",
++        "pipenv.patched.pip_internal.commands.configuration",
+         "ConfigurationCommand",
+         "Manage local and global configuration.",
+     ),
+     "search": CommandInfo(
+-        "pip._internal.commands.search",
++        "pipenv.patched.pip_internal.commands.search",
+         "SearchCommand",
+         "Search PyPI for packages.",
+     ),
+     "cache": CommandInfo(
+-        "pip._internal.commands.cache",
++        "pipenv.patched.pip_internal.commands.cache",
+         "CacheCommand",
+         "Inspect and manage pip's wheel cache.",
+     ),
+     "index": CommandInfo(
+-        "pip._internal.commands.index",
++        "pipenv.patched.pip_internal.commands.index",
+         "IndexCommand",
+         "Inspect information available from package indexes.",
+     ),
+     "wheel": CommandInfo(
+-        "pip._internal.commands.wheel",
++        "pipenv.patched.pip_internal.commands.wheel",
+         "WheelCommand",
+         "Build wheels from your requirements.",
+     ),
+     "hash": CommandInfo(
+-        "pip._internal.commands.hash",
++        "pipenv.patched.pip_internal.commands.hash",
+         "HashCommand",
+         "Compute hashes of package archives.",
+     ),
+     "completion": CommandInfo(
+-        "pip._internal.commands.completion",
++        "pipenv.patched.pip_internal.commands.completion",
+         "CompletionCommand",
+         "A helper command used for command completion.",
+     ),
+     "debug": CommandInfo(
+-        "pip._internal.commands.debug",
++        "pipenv.patched.pip_internal.commands.debug",
+         "DebugCommand",
+         "Show information useful for debugging.",
+     ),
+     "help": CommandInfo(
+-        "pip._internal.commands.help",
++        "pipenv.patched.pip_internal.commands.help",
+         "HelpCommand",
+         "Show help for commands.",
+     ),
+diff --git a/pipenv/patched/pip/_vendor/requests/packages.py b/pipenv/patched/pip/_vendor/requests/packages.py
+index 200c38287..c92ef2d0d 100644
+--- a/pipenv/patched/pip/_vendor/requests/packages.py
++++ b/pipenv/patched/pip/_vendor/requests/packages.py
+@@ -6,14 +6,14 @@ from .compat import chardet
+ # I don't like it either. Just look the other way. :)
+
+ for package in ("urllib3", "idna"):
+-    vendored_package = "pip._vendor." + package
++    vendored_package = "pipenv.patched.pip._vendor." + package
+     locals()[package] = __import__(vendored_package)
+     # This traversal is apparently necessary such that the identities are
+     # preserved (requests.packages.urllib3.* is urllib3.*)
+     for mod in list(sys.modules):
+         if mod == vendored_package or mod.startswith(vendored_package + '.'):
+-            unprefixed_mod = mod[len("pip._vendor."):]
+-            sys.modules['pip._vendor.requests.packages.' + unprefixed_mod] = sys.modules[mod]
++            unprefixed_mod = mod[len("pipenv.patched.pip._vendor."):]
++            sys.modules['pipenv.patched.pip._vendor.requests.packages.' + unprefixed_mod] = sys.modules[mod]
+
+ if chardet is not None:
+     target = chardet.__name__

tasks/vendoring/patches/patched/pip_specifier.patch

@@ -0,0 +1,24 @@
+diff --git a/pipenv/patched/pip/_internal/resolution/resolvelib/candidates.py b/pipenv/patched/pip/_internal/resolution/resolvelib/candidates.py
+index d976026ac..49706667c 100644
+--- a/pipenv/patched/pip/_internal/resolution/resolvelib/candidates.py
++++ b/pipenv/patched/pip/_internal/resolution/resolvelib/candidates.py
+@@ -3,6 +3,7 @@ import sys
+ from typing import TYPE_CHECKING, Any, FrozenSet, Iterable, Optional, Tuple, Union, cast
+
+ from pip._vendor.packaging.requirements import InvalidRequirement
++from pip._vendor.packaging.specifiers import SpecifierSet
+ from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
+ from pip._vendor.packaging.version import Version
+
+@@ -257,7 +258,10 @@ class _InstallRequirementBackedCandidate(Candidate):
+             yield from self._factory.make_requirements_from_spec(str(r), self._ireq)
+
+     def get_install_requirement(self) -> Optional[InstallRequirement]:
+-        return self._ireq
++        ireq = self._ireq
++        if self._version and ireq.req and not ireq.req.url:
++            ireq.req.specifier = SpecifierSet(f"=={self._version}")
++        return ireq
+
+
+ class LinkCandidate(_InstallRequirementBackedCandidate):

tasks/vendoring/patches/patched/pipenv_import.patch

@@ -0,0 +1,19 @@
+diff --git a/pipenv/patched/pip/__main__.py b/pipenv/patched/pip/__main__.py
+index 599132611..1fa416e9a 100644
+--- a/pipenv/patched/pip/__main__.py
++++ b/pipenv/patched/pip/__main__.py
+@@ -19,6 +19,14 @@ if __package__ == "":
+     sys.path.insert(0, path)
+
+ if __name__ == "__main__":
++    import importlib.util
++    import sys
++    spec = importlib.util.spec_from_file_location(
++        "pipenv",
++        location=os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(__file__))), "__init__.py"))
++    pipenv = importlib.util.module_from_spec(spec)
++    sys.modules["pipenv"] = pipenv
++    spec.loader.exec_module(pipenv)
+     from pip._internal.cli.main import main as _main
+
+     sys.exit(_main())