Revert "switch to pip for gz and zip packages"

stonebig · stonebig · commit e815204609f3 · 2015-07-14T17:32:29.000+02:00
This reverts commit aca399d.
diff --git a/winpython/wppm.py b/winpython/wppm.py
@@ -371,7 +371,7 @@ def install(self, package, install_options=None):
         assert package.is_compatible_with(self)
         tmp_fname = None
         # (tragic if pip) self.uninstall_existing(package)
-        if package.fname.endswith(('.NOtar.gz', '.NOzip')):
+        if package.fname.endswith(('.tar.gz', '.zip')):
             self._print(package, "Building")
             try:
                 fname = utils.source_to_wininst(package.fname,
@@ -385,8 +385,8 @@ def install(self, package, install_options=None):
             package = Package(fname)
             self._print_done()
         # wheel addition
-        if package.fname.endswith(('.whl', '.tar.gz', '.zip')):
-            self.install_bdist_direct(package, install_options=install_options)
+        if package.fname.endswith(('.whl')):
+            self.install_bdist_wheel(package, install_options=install_options)
 
         bname = osp.basename(package.fname)
         if bname.endswith('.exe'):
@@ -397,8 +397,7 @@ def install(self, package, install_options=None):
         elif bname.endswith('.msi'):
             self.install_bdist_msi(package)
         self.handle_specific_packages(package)
-        if not package.fname.endswith(('.whl', '.tar.gz', '.zip')):
-            package.save_log(self.logdir)
+        package.save_log(self.logdir)
         if tmp_fname is not None:
             os.remove(tmp_fname)
 
@@ -462,11 +461,10 @@ def handle_specific_packages(self, package):
             self.create_file(package, name, '.',
                              contents.replace('.', './Lib/site-packages/%s' % package.name))
             # pyuic script
-            tmp_string = r'''@echo off
-python "%WINPYDIR%\Lib\site-packages\package.name\uic\pyuic.py" %1 %2 %3 %4 %5 %6 %7 %8 %9'''
-
             self.create_file(package, 'pyuic%s.bat' % package.name[-1],
-                'Scripts', tmp_string.replace('package.name', package.name))
+                'Scripts', r'''@echo off
+python "%WINPYDIR%\Lib\site-packages\%s\uic\pyuic.py" %1 %2 %3 %4 %5 %6 %7 %8 %9'''
+                % package.name)
             # Adding missing __init__.py files (fixes Issue 8)
             uic_path = osp.join('Lib', 'site-packages', package.name, 'uic')
             for dirname in ('Loader', 'port_v2', 'port_v3'):
@@ -557,9 +555,9 @@ def install_bdist_wininst(self, package):
         self.copy_files(package, targetdir, 'DATA', '.')
         self._print_done()
 
-    def install_bdist_direct(self, package, install_options=None):
-        """Install a package directly !"""
-        self._print(package, "Installing %s" % package.fname.split(".")[-1])
+    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.direct_pip_install(package.fname,
