Skip to content

Commit 35450f2

Browse files
author
stonebig
committed
pep8 again
1 parent f9fb0a5 commit 35450f2

1 file changed

Lines changed: 16 additions & 15 deletions

File tree

‎make.py‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ def get_tool_path(relpath, checkfunc):
218218
Name | Version | Description
219219
-----|---------|------------
220220
[Python](http://www.python.org/) | %s | %s
221-
%s""" % (self.winpyver , self.winpyver, self.flavor, '\n'.join(tools),
221+
%s""" % (self.winpyver, self.winpyver, self.flavor, '\n'.join(tools),
222222
self.python_fullversion, python_desc, '\n'.join(packages))
223223

224224
@property
@@ -292,13 +292,13 @@ def docsdirs(self):
292292
return [osp.join(osp.dirname(osp.abspath(__file__)), 'docs')] + self._docsdirs
293293
else:
294294
return self._docsdirs
295-
295+
296296
def get_package_fname(self, pattern):
297297
"""Get package matching pattern in instdirs"""
298298
for path in (self.instdirs + self.srcdirs):
299299
for fname in os.listdir(path):
300300
match = re.match(pattern, fname)
301-
if match is not None or pattern==fname:
301+
if match is not None or pattern == fname:
302302
return osp.abspath(osp.join(path, fname))
303303
else:
304304
raise RuntimeError(
@@ -316,7 +316,7 @@ def install_package(self, pattern, install_options=None):
316316
if install_options:
317317
self.distribution.install(pack, install_options)
318318
else:
319-
self.distribution.install(pack,
319+
self.distribution.install(pack,
320320
install_options=self.install_options)
321321
self.installed_packages.append(pack)
322322

@@ -365,7 +365,7 @@ def create_launcher(self, name, icon, command=None,
365365

366366
# handle well Flavor with R included
367367
data += [('R_HOME', '$EXEDIR%s' % r'\tools\R'),
368-
('JULIA_HOME','$EXEDIR%s' % r'\tools\Julia\bin'),
368+
('JULIA_HOME', '$EXEDIR%s' % r'\tools\Julia\bin'),
369369
('JULIA', '$EXEDIR%s' % r'\tools\Julia\bin\julia.exe')]
370370

371371
if settingspath is not None:
@@ -444,7 +444,7 @@ def _check_packages(self):
444444
print("Checking packages")
445445
packages = []
446446
my_plist = []
447-
for m in (self.srcdirs + self.instdirs):
447+
for m in (self.srcdirs + self.instdirs):
448448
my_plist += os.listdir(m)
449449
for fname0 in my_plist:
450450
fname = self.get_package_fname(fname0)
@@ -471,28 +471,29 @@ def _check_packages(self):
471471
def _install_required_packages(self):
472472
"""Installing required packages"""
473473
print("Installing required packages")
474+
474475
# Install First these two packages to support wheel format
475476
if self.python_version == '3.3':
476477
self.install_package('get-pip-([0-9\.]*[a-z]*[0-9]?).%s(-py%s)?.exe'
477-
% (self.py_arch, self.python_version))
478-
#else:
478+
% (self.py_arch, self.python_version))
479+
# else:
479480
self.install_package('%s-([0-9\.]*[a-z]*[0-9]?)(.*)(\.exe|\.whl)' %
480-
'setuptools' , install_options=['--upgrade','--no-deps'])
481+
'setuptools', install_options=['--upgrade', '--no-deps'])
481482
self.install_package('%s-([0-9\.]*[a-z]*[0-9]?)(.*)(\.exe|\.whl)' %
482-
'pip', install_options=['--upgrade','--no-deps'])
483+
'pip', install_options=['--upgrade', '--no-deps'])
483484

484485
# Install 'main packages' first (was before Wheel idea, keep for now)
485-
for happy_few in['pywin32', 'wheel', 'six', 'PyQt4', 'PyQwt', 'spyder', 'numpy', 'scipy',
486-
'matplotlib', 'pandas']:
486+
for happy_few in['pywin32', 'wheel', 'six', 'PyQt4', 'PyQwt', 'spyder',
487+
'numpy', 'scipy', 'matplotlib', 'pandas']:
487488
# can be a wheel now
488489
self.install_package(
489-
'%s-([0-9\.]*[a-z\+]*[0-9]?)(.*)(\.exe|\.whl)' % happy_few)
490+
'%s-([0-9\.]*[a-z\+]*[0-9]?)(.*)(\.exe|\.whl)' % happy_few)
490491

491492
def _install_all_other_packages(self):
492493
"""Try to install all other packages in instdirs"""
493494
print("Installing other packages")
494495
my_list = []
495-
for m in (self.srcdirs + self.instdirs):
496+
for m in (self.srcdirs + self.instdirs):
496497
my_list += os.listdir(m)
497498
for fname in my_list:
498499
if osp.basename(fname) != osp.basename(self.python_fname):
@@ -519,7 +520,7 @@ def _copy_dev_tools(self):
519520
def _copy_dev_docs(self):
520521
"""Copy dev docs"""
521522
self._print("Copying docs")
522-
docsdir = osp.join(self.winpydir, self.python_name , 'Scripts', 'docs')
523+
docsdir = osp.join(self.winpydir, self.python_name, 'Scripts', 'docs')
523524
os.mkdir(docsdir)
524525
for dirname in self.docsdirs:
525526
for name in os.listdir(dirname):

0 commit comments

Comments
 (0)