Improved codestyle conformancy to PEP8

lib/init.py

@@ -3,6 +3,7 @@ import argparse
 import glob
 import json
 
+
 def init():
     # set up two parsers: first parse config directory,  and add dynamic arguments to full parser
     config_parser = argparse.ArgumentParser(add_help=False)
@@ -29,7 +30,7 @@ def init():
     parser.add_argument('--threads', help='Number of threads used for make [8]', default='8')
     parser.add_argument('--verbose', help='Print build output to screen instead piping it to logile', action='store_true')
 
-    # run config parser and serach  config/*.json to add a build and version argument for it to the full parser
+    # run config parser and search config/*.json to add a build and version argument for it to the full parser
     config_dir = config_parser.parse_known_args()[0].config
     for cf in glob.glob(config_dir+"/*.json"):
         with open(cf, 'r') as f:

lib/installer.py

@@ -6,6 +6,7 @@ import glob
 import shutil
 from lib.ui import bordered,  underlined,  progressbar
 
+
 def install_lib(lib, src_dir, work_dir, inst_dir, comp_cc, comp_cxx, comp_fc, build_threads, verbose):
     print(bordered("Installing " + lib['name'] + " v." + lib['version']))
     if not os.path.exists(src_dir):
@@ -19,7 +20,7 @@ def install_lib(lib,src_dir,work_dir,inst_dir,comp_cc,comp_cxx,comp_fc,build_thr
 
     lib_name = lib['name']
     lib_version = lib['version']
-    if verbose == False:
+    if not verbose:
         logfile_path = work_dir + "/" + lib_name + "-" + lib_version + ".log"
         if os.path.exists(logfile_path):
             os.remove(logfile_path)
@@ -37,6 +38,7 @@ def install_lib(lib,src_dir,work_dir,inst_dir,comp_cc,comp_cxx,comp_fc,build_thr
             print("Error: Download of "+lib_name+" v."+lib_version+" failed!")
             print("See "+logfile_path+" for details")
             sys.exit(0)
+
     # configure library
     os.chdir(work_dir)
     if os.path.exists(work_dir+"/"+lib_name+"-"+lib_version):
@@ -64,7 +66,7 @@ def install_lib(lib,src_dir,work_dir,inst_dir,comp_cc,comp_cxx,comp_fc,build_thr
         build_task = subprocess.Popen(build_command, stdout=logfile, stderr=logfile, shell=True)
         num_objects = int(lib['object files'])
         finished = False
-        while build_task.poll() == None:
+        while build_task.poll() is None:
             if not finished:
                 # bar_width = num_objects
                 # while (bar_width > 100):
@@ -73,7 +75,7 @@ def install_lib(lib,src_dir,work_dir,inst_dir,comp_cc,comp_cxx,comp_fc,build_thr
                 for i in progressbar(range(num_objects),  "Building library: ", bar_width):
                     while len(glob.glob('**/*.o', recursive=True)) < i:
                         time.sleep(0.5)
-                        if(build_task.poll != None):
+                        if build_task.poll is not None:
                             break
                 finished = True
         build_task.wait()
@@ -100,4 +102,3 @@ def install_lib(lib,src_dir,work_dir,inst_dir,comp_cc,comp_cxx,comp_fc,build_thr
     if not os.path.exists(build_output_path):
             os.makedirs(build_output_path)
     shutil.copyfile(logfile_path, build_output_path+"/"+lib_name+".log")
-

lib/shell.py

@@ -1,6 +1,7 @@
 import subprocess
 import sys
 
+
 def get_from_command(command):
     ret = subprocess.check_output(command).decode(sys.stdout.encoding)
     return ret

lib/sort.py

@@ -19,6 +19,7 @@ def topological_sort(source):
         emitted = next_emitted
     return emitted
 
+
 def sort_libs_by_dependencies(selected_libs):
     deplist = []
     for lib in selected_libs:

lib/toolchain.py

@@ -1,6 +1,7 @@
 import os
 from lib.shell import get_from_command
 
+
 def get_compiler_version(compiler):
     if compiler == "gnu":
         cc = "gcc"
@@ -11,6 +12,7 @@ def get_compiler_version(compiler):
     compstr = get_from_command([cc, "-dumpversion"]).strip()
     return compstr
 
+
 def get_mpi_version(mpi):
     if mpi == "hpcx":
         hpcx_dir = os.getenv('HPCX_DIR')

lib/ui.py

@@ -1,18 +1,21 @@
 import sys
 import time
 
+
 def progressbar(it, prefix="", size=60, out=sys.stdout):
     count = len(it)
+
     def show(j):
         x = int(size*j/count)
-        print("{}[{}{}] {}/{}".format(prefix, u"█"*x, "."*(size-x), j, count),
+        print("{}[{}{}] {}/{}".format(prefix, u"█"*x, "."*(size-x), j, count), end='\r', file=out, flush=True)
-                end='\r', file=out, flush=True)
+
     show(0)
     for i, item in enumerate(it):
         yield item
         show(i+1)
     print("", flush=True, file=out)
 
+
 def bordered(text):
     lines = text.splitlines()
     width = max(len(s) for s in lines)
@@ -22,6 +25,7 @@ def bordered(text):
     res.append('└' + '─' * width + '┘')
     return '\n'.join(res)
 
+
 def underlined(text):
     lines = text.splitlines()
     width = max(len(s) for s in lines)
@@ -31,6 +35,7 @@ def underlined(text):
     res.append('─' * width)
     return '\n'.join(res)
 
+
 def print_welcome(script_version, compiler, compiler_version, mpi, mpi_version, instDir, installs):
     out = underlined("Patricks Simple Library Installer " + script_version)
     out = out + "\n" + "Compiler: " + compiler.upper() + ", Version: " + compiler_version

libinstaller.py

@@ -29,9 +29,9 @@ verbose = arg_namespace.verbose
 selected_libs = []
 ignore_names = ["config", "mpi", "compiler", "prefix", "src", "work", "threads", "verbose", "version"]
 for lib_name in args:
-    if (lib_name not in ignore_names and "version" not in lib_name):
+    if lib_name not in ignore_names and "version" not in lib_name:
         install = getattr(arg_namespace, lib_name)
-        if (install == True):
+        if install:
             version = getattr(arg_namespace, lib_name+"_version")
             config_file = config_dir + "/" + lib_name + ".json"
             with open(config_file, 'r') as cf: