Skip to content

Commit df664f2

Browse files
techalchemytechalchemy
committed
Add patch to update attrs import paths and add news entry.
Signed-off-by: Dan Ryan <[email protected]>
1 parent 41042cf commit df664f2

File tree

2 files changed

+222
-0
lines changed

2 files changed

+222
-0
lines changed

‎news/4267.vendor.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Changed attrs import path in vendored dependencies to always import from ``pipenv.vendor``.

‎tasks/vendoring/patches/vendor/update-attrs-import-path.patch‎

Lines changed: 221 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,221 @@
1+
diff --git a/pipenv/vendor/passa/models/projects.py b/pipenv/vendor/passa/models/projects.py
2+
index f6e037d6..c7807c05 100644
3+
--- a/pipenv/vendor/passa/models/projects.py
4+
+++ b/pipenv/vendor/passa/models/projects.py
5+
@@ -6,7 +6,7 @@ import collections
6+
import io
7+
import os
8+
9+
-import attr
10+
+from pipenv.vendor import attr
11+
import packaging.markers
12+
import packaging.utils
13+
import plette
14+
diff --git a/pipenv/vendor/pythonfinder/models/mixins.py b/pipenv/vendor/pythonfinder/models/mixins.py
15+
index 76327115..aeba0443 100644
16+
--- a/pipenv/vendor/pythonfinder/models/mixins.py
17+
+++ b/pipenv/vendor/pythonfinder/models/mixins.py
18+
@@ -5,7 +5,7 @@ import abc
19+
import operator
20+
from collections import defaultdict
21+
22+
-import attr
23+
+from pipenv.vendor import attr
24+
import six
25+
26+
from ..compat import fs_str
27+
diff --git a/pipenv/vendor/pythonfinder/models/path.py b/pipenv/vendor/pythonfinder/models/path.py
28+
index b855a05d..a8070c91 100644
29+
--- a/pipenv/vendor/pythonfinder/models/path.py
30+
+++ b/pipenv/vendor/pythonfinder/models/path.py
31+
@@ -7,7 +7,7 @@ import sys
32+
from collections import defaultdict
33+
from itertools import chain
34+
35+
-import attr
36+
+from pipenv.vendor import attr
37+
import six
38+
from cached_property import cached_property
39+
from ..compat import Path, fs_str
40+
diff --git a/pipenv/vendor/pythonfinder/models/python.py b/pipenv/vendor/pythonfinder/models/python.py
41+
index 619e7761..ff249be2 100644
42+
--- a/pipenv/vendor/pythonfinder/models/python.py
43+
+++ b/pipenv/vendor/pythonfinder/models/python.py
44+
@@ -7,7 +7,7 @@ import platform
45+
import sys
46+
from collections import defaultdict
47+
48+
-import attr
49+
+from pipenv.vendor import attr
50+
import six
51+
from packaging.version import Version
52+
53+
diff --git a/pipenv/vendor/pythonfinder/models/windows.py b/pipenv/vendor/pythonfinder/models/windows.py
54+
index a0e69b03..39353cdb 100644
55+
--- a/pipenv/vendor/pythonfinder/models/windows.py
56+
+++ b/pipenv/vendor/pythonfinder/models/windows.py
57+
@@ -4,7 +4,7 @@ from __future__ import absolute_import, print_function
58+
import operator
59+
from collections import defaultdict
60+
61+
-import attr
62+
+from pipenv.vendor import attr
63+
64+
from ..environment import MYPY_RUNNING
65+
from ..exceptions import InvalidPythonVersion
66+
diff --git a/pipenv/vendor/pythonfinder/utils.py b/pipenv/vendor/pythonfinder/utils.py
67+
index 8150545c..ef48e628 100644
68+
--- a/pipenv/vendor/pythonfinder/utils.py
69+
+++ b/pipenv/vendor/pythonfinder/utils.py
70+
@@ -10,7 +10,7 @@ from collections import OrderedDict
71+
from fnmatch import fnmatch
72+
from threading import Timer
73+
74+
-import attr
75+
+from pipenv.vendor import attr
76+
import six
77+
from packaging.version import LegacyVersion, Version
78+
79+
diff --git a/pipenv/vendor/requirementslib/models/dependencies.py b/pipenv/vendor/requirementslib/models/dependencies.py
80+
index 2608479a..1a610ce7 100644
81+
--- a/pipenv/vendor/requirementslib/models/dependencies.py
82+
+++ b/pipenv/vendor/requirementslib/models/dependencies.py
83+
@@ -6,7 +6,7 @@ import copy
84+
import functools
85+
import os
86+
87+
-import attr
88+
+from pipenv.vendor import attr
89+
import packaging.markers
90+
import packaging.version
91+
import pip_shims.shims
92+
diff --git a/pipenv/vendor/requirementslib/models/lockfile.py b/pipenv/vendor/requirementslib/models/lockfile.py
93+
index 3eabc504..841fc74c 100644
94+
--- a/pipenv/vendor/requirementslib/models/lockfile.py
95+
+++ b/pipenv/vendor/requirementslib/models/lockfile.py
96+
@@ -5,7 +5,7 @@ import copy
97+
import itertools
98+
import os
99+
100+
-import attr
101+
+from pipenv.vendor import attr
102+
import plette.lockfiles
103+
import six
104+
from vistir.compat import FileNotFoundError, JSONDecodeError, Path
105+
diff --git a/pipenv/vendor/requirementslib/models/markers.py b/pipenv/vendor/requirementslib/models/markers.py
106+
index 94410a20..b07e444c 100644
107+
--- a/pipenv/vendor/requirementslib/models/markers.py
108+
+++ b/pipenv/vendor/requirementslib/models/markers.py
109+
@@ -3,7 +3,7 @@ import itertools
110+
import operator
111+
import re
112+
113+
-import attr
114+
+from pipenv.vendor import attr
115+
import distlib.markers
116+
import packaging.version
117+
import six
118+
diff --git a/pipenv/vendor/requirementslib/models/metadata.py b/pipenv/vendor/requirementslib/models/metadata.py
119+
index b45b1f02..671a311b 100644
120+
--- a/pipenv/vendor/requirementslib/models/metadata.py
121+
+++ b/pipenv/vendor/requirementslib/models/metadata.py
122+
@@ -9,7 +9,7 @@ import os
123+
import zipfile
124+
from collections import defaultdict
125+
126+
-import attr
127+
+from pipenv.vendor import attr
128+
import dateutil.parser
129+
import distlib.metadata
130+
import distlib.wheel
131+
diff --git a/pipenv/vendor/requirementslib/models/pipfile.py b/pipenv/vendor/requirementslib/models/pipfile.py
132+
index 9c0aea4e..9bda73d4 100644
133+
--- a/pipenv/vendor/requirementslib/models/pipfile.py
134+
+++ b/pipenv/vendor/requirementslib/models/pipfile.py
135+
@@ -7,7 +7,7 @@ import itertools
136+
import os
137+
import sys
138+
139+
-import attr
140+
+from pipenv.vendor import attr
141+
import plette.models.base
142+
import plette.pipfiles
143+
import tomlkit
144+
diff --git a/pipenv/vendor/requirementslib/models/project.py b/pipenv/vendor/requirementslib/models/project.py
145+
index 7c1b0e81..4c73823c 100644
146+
--- a/pipenv/vendor/requirementslib/models/project.py
147+
+++ b/pipenv/vendor/requirementslib/models/project.py
148+
@@ -6,7 +6,7 @@ import collections
149+
import io
150+
import os
151+
152+
-import attr
153+
+from pipenv.vendor import attr
154+
import packaging.markers
155+
import packaging.utils
156+
import plette
157+
diff --git a/pipenv/vendor/requirementslib/models/requirements.py b/pipenv/vendor/requirementslib/models/requirements.py
158+
index a0045f45..3ce8d8f5 100644
159+
--- a/pipenv/vendor/requirementslib/models/requirements.py
160+
+++ b/pipenv/vendor/requirementslib/models/requirements.py
161+
@@ -10,7 +10,7 @@ from contextlib import contextmanager
162+
from distutils.sysconfig import get_python_lib
163+
from functools import partial
164+
165+
-import attr
166+
+from pipenv.vendor import attr
167+
import pip_shims
168+
import six
169+
import vistir
170+
diff --git a/pipenv/vendor/requirementslib/models/resolvers.py b/pipenv/vendor/requirementslib/models/resolvers.py
171+
index 43590523..4554b299 100644
172+
--- a/pipenv/vendor/requirementslib/models/resolvers.py
173+
+++ b/pipenv/vendor/requirementslib/models/resolvers.py
174+
@@ -1,7 +1,7 @@
175+
# -*- coding=utf-8 -*-
176+
from contextlib import contextmanager
177+
178+
-import attr
179+
+from pipenv.vendor import attr
180+
import six
181+
from pip_shims.shims import Wheel
182+
183+
diff --git a/pipenv/vendor/requirementslib/models/setup_info.py b/pipenv/vendor/requirementslib/models/setup_info.py
184+
index f0d40f29..9c97a394 100644
185+
--- a/pipenv/vendor/requirementslib/models/setup_info.py
186+
+++ b/pipenv/vendor/requirementslib/models/setup_info.py
187+
@@ -12,7 +12,7 @@ import shutil
188+
import sys
189+
from functools import partial
190+
191+
-import attr
192+
+from pipenv.vendor import attr
193+
import chardet
194+
import packaging.specifiers
195+
import packaging.utils
196+
diff --git a/pipenv/vendor/requirementslib/models/url.py b/pipenv/vendor/requirementslib/models/url.py
197+
index 3d5743e6..b0c98de8 100644
198+
--- a/pipenv/vendor/requirementslib/models/url.py
199+
+++ b/pipenv/vendor/requirementslib/models/url.py
200+
@@ -1,7 +1,7 @@
201+
# -*- coding=utf-8 -*-
202+
from __future__ import absolute_import, print_function
203+
204+
-import attr
205+
+from pipenv.vendor import attr
206+
import pip_shims.shims
207+
from orderedmultidict import omdict
208+
from six.moves.urllib.parse import quote_plus, unquote_plus
209+
diff --git a/pipenv/vendor/requirementslib/models/vcs.py b/pipenv/vendor/requirementslib/models/vcs.py
210+
index 0f96a331..273305db 100644
211+
--- a/pipenv/vendor/requirementslib/models/vcs.py
212+
+++ b/pipenv/vendor/requirementslib/models/vcs.py
213+
@@ -5,7 +5,7 @@ import importlib
214+
import os
215+
import sys
216+
217+
-import attr
218+
+from pipenv.vendor import attr
219+
import pip_shims
220+
import six
221+

0 commit comments

Comments
 (0)