MAINT: use sysconfig not distutils.sysconfig where possible #17223
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mattip
commented
Sep 2, 2020
| @@ -187,6 +187,7 @@ | |||
| import tempfile | |||
| import shutil | |||
|
|
|||
| __all__ = ['system_info'] | |||
There was a problem hiding this comment.
This file was missing an __all__, so it was re-exporting imported modules.
| @@ -26,7 +26,8 @@ def UnixCCompiler__compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts | |||
| self.compiler_so = ccomp | |||
| # ensure OPT environment variable is read | |||
| if 'OPT' in os.environ: | |||
| from distutils.sysconfig import get_config_vars | |||
| # XXX who uses this? | |||
| from sysconfig import get_config_vars | |||
| 'numpy.distutils.system_info.sys', | ||
| 'numpy.distutils.system_info.tempfile', | ||
| 'numpy.distutils.system_info.textwrap', | ||
| 'numpy.distutils.system_info.warnings', |
There was a problem hiding this comment.
Now that system_info has an __all__, these can be removed.
| @@ -445,7 +445,7 @@ def build_project(args): | |||
| os.makedirs(site_dir) | |||
| if not os.path.exists(site_dir_noarch): | |||
| os.makedirs(site_dir_noarch) | |||
| env['PYTHONPATH'] = site_dir + ':' + site_dir_noarch | |||
| env['PYTHONPATH'] = site_dir + os.pathsep + site_dir_noarch | |||
There was a problem hiding this comment.
This mistake makes me suspicious - do we really need to set PYTHONPATH here? It is done correctly before running tests.
|
For reference: |
eric-wieser
reviewed
Sep 2, 2020
numpy/distutils/system_info.py
Outdated
| @@ -255,7 +256,7 @@ def libpaths(paths, bits): | |||
|
|
|||
| if sys.platform == 'win32': | |||
| default_lib_dirs = ['C:\\', | |||
| os.path.join(distutils.sysconfig.EXEC_PREFIX, | |||
| os.path.join(sysconfig.EXEC_PREFIX, | |||
There was a problem hiding this comment.
AttributeError: module 'sysconfig' has no attribute 'EXEC_PREFIX'
|
So this is now passing, and could be committed as-is. There is more to do:
Edit: |
|
xref python/cpython#22088 |
|
Thanks Matti. |
tylerjereddy
added a commit
to tylerjereddy/numpy
that referenced
this pull request
Sep 7, 2020
* numpygh-17223 started the `distutils` modernization process because of the various upstream stuff going on (thanks) * that set of changes caused build issues with NumPy pre-release wheels + SciPy `master`: https://travis-ci.org/github/scipy/scipy/builds/725002838 * I was able to patch two separate issues and confirm that this feature branch restores the SciPy build locally: 1) in one case, `distutils.sysconfig.get_python_inc` was replaced with `distutils.get_python_inc`, which does not exist (probably a typo) 2) a bit more serious; even `sysconfig.get_python_inc` does not appear to exist; the closest match I could find (and that worked) was `sysconfig.get_path()` with options for general and platform-specific header paths as needed * I'm not claiming that these stdlib replacements are perfect either (the prefix case may still be slightly different?), but it does prevent the SciPy build break originally introduced as a start
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since python 3.2
sysconfighas moved to the stdlib. Some functionality is still needed fromdistutils.sysconfig, for instancedistutils.sysconfig.customize_compileranddistutils.sysconfig.get_python.lib.It is not clear if this is a (very small) step toward fixing the distutils/setuptools mess, but it seems like the right thing to do anyway.