adapt wppm for pip requirements

stonebig · stonebig · commit a20d9fd88a2a · 2015-09-10T19:32:07.000+02:00
diff --git a/winpython/utils.py b/winpython/utils.py
@@ -580,15 +580,15 @@ def do_script(this_script, python_exe=None, copy_to=None,
     """Execute a script (get-pip typically)"""
     if python_exe is None:
         python_exe = sys.executable
-    assert osp.isfile(python_exe)
     myroot = os.path.dirname(python_exe)
 
     # cmd = [python_exe, myroot + r'\Scripts\pip-script.py', 'install']
     cmd = [python_exe]
     if install_options:
         cmd += install_options  # typically ['--no-deps']
         print('script install_options', install_options)
-    cmd += [this_script]
+    if this_script:
+        cmd += [this_script]
     # print('build_wheel', myroot, cmd)
     print("Executing ", cmd)
 
diff --git a/winpython/wppm.py b/winpython/wppm.py
@@ -412,6 +412,32 @@ def install(self, package, install_options=None):
         if tmp_fname is not None:
             os.remove(tmp_fname)
 
+    def do_pip_action(self, actions=None, install_options=None):
+        """Do pip action in a distribution"""
+        my_list = install_options
+        if my_list is None:
+            my_list = []
+        my_actions = actions
+        if my_actions is None:
+            my_actions = []
+        executing = osp.join(self.target, '..', 'scripts', 'env.bat')
+        if osp.isfile(executing):
+            complement = [r'&&' , 'cd' , '/D', self.target,
+                          r'&&', osp.join(self.target, 'python.exe') ]
+            complement += [ '-m', 'pip']
+        else:
+            executing = osp.join(self.target, 'python.exe')
+            complement = [ '-m', 'pip']
+        try:
+            fname = utils.do_script(this_script=None,
+                        python_exe=executing,
+                        architecture=self.architecture, verbose=self.verbose,
+                        install_options=complement + my_actions + my_list)
+        except RuntimeError:
+            if not self.verbose:
+                print("Failed!")
+                raise
+
     def patch_standard_packages(self, package_name=''):
         """patch Winpython packages in need"""
         import filecmp
