File tree Expand file tree Collapse file tree 3 files changed +24
-0
lines changed Expand file tree Collapse file tree 3 files changed +24
-0
lines changed Original file line number Diff line number Diff line change @@ -138,6 +138,15 @@ def pip_install_dependencies():
138
138
(However we call it from pip_install, making it optional for users to do so.)
139
139
"""
140
140
141
+ _extra_args = {
142
+ "pypi__setuptools" : {
143
+ "patch_args" : ["-p1" ],
144
+ "patches" : [
145
+ Label ("//python/private:setuptools.patch" ),
146
+ ],
147
+ },
148
+ }
149
+
141
150
# We only support Bazel LTS and rolling releases.
142
151
# Give the user an obvious error to upgrade rather than some obscure missing symbol later.
143
152
# It's not guaranteed that users call this function, but it's used by all the pip fetch
@@ -152,4 +161,5 @@ def pip_install_dependencies():
152
161
sha256 = sha256 ,
153
162
type = "zip" ,
154
163
build_file_content = _GENERIC_WHEEL ,
164
+ ** _extra_args .get (name , {})
155
165
)
Original file line number Diff line number Diff line change @@ -96,6 +96,7 @@ bzl_library(
96
96
exports_files (
97
97
[
98
98
"coverage.patch" ,
99
+ "setuptools.patch" ,
99
100
"py_package.bzl" ,
100
101
"py_wheel.bzl" ,
101
102
"reexports.bzl" ,
Original file line number Diff line number Diff line change
1
+ diff --git a/setuptools/_distutils/dist.py b/setuptools/_distutils/dist.py
2
+ index 7c0f0e5b..88ae7716 100644
3
+ --- a/setuptools/_distutils/dist.py
4
+ +++ b/setuptools/_distutils/dist.py
5
+ @@ -270,7 +270,7 @@ Common commands: (see '--help-commands' for more)
6
+ # If attrs['script_args'] wasn't passed, assume false.
7
+ #
8
+ # This also make sure we just look at the global options
9
+ - self.want_user_cfg = True
10
+ + self.want_user_cfg = False
11
+
12
+ if self.script_args is not None:
13
+ for arg in self.script_args:
You can’t perform that action at this time.
0 commit comments