diff options
| author | Matthew Brett <matthew.brett@gmail.com> | 2021-10-22 12:40:14 +0100 |
|---|---|---|
| committer | Matthew Brett <matthew.brett@gmail.com> | 2021-10-22 12:59:22 +0100 |
| commit | 02f602b0fe4c5a67fe82f0cd7cb9c820392445f9 (patch) | |
| tree | 49b49b2f65f6a5639ec915dcd72b30b4f513cdf6 | |
| parent | 1012141a15a432c1c7a3f3d964c38ca04970bd1b (diff) | |
| download | numpy-02f602b0fe4c5a67fe82f0cd7cb9c820392445f9.tar.gz | |
Remove fix for odd MSVCRT version on Windows 3.7
The comment in the original code came about because of the bug fixed in
gh-20155. The fixed subsequent clause should now give the correct
assembly version for the given Python.
In fact, the original clause matches the MSVC for Python 3.7.1:
```
PS C:\> .\Python37\python.exe .\io\check_versions.py
sys.version 3.7.1 (v3.7.1:260ec2c36a, Oct 20 2018, 14:57:15) [MSC v.1915 64 bit (AMD64)]
distutils build version 14.1
msvcrt.CRT_ASSEMBLY_VERSION 14.15.26726.0
```
| -rw-r--r-- | numpy/distutils/mingw32ccompiler.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/numpy/distutils/mingw32ccompiler.py b/numpy/distutils/mingw32ccompiler.py index 430a3a3e7..82d296434 100644 --- a/numpy/distutils/mingw32ccompiler.py +++ b/numpy/distutils/mingw32ccompiler.py @@ -547,8 +547,6 @@ if sys.platform == 'win32': # Value from msvcrt.CRT_ASSEMBLY_VERSION under Python 3.3.0 # on Windows XP: _MSVCRVER_TO_FULLVER['100'] = "10.0.30319.460" - # Python 3.7 uses 1415, but get_build_version returns 140 ?? - _MSVCRVER_TO_FULLVER['140'] = "14.15.26726.0" crt_ver = getattr(msvcrt, 'CRT_ASSEMBLY_VERSION', None) if crt_ver is not None: # Available at least back to Python 3.3 maj, min = re.match(r'(\d+)\.(\d)', crt_ver).groups() |