@@ -111,35 +111,7 @@ def extract_infos(self):
111111 """Extract package infos (name, version, architecture)
112112 from filename (installer basename)"""
113113 bname = osp .basename (self .fname )
114- if bname .endswith ('.exe' ):
115- # distutils bdist_wininst
116- match = re .match (utils .WININST_PATTERN , bname )
117- if match is not None :
118- (self .name , self .version ,
119- _t0 , _qtver , arch , _t1 , self .pyversion , _t2 ) = match .groups ()
120- self .architecture = 32 if arch == 'win32' else 64
121- return
122- # NSIS
123- pat = r'([a-zA-Z0-9\-\_]*)-Py([0-9\.]*)-x(64|32)-gpl-([0-9\.\-]*[a-z]*)\.exe'
124- match = re .match (pat , bname )
125- if match is not None :
126- self .name , self .pyversion , arch , self .version = match .groups ()
127- self .architecture = int (arch )
128- return
129- # NSIS complement to match PyQt4-4.10.4-gpl-Py3.4-Qt4.8.6-x32.exe
130- pat = r'([a-zA-Z0-9\_]*)-([0-9\.]*[a-z]*)-gpl-Py([0-9\.]*)-.*-x(64|32)\.exe'
131- match = re .match (pat , bname )
132- if match is not None :
133- self .name , self .version , self .pyversion , arch = match .groups ()
134- self .architecture = int (arch )
135- return
136- match = re .match (r'([a-zA-Z0-9\-\_]*)-([0-9\.]*[a-z]*)-py([0-9\.]*)-x(64|32)-([a-z0-9\.\-]*).exe' , bname )
137- if match is not None :
138- self .name , self .version , self .pyversion , arch , _pyqt = match .groups ()
139- self .architecture = int (arch )
140- return
141- # New : Binary wheel case
142- elif bname .endswith (('32.whl' , '64.whl' )):
114+ if bname .endswith (('32.whl' , '64.whl' )):
143115 # {name}[-{bloat}]-{version}-{python tag}-{abi tag}-{platform tag}.whl
144116 # ['sounddevice','0.3.5','py2.py3.cp34.cp35','none','win32']
145117 # PyQt5-5.7.1-5.7.1-cp34.cp35.cp36-none-win_amd64.whl
0 commit comments