Remove urllib3 from vendor, use pip._vendor

Makefile

@@ -48,12 +48,12 @@ ramdisk:
 ramdisk-virtualenv: ramdisk
 	[ ! -e "/mnt/ramdisk/.venv/bin/activate" ] && \
 		python -m venv /mnt/ramdisk/.venv
-	echo "/mnt/ramdisk/.venv" >> $(venv_file)
+	echo "/mnt/ramdisk/.venv" > $(venv_file)
 
 .PHONY: virtualenv
 virtualenv:
 	[ ! -e $(venv_dir) ] && rm -rvf $(venv_file) && python -m venv $(venv_dir)
-	@echo $(venv_dir) >> $(venv_file)
+	@echo $(venv_dir) > $(venv_file)
 
 .PHONY: test-install
 test-install:
@@ -74,7 +74,7 @@ tests: parallel ?= -n auto
 tests: suite ?=
 tests: submodules test-install
 	source $(get_venv_path)/bin/activate && \
-		pipenv run pytest -ra $(parallel) -vvv --full-trace --tb=long
+		pipenv run pytest -ra $(parallel) -vvv --full-trace --tb=long $(suite)
 
 .PHONY: vendor
 vendor: virtualenv

news/5215.vendor.rst

@@ -0,0 +1 @@
+* Remove vendored ``urllib3`` in favor of using it from vendored version in ``pip._vendor``

pipenv/__init__.py

@@ -8,20 +8,23 @@
 import warnings
 
 from pipenv.__version__ import __version__  # noqa
+from pipenv.patched.pip._vendor.urllib3.exceptions import DependencyWarning
 
+warnings.filterwarnings("ignore", category=DependencyWarning)
+warnings.filterwarnings("ignore", category=ResourceWarning)
+warnings.filterwarnings("ignore", category=UserWarning)
 PIPENV_ROOT = os.path.abspath(os.path.dirname(os.path.realpath(__file__)))
+
 PIPENV_VENDOR = os.sep.join([PIPENV_ROOT, "vendor"])
 PIPENV_PATCHED = os.sep.join([PIPENV_ROOT, "patched"])
+# PIP_VENDOR = os.sep.join([PIPENV_ROOT, "patched", "pip", "_vendor"])
+
+# sys.path.insert(0, PIP_VENDOR)
 # Inject vendored directory into system path.
 sys.path.insert(0, PIPENV_VENDOR)
 # Inject patched directory into system path.
 sys.path.insert(0, PIPENV_PATCHED)
 
-from pipenv.vendor.urllib3.exceptions import DependencyWarning
-
-warnings.filterwarnings("ignore", category=DependencyWarning)
-warnings.filterwarnings("ignore", category=ResourceWarning)
-warnings.filterwarnings("ignore", category=UserWarning)
 
 # Load patched pip instead of system pip
 os.environ["PIP_SHIMS_BASE_MODULE"] = "pipenv.patched.pip"

pipenv/utils/indexes.py

@@ -3,9 +3,8 @@
 import re
 from collections.abc import Mapping
 
-from urllib3.util import parse_url
-
 from pipenv.exceptions import PipenvUsageError
+from pipenv.patched.pip._vendor.urllib3.util import parse_url
 from pipenv.utils.constants import MYPY_RUNNING
 
 from .internet import create_mirror_source, is_pypi_url

pipenv/utils/internet.py

@@ -1,8 +1,7 @@
 import re
 from urllib.parse import urlparse
 
-from urllib3 import util as urllib3_util
-
+from pipenv.patched.pip._vendor.urllib3 import util as urllib3_util
 from pipenv.vendor import parse
 
 requests_session = None  # type: ignore

pipenv/vendor/requirementslib/models/url.py

@@ -8,8 +8,8 @@
 import pipenv.vendor.attr as attr
 from pipenv.vendor.orderedmultidict import omdict
 from pipenv.vendor.pip_shims import shims
-from pipenv.vendor.urllib3.util import parse_url as urllib3_parse
-from pipenv.vendor.urllib3.util.url import Url
+from pipenv.patched.pip._vendor.urllib3.util import parse_url as urllib3_parse
+from pipenv.patched.pip._vendor.urllib3.util.url import Url
 
 from ..environment import MYPY_RUNNING
 from ..utils import is_installable_file

pipenv/vendor/requirementslib/models/utils.py

@@ -19,8 +19,8 @@
 from pipenv.vendor.plette.models import Package, PackageCollection
 from pipenv.vendor.tomlkit.container import Container
 from pipenv.vendor.tomlkit.items import AoT, Array, Bool, InlineTable, Item, String, Table
-from pipenv.vendor.urllib3 import util as urllib3_util
-from pipenv.vendor.urllib3.util import parse_url as urllib3_parse
+from pipenv.patched.pip._vendor.urllib3 import util as urllib3_util
+from pipenv.patched.pip._vendor.urllib3.util import parse_url as urllib3_parse
 from pipenv.vendor.vistir.misc import dedup
 from pipenv.vendor.vistir.path import is_valid_url
 
@@ -52,7 +52,7 @@
     from pipenv.patched.pip._vendor.packaging.requirements import Requirement as PackagingRequirement
     from pipenv.vendor.pip_shims.shims import Link
     from pkg_resources import Requirement as PkgResourcesRequirement
-    from pipenv.vendor.urllib3.util.url import Url
+    from pipenv.patched.pip._vendor.urllib3.util.url import Url
 
     _T = TypeVar("_T")
     TMarker = Union[Marker, PkgResourcesMarker]