remove old method practice in make.py

stonebig · stonebig · commit 160ccb05e08f · 2019-05-03T09:48:22.000+02:00
diff --git a/make.py b/make.py
@@ -390,22 +390,6 @@ def get_package_fname(self, pattern):
             raise RuntimeError(
                 'Could not find required package matching %s' % pattern)
 
-    def install_package(self, pattern, install_options=None):
-        """Install package matching pattern"""
-        fname = self.get_package_fname(pattern)
-        if fname not in [p.fname for p in self.installed_packages]:
-            pack = wppm.Package(fname)
-            if self.simulation:
-                self.distribution._print(pack, "Installing")
-                self.distribution._print_done()
-            else:
-                if install_options:
-                    self.distribution.install(pack, install_options)
-                else:
-                    self.distribution.install(pack,
-                                         install_options=self.install_options)
-            self.installed_packages.append(pack)
-
     def create_batch_script(self, name, contents):
         """Create batch script %WINPYDIR%/name"""
         scriptdir = osp.join(self.winpydir, 'scripts')
@@ -531,19 +515,8 @@ def _print_done(self):
 
     def _extract_python(self):
         """Extracting Python installer, creating distribution object"""
-        self._print("Extracting Python installer")
-        os.mkdir(self.python_dir)
-        if  self.python_fname[-3:] == 'zip':  # Python3.5
-           utils.extract_archive(self.python_fname, targetdir=self.python_dir+r'\..')
-           if self.winpyver < "3.6":
-               # new Python 3.5 trick (https://bugs.python.org/issue23955)
-               pyvenv_file = osp.join(self.python_dir, 'pyvenv.cfg')
-               open(pyvenv_file, 'w').write('applocal=True\n')
-           else:
-               # new Python 3.6 trick (https://docs.python.org/3.6/using/windows.html#finding-modules)
-               # (on hold since 2017-02-16, http://bugs.python.org/issue29578)
-               pypath_file = osp.join(self.python_dir, 'python_onHold._pth')
-               open(pypath_file, 'w').write('python36.zip\nDLLs\nLib\n.\nimport site\n')
+        self._print("Extracting Python .zip version")
+        utils.extract_archive(self.python_fname, targetdir=self.python_dir+r'\..')
         self._print_done()
 
     def _add_msvc_files(self):
@@ -582,19 +555,6 @@ def _check_packages(self):
                       (pack.name, ", ".join([p.version for p in duplicates])),
                       file=sys.stderr)
 
-    def _install_all_other_packages(self):
-        """Try to install all other packages in wheeldir"""
-        print("Installing other packages")
-        my_list = []
-        my_list += os.listdir(self.wheeldir)
-        for fname in my_list:
-            if osp.basename(fname) != osp.basename(self.python_fname):
-                try:
-                    self.install_package(fname)
-                except NotImplementedError:
-                    print("WARNING: unable to install package %s"
-                          % osp.basename(fname), file=sys.stderr)
-
     def _copy_dev_tools(self):
         """Copy dev tools"""
         self._print("Copying tools")
@@ -1417,7 +1377,7 @@ def make(self, remove_existing=True, requirements=None, my_winpydir=None):  #, f
             # pre-patch current pip (until default python has pip 8.0.3)
             self.distribution.patch_standard_packages('pip')
             # not forced update of pip (FIRST) and setuptools here
-            for req in ('pip', 'setuptools'):   
+            for req in ('pip', 'setuptools', 'winpython'):   
                 actions = ["install","--upgrade", req]
                 if self.install_options is not None:
                     actions += self.install_options
@@ -1426,8 +1386,8 @@ def make(self, remove_existing=True, requirements=None, my_winpydir=None):  #, f
                 self.distribution.do_pip_action(actions)
                 self.distribution.patch_standard_packages(req)
                 
-            # install packages in source_dirs (not using requirements.txt)
-            self._install_all_other_packages()
+            # no more directory base package install: use requirements.txt
+            #2019-05-03 removed self._install_all_other_packages()
             if not self.simulation:
                 self._copy_dev_tools()
                 self._copy_dev_docs()
diff --git a/winpython/__init__.py b/winpython/__init__.py
@@ -28,6 +28,6 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '1.12.20190502'
+__version__ = '2.0.20190503'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'
diff --git a/winpython/utils.py b/winpython/utils.py
@@ -429,6 +429,11 @@ def extract_archive(fname, targetdir=None, verbose=False):
     Return the temporary directory path"""
     if targetdir is None:
         targetdir = _create_temp_dir()
+    else:
+        try:
+            os.mkdir(targetdir)
+        except:
+            pass
     if osp.splitext(fname)[1] in ('.zip', '.exe'):
         obj = zipfile.ZipFile(fname, mode="r")
     elif fname.endswith('.tar.gz'):
