Merge pull request #65 from stonebig/master

stonebig · stonebig · commit 2f240960ae8f · 2015-03-16T22:35:04.000+01:00
wppm fix for wheels
diff --git a/make.py b/make.py
@@ -462,15 +462,13 @@ def _install_required_packages(self):
         if self.python_version == '3.3':
             self.install_package('get-pip-([0-9\.]*[a-z]*[0-9]?).%s(-py%s)?.exe'
                                  % (self.py_arch, self.python_version))
-        if self.python_version == '2.7':
+        if self.python_version == '2.7' or self.python_version == '3.4':
             self.install_package('%s-([0-9\.]*[a-z]*[0-9]?)(.*)(\.exe|\.whl)' %
-                             'setuptools', install_options=['--upgrade', '--no-deps'])
-            self.install_package('%s-([0-9\.]*[a-z]*[0-9]?)(.*)(\.exe|\.whl)' %
-                             'pip', install_options=['--upgrade', '--no-deps'])
+                      'setuptools', install_options=['--upgrade', '--no-deps'])
 
         # Install 'main packages' first (was before Wheel idea, keep for now)
-        for happy_few in['sqlite_bro', 'wheel', 'pywin32', 'six', 'numpy',  'spyder',
-                          'scipy', 'matplotlib', 'pandas']:
+        for happy_few in['pip', 'wheel', 'pywin32', 'six', 'numpy',  'spyder',
+                         'scipy', 'matplotlib', 'pandas']:
             # can be a wheel now
             self.install_package(
                 '%s-([0-9\.]*[a-z\+]*[0-9]?)(.*)(\.exe|\.whl)' % happy_few)
@@ -1155,8 +1153,8 @@ def make_all(build_number, release_level, pyver,
     # DO create only what version at a time
     # You may have to manually delete previous build\winpython-.. directory
 
-    make_all(2, '', pyver='3.4', rootdir=r'D:\Winpython',
-             verbose=False, archis=(32, ))
+    #make_all(2, '', pyver='3.4', rootdir=r'D:\Winpython',
+    #         verbose=False, archis=(32, ))
     #make_all(2, '', pyver='3.4', rootdir=r'D:\Winpython',
     #          verbose=False, archis=(64, ), flavor='')
     #make_all(7, '', pyver='3.3', rootdir=r'D:\Winpython',
@@ -1175,8 +1173,8 @@ def make_all(build_number, release_level, pyver,
     #          verbose=False, archis=(32, ), flavor='FlavorKivy')
     #make_all(2, '', pyver='3.4', rootdir=r'D:\Winpython',
     #          verbose=False, archis=(32, ), flavor='FlavorRfull')
-    #make_all(2, '', pyver='3.4', rootdir=r'D:\Winpython',
-    #          verbose=False, archis=(64, ), flavor='FlavorRfull')
+    make_all(2, '', pyver='3.4', rootdir=r'D:\Winpython',
+              verbose=False, archis=(64, ), flavor='FlavorRfull')
     #make_all(2, '', pyver='3.4', rootdir=r'D:\Winpython',
     #          verbose=False, archis=(32, ), flavor='FlavorJulia')
     #make_all(3, '', pyver='2.7', rootdir=r'D:\Winpython',
diff --git a/winpython/wppm.py b/winpython/wppm.py
@@ -341,7 +341,7 @@ def install(self, package, install_options=None):
         """Install package in distribution"""
         assert package.is_compatible_with(self)
         tmp_fname = None
-        self.uninstall_existing(package)
+        # (tragic if pip) self.uninstall_existing(package)
         if package.fname.endswith(('.tar.gz', '.zip')):
             self._print(package, "Building")
             try:
@@ -461,7 +461,12 @@ def uninstall(self, package):
         self._print(package, "Uninstalling")
         if isinstance(package, WininstPackage):
             package.uninstall()
-        else:
+            package.remove_log(self.logdir)
+        elif not package.name == 'pip':
+            subprocess.call([os.path.dirname(sys.executable) + r'\python.exe',
+                            '-m', 'pip', 'uninstall', package.name, '-y'],
+                            cwd=os.path.dirname(sys.executable))
+            # legacy, if some package installed by old non-pip means
             package.load_log(self.logdir)
             for fname in reversed(package.files):
                 path = osp.join(self.target, fname)
