simplify rebuild_winpython

stonebig · stonebig · commit 2af695ea411a · 2019-03-24T17:59:39.000+01:00
diff --git a/make.py b/make.py
@@ -1496,19 +1496,15 @@ def make(self, remove_existing=True, requirements=None, my_winpydir=None):  #, f
         self._print_done()
 
 
-def rebuild_winpython(basedir=None, verbose=False, architecture=64, targetdir=None):
+def rebuild_winpython(basedir, targetdir, architecture=64, verbose=False):
     """Rebuild winpython package from source"""
-    basedir = basedir if basedir is not None else utils.BASE_DIR
-    suffix = '.win32' if architecture == 32 else '.win-amd64'
-    if targetdir is not None:
-        packdir = targetdir
-    else:
-        packdir = osp.join(basedir, 'packages' + suffix)
+    basedir = basedir
+    packdir = targetdir
     for name in os.listdir(packdir):
         if name.startswith('winpython-') and name.endswith(('.exe', '.whl')):
             os.remove(osp.join(packdir, name))
     utils.build_wininst(osp.dirname(osp.abspath(__file__)), copy_to=packdir,
-                        architecture=architecture, verbose=verbose, installer='bdist_wheel')
+        architecture=architecture, verbose=verbose, installer='bdist_wheel')
 
 
 def transform_in_list(list_in, list_type=None):
@@ -1561,7 +1557,7 @@ def make_all(build_number, release_level, pyver, architecture,
     os.mkdir(wheeldir)
 
     # Rebuild Winpython in this wheel dir
-    rebuild_winpython(basedir=basedir, architecture=architecture, targetdir=wheeldir)
+    rebuild_winpython(basedir=basedir, targetdir=wheeldir, architecture=architecture)
 
     #  Copy Every package directory to the wheel directory
 
