Skip to content
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

Jump to bottom

Replaced distutils in test_image_access.py #4814

Merged
merged 2 commits into from
Jul 29, 2020
Merged

Replaced distutils in test_image_access.py #4814

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42bb401
Replaced distutils sysconfig
radarhere Jul 25, 2020
a10634e
Do not explicitly import distutils
radarhere Jul 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 8 additions & 7 deletions Tests/test_image_access.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
import os
import subprocess
import sys
from distutils import ccompiler, sysconfig
import sysconfig

from setuptools.command.build_ext import new_compiler

import pytest
from PIL import Image
Expand Down Expand Up @@ -359,13 +361,12 @@ def test_embeddable(self):
% sys.prefix.replace("\\", "\\\\")
)

compiler = ccompiler.new_compiler()
compiler.add_include_dir(sysconfig.get_python_inc())
compiler = new_compiler()
compiler.add_include_dir(sysconfig.get_config_var("INCLUDEPY"))

libdir = sysconfig.get_config_var(
"LIBDIR"
) or sysconfig.get_python_inc().replace("include", "libs")
print(libdir)
libdir = sysconfig.get_config_var("LIBDIR") or sysconfig.get_config_var(
"INCLUDEPY"
).replace("include", "libs")
compiler.add_library_dir(libdir)
objects = compiler.compile(["embed_pil.c"])
compiler.link_executable(objects, "embed_pil")
Expand Down