Wheel integration via control panel

stonebig · stonebig · commit cdd38cad2c40 · 2014-09-13T09:57:53.000+02:00
diff --git a/winpython/controlpanel.py b/winpython/controlpanel.py
@@ -600,7 +600,8 @@ def add_packages(self):
         """Add packages"""
         basedir = self.basedir if self.basedir is not None else ''
         fnames, _selfilter = getopenfilenames(parent=self, basedir=basedir,
-                      caption='Add packages', filters='*.exe *.zip *.tar.gz')
+                      caption='Add packages',
+                      filters='*.exe *.zip *.tar.gz *.whl')
         if fnames:
             self.basedir = osp.dirname(fnames[0])
             self.table.add_packages(fnames)
diff --git a/winpython/wppm.py b/winpython/wppm.py
@@ -92,7 +92,6 @@ class Package(BasePackage):
     def __init__(self, fname):
         BasePackage.__init__(self, fname)
         self.files = []
-        
         self.extract_infos()
         self.extract_optional_infos()
 
@@ -127,7 +126,7 @@ def extract_infos(self):
                 self.name, self.version, self.pyversion, arch, _pyqt = match.groups()
                 self.architecture = int(arch)
                 return
-        elif bname.endswith(('.zip', '.tar.gz')):
+        elif bname.endswith(('.zip', '.tar.gz', '.whl')):
             # distutils sdist
             infos = utils.get_source_package_infos(bname)
             if infos is not None:
@@ -322,7 +321,7 @@ def uninstall_existing(self, package):
         if pack is not None:
             self.uninstall(pack)
     
-    def install(self, package):
+    def install(self, package, install_options=None):
         """Install package in distribution"""
         assert package.is_compatible_with(self)
         tmp_fname = None
@@ -340,6 +339,10 @@ def install(self, package):
             tmp_fname = fname
             package = Package(fname)
             self._print_done()
+        # wheel addition
+        if package.fname.endswith(('.whl')):
+            self.install_bdist_wheel(package, install_options=install_options)
+
         bname = osp.basename(package.fname)
         if bname.endswith('.exe'):
             if re.match(r'(' + ('|'.join(self.NSIS_PACKAGES)) + r')-', bname):
@@ -451,6 +454,23 @@ def install_bdist_wininst(self, package):
         self.copy_files(package, targetdir, 'DATA', '.')
         self._print_done()
 
+    def install_bdist_wheel(self, package, install_options=None):
+        """Install a wheel directly !"""
+        self._print(package, "Installing Wheel")
+        #targetdir = utils.extract_msi(package.fname, targetdir=self.target)
+        try:
+            fname = utils.wheel_to_wininst(package.fname,
+                      python_exe=osp.join(self.target, 'python.exe'),
+                      architecture=self.architecture, verbose=self.verbose,
+                      install_options=install_options)
+        except RuntimeError:
+            if not self.verbose:
+                print("Failed!")
+                raise
+        package = Package(fname)
+        self._print_done()        
+
+
     def install_bdist_msi(self, package):
         """Install a distutils package built with the bdist_msi option
         (binary distribution, .msi file)"""
