summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Brett <matthew.brett@gmail.com>2021-10-21 17:24:04 +0100
committerMatthew Brett <matthew.brett@gmail.com>2021-10-21 17:44:52 +0100
commitc72fbd00ffc5439cc7def96456c391ef64237886 (patch)
tree299d8cde26e4e5bdfaa22052e87e7d750eafb2bd
parent5cb560616abe44774d897a80970775d2a26bb03b (diff)
downloadnumpy-c72fbd00ffc5439cc7def96456c391ef64237886.tar.gz
Patch to allow for 2 as a minor version (!)
The float representation of e.g. 14.2 is not exact, leading to a minor version number of int(1.999999) == 1 in the original code.
-rw-r--r--numpy/distutils/mingw32ccompiler.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/numpy/distutils/mingw32ccompiler.py b/numpy/distutils/mingw32ccompiler.py
index 541055899..c3a0cb418 100644
--- a/numpy/distutils/mingw32ccompiler.py
+++ b/numpy/distutils/mingw32ccompiler.py
@@ -647,10 +647,9 @@ def generate_manifest(config):
if msver is not None:
if msver >= 8:
check_embedded_msvcr_match_linked(msver)
- ma = int(msver)
- mi = int((msver - ma) * 10)
+ ma_str, mi_str = str(msver).split('.')
# Write the manifest file
- manxml = msvc_manifest_xml(ma, mi)
+ manxml = msvc_manifest_xml(int(ma_str), int(mi_str))
with open(manifest_name(config), "w") as man:
config.temp_files.append(manifest_name(config))
man.write(manxml)