Merge pull request #4267 from torsava/import-vendored-attrs

Author: techalchemy

news/4267.vendor.rst

@@ -0,0 +1 @@
+Changed attrs import path in vendored dependencies to always import from ``pipenv.vendor``.

pipenv/vendor/passa/models/projects.py

@@ -6,7 +6,7 @@
 import io
 import os
 
-import attr
+from pipenv.vendor import attr
 import packaging.markers
 import packaging.utils
 import plette

pipenv/vendor/pythonfinder/models/mixins.py

@@ -5,7 +5,7 @@
 import operator
 from collections import defaultdict
 
-import attr
+from pipenv.vendor import attr
 import six
 
 from ..compat import fs_str

pipenv/vendor/pythonfinder/models/path.py

@@ -7,7 +7,7 @@
 from collections import defaultdict
 from itertools import chain
 
-import attr
+from pipenv.vendor import attr
 import six
 from cached_property import cached_property
 from ..compat import Path, fs_str

pipenv/vendor/pythonfinder/models/python.py

@@ -7,7 +7,7 @@
 import sys
 from collections import defaultdict
 
-import attr
+from pipenv.vendor import attr
 import six
 from packaging.version import Version
 

pipenv/vendor/pythonfinder/models/windows.py

@@ -4,7 +4,7 @@
 import operator
 from collections import defaultdict
 
-import attr
+from pipenv.vendor import attr
 
 from ..environment import MYPY_RUNNING
 from ..exceptions import InvalidPythonVersion

pipenv/vendor/pythonfinder/utils.py

@@ -10,7 +10,7 @@
 from fnmatch import fnmatch
 from threading import Timer
 
-import attr
+from pipenv.vendor import attr
 import six
 from packaging.version import LegacyVersion, Version
 

pipenv/vendor/requirementslib/models/dependencies.py

@@ -6,7 +6,7 @@
 import functools
 import os
 
-import attr
+from pipenv.vendor import attr
 import packaging.markers
 import packaging.version
 import pip_shims.shims

pipenv/vendor/requirementslib/models/lockfile.py

@@ -5,7 +5,7 @@
 import itertools
 import os
 
-import attr
+from pipenv.vendor import attr
 import plette.lockfiles
 import six
 from vistir.compat import FileNotFoundError, JSONDecodeError, Path

pipenv/vendor/requirementslib/models/markers.py

@@ -3,7 +3,7 @@
 import operator
 import re
 
-import attr
+from pipenv.vendor import attr
 import distlib.markers
 import packaging.version
 import six