Merge pull request #443 from stonebig/master

stonebig · web-flow · commit db974eaa321c · 2016-11-27T13:03:07.000+01:00
support complex wheel names
diff --git a/winpython/data/packages.ini b/winpython/data/packages.ini
@@ -349,6 +349,9 @@ description=IDLE Extensions for Python
 [idna]
 description=Internationalized Domain Names in Applications (IDNA)
 
+[imageio]
+description=Library for reading and writing a wide range of image, video, scientific, and volumetric data formats.
+
 [imagesize]
 description=Getting image size from png/jpeg/jpeg2000/gif file
 
diff --git a/winpython/utils.py b/winpython/utils.py
@@ -483,7 +483,9 @@ def extract_archive(fname, targetdir=None, verbose=False):
 
 def get_source_package_infos(fname):
     """Return a tuple (name, version) of the Python source package"""
-    match = re.match(SOURCE_PATTERN, osp.basename(fname).replace("+mkl-","-"))
+    if fname[-4:] == '.whl':
+        return osp.basename(fname).split("-")[:2]
+    match = re.match(SOURCE_PATTERN, osp.basename(fname))
     if match is not None:
         return match.groups()[:2]
 
diff --git a/winpython/wppm.py b/winpython/wppm.py
@@ -140,15 +140,13 @@ def extract_infos(self):
                 return
         # New : Binary wheel case
         elif bname.endswith(('32.whl', '64.whl')):
-            match = re.match(utils.WHEELBIN_PATTERN, bname)
-            # typical match is ('scipy', '0.14.1rc1', '34', 'win32')
-            if match is not None:
-                self.name, self.version,  self.pywheel , arch  = match.groups()
-                # self.pywheel version is '34' not 3.4
-                self.pyversion = self.pywheel[:1] + '.' + self.pywheel[1:]
-                # wheel arch is 'win32' or 'win_amd64'
-                self.architecture = 32 if arch == 'win32' else 64
-                return
+            # {name}-{version}-{python tag}-{abi tag}-{platform tag}.whl 
+            # ['sounddevice','0.3.5','py2.py3.cp34.cp35','none','win32']             
+            self.name, self.version, self.pywheel, abi, arch = bname[:-4].split("-")
+            self.pyversion = None # Let's ignore this  self.pywheel
+            # wheel arch is 'win32' or 'win_amd64'
+            self.architecture = 32 if arch == 'win32' else 64
+            return
         elif bname.endswith(('.zip', '.tar.gz', '.whl')):
             # distutils sdist
             infos = utils.get_source_package_infos(bname)
@@ -359,7 +357,7 @@ def get_installed_packages(self):
 
             # create pip package list
             wppip = [Package('%s-%s-py2.py3-none-any.whl' %
-                     (i[0].lower(), i[1])) for i in pip_list]
+                     (i[0].replace('-', '_').lower(), i[1])) for i in pip_list]
             # pip package version is supposed better
             already = set(b.name.replace('-', '_') for b in wppip+wininst)
             wppm = wppip + [i for i in wppm
