Skip to content

Replace distutils.spawn with shutil.which per PEP632 in setup script #5849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 21, 2022
Merged

Replace distutils.spawn with shutil.which per PEP632 in setup script #5849

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65ab15c
replace distutils.spawn with shutil.which per PEP632 in setup script
Apr 21, 2022
23389db
Merge branch 'main' into bkorbar/5837
NicolasHug Apr 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def find_library(name, vision_include):
conda_installed = library_found
else:
# Check if using Anaconda to produce wheels
conda = distutils.spawn.find_executable("conda")
conda = shutil.which("conda")
is_conda = conda is not None
print(f"Running build on conda: {is_conda}")
if is_conda:
Expand Down Expand Up @@ -259,8 +259,8 @@ def get_extensions():
image_macros += [("USE_PYTHON", None)]

# Locating libPNG
libpng = distutils.spawn.find_executable("libpng-config")
pngfix = distutils.spawn.find_executable("pngfix")
libpng = shutil.which("libpng-config")
pngfix = shutil.which("pngfix")
png_found = libpng is not None or pngfix is not None
print(f"PNG found: {png_found}")
if png_found:
Expand Down Expand Up @@ -340,7 +340,7 @@ def get_extensions():
)
)

ffmpeg_exe = distutils.spawn.find_executable("ffmpeg")
ffmpeg_exe = shutil.which("ffmpeg")
has_ffmpeg = ffmpeg_exe is not None
# FIXME: Building torchvision with ffmpeg on MacOS or with Python 3.9
# FIXME: causes crash. See the following GitHub issues for more details.
Expand All @@ -366,7 +366,7 @@ def get_extensions():
ffmpeg_include_dir = os.path.join(ffmpeg_root, "include")
ffmpeg_library_dir = os.path.join(ffmpeg_root, "lib")

gcc = os.environ.get("CC", distutils.spawn.find_executable("gcc"))
gcc = os.environ.get("CC", shutil.which("gcc"))
platform_tag = subprocess.run([gcc, "-print-multiarch"], stdout=subprocess.PIPE)
platform_tag = platform_tag.stdout.strip().decode("utf-8")

Expand Down