Skip to content

Commit e4a8810

Browse files
committed
Revert "Download pure debugpy wheel"
This reverts commit 75d93e6.
1 parent 75d93e6 commit e4a8810

2 files changed

Lines changed: 1 addition & 9 deletions

File tree

build_defs/python.build_defs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ def python_wheel(name:str, version:str, labels:list=[], hashes:list=None, packag
551551
deps:list=[], name_scheme:str|list=CONFIG.PYTHON.WHEEL_NAME_SCHEME,
552552
strip:list=['*.pyc', 'tests'], binary = False, entry_points:dict|str={},
553553
tool:str=CONFIG.PYTHON.WHEEL_TOOL, prereleases:bool=CONFIG.PYTHON.PRERELEASES,
554-
tool_verbosity:str=CONFIG.PYTHON.VERBOSITY, pure:bool=False, interpreter:str=CONFIG.PYTHON.DEFAULT_INTERPRETER,
554+
tool_verbosity:str=CONFIG.PYTHON.VERBOSITY, interpreter:str=CONFIG.PYTHON.DEFAULT_INTERPRETER,
555555
module_dir:str=CONFIG.PYTHON.MODULE_DIR):
556556
"""Downloads a Python wheel and extracts it.
557557

@@ -599,9 +599,6 @@ def python_wheel(name:str, version:str, labels:list=[], hashes:list=None, packag
599599
module_dir (str): The path to the third party python directory in python import path format.
600600
Defaults to value of python.moduledir setting.
601601
tool (str): Tool to locate python wheel file in an index
602-
pure (bool): Whether the wheel resolver tool should only look for a pure (includes no compiled extensions) Python
603-
wheel. Defaults to looking both pure and platform (includes compiled extensions) wheels.
604-
Only valid if tool is passed or Plugin.Python.WheelTool is set.
605602
"""
606603
binary = binary or entry_points
607604
package_name = package_name or name.replace('-', '_')
@@ -626,8 +623,6 @@ def python_wheel(name:str, version:str, labels:list=[], hashes:list=None, packag
626623
# Try the URLs generated using the wheel name schemes. If those fail, try
627624
# generating a url with the wheel_resolver tool and download that if successful.
628625
cmd = f'$TOOLS_PYTHON $TOOLS_RESOLVER --package {package_name} --version {version} --prereleases {prereleases} --verbosity {tool_verbosity}'
629-
if pure:
630-
cmd += ' --abi none --platform any'
631626
if urls:
632627
cmd += ''.join([' --urls %s' % url for url in urls])
633628
file_rule = build_rule(
@@ -645,8 +640,6 @@ def python_wheel(name:str, version:str, labels:list=[], hashes:list=None, packag
645640
sandbox = False,
646641
)
647642
else:
648-
if pure:
649-
fail("pure can only be passed if either tool is passed as well or Plugin.Python.WheelTool is set")
650643
if not urls:
651644
fail('python.wheel_repo is not set in the config, must pass repo explicitly to python_wheel')
652645
file_rule = remote_file(

third_party/python/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,6 @@ python_wheel(
423423
zip_safe = False,
424424
# There doesn't seem to be a predictable URL for this version of debugpy so we need to resolve it instead.
425425
tool = "//tools:wheel_resolver",
426-
pure = True,
427426
)
428427

429428
python_wheel(

0 commit comments

Comments
 (0)