diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2022-01-12 09:51:18 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2022-01-12 09:52:07 -0500 |
| commit | b789d313eeb514e9ba469e10f81a333a8f7acc47 (patch) | |
| tree | f0aacd9e150bfda4fb599669c5b03395669f4a9b | |
| parent | e3583870a5b56982cc6a4640bdcdd60ca4668b59 (diff) | |
| download | python-setuptools-git-bugfix/3026-sysconfig-vars-in-easy-install.tar.gz | |
Honor sysconfig variables in easy_install. Fixes #3026.bugfix/3026-sysconfig-vars-in-easy-install
| -rw-r--r-- | changelog.d/3026.misc.rst | 1 | ||||
| -rw-r--r-- | setuptools/command/easy_install.py | 16 |
2 files changed, 9 insertions, 8 deletions
diff --git a/changelog.d/3026.misc.rst b/changelog.d/3026.misc.rst new file mode 100644 index 00000000..c9ef986b --- /dev/null +++ b/changelog.d/3026.misc.rst @@ -0,0 +1 @@ +Honor sysconfig variables in easy_install. diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index a2962a7d..514719de 100644 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -39,9 +39,10 @@ import subprocess import shlex import io import configparser +import sysconfig -from sysconfig import get_config_vars, get_path +from sysconfig import get_path from setuptools import SetuptoolsDeprecationWarning @@ -236,23 +237,22 @@ class easy_install(Command): self.version and self._render_version() py_version = sys.version.split()[0] - prefix, exec_prefix = get_config_vars('prefix', 'exec_prefix') - self.config_vars = { + self.config_vars = dict(sysconfig.get_config_vars()) + + self.config_vars.update({ 'dist_name': self.distribution.get_name(), 'dist_version': self.distribution.get_version(), 'dist_fullname': self.distribution.get_fullname(), 'py_version': py_version, 'py_version_short': f'{sys.version_info.major}.{sys.version_info.minor}', 'py_version_nodot': f'{sys.version_info.major}{sys.version_info.minor}', - 'sys_prefix': prefix, - 'prefix': prefix, - 'sys_exec_prefix': exec_prefix, - 'exec_prefix': exec_prefix, + 'sys_prefix': self.config_vars['prefix'], + 'sys_exec_prefix': self.config_vars['exec_prefix'], # Only python 3.2+ has abiflags 'abiflags': getattr(sys, 'abiflags', ''), 'platlibdir': getattr(sys, 'platlibdir', 'lib'), - } + }) with contextlib.suppress(AttributeError): # only for distutils outside stdlib self.config_vars.update({ |