43
43
":pip_flags.bzl" ,
44
44
"INTERNAL_FLAGS" ,
45
45
"UniversalWhlFlag" ,
46
- "UseWhlFlag" ,
47
46
"WhlLibcFlag" ,
48
47
)
49
48
@@ -58,6 +57,9 @@ FLAGS = struct(
58
57
"pip_whl_osx_arch" ,
59
58
"pip_whl_osx_version" ,
60
59
"py_linux_libc" ,
60
+ "is_pip_whl_no" ,
61
+ "is_pip_whl_only" ,
62
+ "is_pip_whl_auto" ,
61
63
]
62
64
}
63
65
)
@@ -289,31 +291,27 @@ def _whl_config_setting(*, name, flag_values, config_setting_rule = None, **kwar
289
291
config_setting_rule = config_setting_rule or _config_setting_or
290
292
config_setting_rule (
291
293
name = "is_" + name ,
292
- flag_values = flag_values | {
293
- FLAGS .pip_whl : UseWhlFlag .ONLY ,
294
- },
295
- default = flag_values | {
296
- FLAGS .pip_whl : UseWhlFlag .AUTO ,
297
- },
294
+ flag_values = flag_values ,
295
+ use_whl_flag = FLAGS .is_pip_whl_only ,
298
296
** kwargs
299
297
)
300
298
301
299
def _sdist_config_setting (* , name , config_setting_rule = None , ** kwargs ):
302
300
config_setting_rule = config_setting_rule or _config_setting_or
303
301
config_setting_rule (
304
302
name = "is_" + name ,
305
- flag_values = {FLAGS .pip_whl : UseWhlFlag .NO },
306
- default = {FLAGS .pip_whl : UseWhlFlag .AUTO },
303
+ use_whl_flag = FLAGS .is_pip_whl_no ,
307
304
** kwargs
308
305
)
309
306
310
- def _config_setting_or (* , name , flag_values , default , visibility , python_version = "" , ** kwargs ):
307
+ def _config_setting_or (* , name , use_whl_flag , python_version = "" , ** kwargs ):
311
308
if python_version :
312
309
_name = name .replace ("is_cp{}" .format (python_version ), "_is" )
313
310
else :
314
311
_name = "_" + name
315
312
316
313
is_python = ":is_python_" + (python_version or "default" )
314
+ visibility = kwargs .get ("visibility" )
317
315
native .alias (
318
316
name = name ,
319
317
actual = select ({
@@ -329,24 +327,19 @@ def _config_setting_or(*, name, flag_values, default, visibility, python_version
329
327
return
330
328
331
329
match_name = "_{}_1" .format (name )
332
- default_name = "_{}_2" .format (name )
333
330
native .config_setting (
334
331
name = match_name ,
335
- flag_values = flag_values ,
336
- visibility = visibility ,
337
- ** kwargs
338
- )
339
- native .config_setting (
340
- name = default_name ,
341
- flag_values = default ,
342
- visibility = visibility ,
332
+ flag_values = {
333
+ _flags .dist : "" ,
334
+ } | kwargs .pop ("flag_values" , {}),
343
335
** kwargs
344
336
)
345
337
native .alias (
346
338
name = _name ,
347
339
actual = select ({
348
- match_name : match_name ,
349
- "//conditions:default" : default_name ,
340
+ FLAGS .is_pip_whl_auto : match_name ,
341
+ use_whl_flag : match_name ,
342
+ "//conditions:default" : use_whl_flag ,
350
343
}),
351
344
visibility = visibility ,
352
345
)
0 commit comments