accept binary wheels when building winpython

stonebig · stonebig · commit 63a4e501edfe · 2015-01-03T14:47:14.000+01:00
diff --git a/make.py b/make.py
@@ -473,9 +473,9 @@ def _install_required_packages(self):
 
         # Install 'main packages' first (was before Wheel idea, keep for now)
         for happy_few in['numpy-MKL', 'scipy', 'matplotlib', 'pandas']:
+            # can be a wheel now
             self.install_package(
-                '%s-([0-9\.]*[a-z]*[0-9]?).%s(-py%s)?.exe'
-                % (happy_few, self.py_arch, self.python_version))
+                '%s-([0-9\.]*[a-z]*[0-9]?)(.*)(\.exe|\.whl)' % happy_few) 
 
     def _install_all_other_packages(self):
         """Try to install all other packages in instdirs"""
diff --git a/winpython/utils.py b/winpython/utils.py
@@ -352,6 +352,10 @@ def extract_archive(fname, targetdir=None, verbose=False):
 
 SOURCE_PATTERN = r'([a-zA-Z0-9\-\_\.]*)-([0-9\.\_]*[a-z]*[0-9]?)(\.zip|\.tar\.gz|\-[a-z\.0-9]*\-none\-any\.whl)'
 
+# WHEELBIN_PATTERN defines what an acceptable binary wheel package is
+# "cp([0-9]*)" to replace per cp(34) for python3.4
+# "win32|win\_amd64" to replace per "win\_amd64" for 64bit
+WHEELBIN_PATTERN = r'([a-zA-Z0-9\-\_\.]*)-([0-9\.\_]*[a-z]*[0-9]?)-cp([0-9]*)\-none\-(win32|win\_amd64)\.whl'
 
 def get_source_package_infos(fname):
     """Return a tuple (name, version) of the Python source package"""
@@ -373,7 +377,7 @@ def build_wininst(root, python_exe=None, copy_to=None,
         archstr = 'win32' if architecture == 32 else 'win-amd64'
         cmd += ['--plat-name=%s' % archstr]
     cmd += ['bdist_wininst']
-    #  print('build_wininst', root, cmd)
+    # root = a tmp dir in windows\tmp, 
     if verbose:
         subprocess.call(cmd, cwd=root)
     else:
@@ -406,6 +410,8 @@ def build_wininst(root, python_exe=None, copy_to=None,
         shutil.move(src_fname, dst_fname)
         if verbose:
             print(("Move: %s --> %s" % (src_fname, (dst_fname))))
+            # remove tempo dir 'root' no more needed
+            shutil.rmtree(root, onerror=onerror)
         return dst_fname
 
 
diff --git a/winpython/wppm.py b/winpython/wppm.py
@@ -128,6 +128,17 @@ def extract_infos(self):
                 self.name, self.version, self.pyversion, arch, _pyqt = match.groups()
                 self.architecture = int(arch)
                 return
+        # New : Binary wheel case
+        elif bname.endswith(('32.whl', '64.whl')):
+            match = re.match(utils.WHEELBIN_PATTERN, bname)
+            # typical macht is ('scipy', '0.14.1rc1', '34', 'win32')
+            if match is not None:
+                self.name, self.version,  self.pywheel , arch  = match.groups()
+                # self.pywheel version is '34' not 3.4
+                self.pyversion = self.pywheel[:1] + '.' + self.pywheel[1:]
+                # wheel arch is 'win32' or 'win_amd64'
+                self.architecture = 32 if arch == 'win32' else 64
+                return
         elif bname.endswith(('.zip', '.tar.gz', '.whl')):
             # distutils sdist
             infos = utils.get_source_package_infos(bname)
