Browse Source

`build/scripts` ya style --py

iaz1607 1 year ago
parent
commit
8951ddf780

+ 0 - 1
build/scripts/append_file.py

@@ -2,7 +2,6 @@ import sys
 
 
 
 
 if __name__ == "__main__":
 if __name__ == "__main__":
-
     file_path = sys.argv[1]
     file_path = sys.argv[1]
     with open(file_path, "a") as f:
     with open(file_path, "a") as f:
         for text in sys.argv[2:]:
         for text in sys.argv[2:]:

+ 7 - 2
build/scripts/autotar_gendirs.py

@@ -15,7 +15,9 @@ def pack_dir(dir_path, dest_path):
     dir_path = os.path.abspath(dir_path)
     dir_path = os.path.abspath(dir_path)
     for tar_exe in ('/usr/bin/tar', '/bin/tar'):
     for tar_exe in ('/usr/bin/tar', '/bin/tar'):
         if is_exe(tar_exe):
         if is_exe(tar_exe):
-            subprocess.check_call([tar_exe, '-cf', dest_path, '-C', os.path.dirname(dir_path), os.path.basename(dir_path)])
+            subprocess.check_call(
+                [tar_exe, '-cf', dest_path, '-C', os.path.dirname(dir_path), os.path.basename(dir_path)]
+            )
             break
             break
     else:
     else:
         with tarfile.open(dest_path, 'w') as out:
         with tarfile.open(dest_path, 'w') as out:
@@ -55,7 +57,10 @@ def main(args):
     elif args.unpack:
     elif args.unpack:
         for tared_dir in args.dirs:
         for tared_dir in args.dirs:
             if not tared_dir.endswith(args.ext):
             if not tared_dir.endswith(args.ext):
-                print("Requested to unpack '{}' which do not have required extension '{}'".format(tared_dir, args.ext), file=sys.stderr)
+                print(
+                    "Requested to unpack '{}' which do not have required extension '{}'".format(tared_dir, args.ext),
+                    file=sys.stderr,
+                )
                 return 1
                 return 1
             dest = os.path.dirname(tared_dir)
             dest = os.path.dirname(tared_dir)
             unpack_dir(tared_dir, dest)
             unpack_dir(tared_dir, dest)

+ 8 - 6
build/scripts/build_catboost.py

@@ -1,9 +1,9 @@
 import sys
 import sys
 import os
 import os
 import shutil
 import shutil
-import re
 import subprocess
 import subprocess
 
 
+
 def get_value(val):
 def get_value(val):
     dct = val.split('=', 1)
     dct = val.split('=', 1)
     if len(dct) > 1:
     if len(dct) > 1:
@@ -13,7 +13,6 @@ def get_value(val):
 
 
 class BuildCbBase(object):
 class BuildCbBase(object):
     def run(self, cbmodel, cbname, cb_cpp_path):
     def run(self, cbmodel, cbname, cb_cpp_path):
-
         data_prefix = "CB_External_"
         data_prefix = "CB_External_"
         data = data_prefix + cbname
         data = data_prefix + cbname
         datasize = data + "Size"
         datasize = data + "Size"
@@ -33,17 +32,20 @@ class BuildCbBase(object):
         cb_cpp_tmp.write("        extern const ui32 {1}{0}Size;\n".format(cbname, data_prefix))
         cb_cpp_tmp.write("        extern const ui32 {1}{0}Size;\n".format(cbname, data_prefix))
         cb_cpp_tmp.write("    }\n")
         cb_cpp_tmp.write("    }\n")
         cb_cpp_tmp.write("}\n")
         cb_cpp_tmp.write("}\n")
-        archiverCall = subprocess.Popen([self.archiver, "-q", "-p", "-o", ro_data_path, cbmodel], stdout=None, stderr=subprocess.PIPE)
+        archiverCall = subprocess.Popen(
+            [self.archiver, "-q", "-p", "-o", ro_data_path, cbmodel], stdout=None, stderr=subprocess.PIPE
+        )
         archiverCall.wait()
         archiverCall.wait()
         cb_cpp_tmp.write("extern {0} {1};\n".format(cbtype, cbname))
         cb_cpp_tmp.write("extern {0} {1};\n".format(cbtype, cbname))
         cb_cpp_tmp.write("{0} {1}{2};".format(cbtype, cbname, cbload))
         cb_cpp_tmp.write("{0} {1}{2};".format(cbtype, cbname, cbload))
         cb_cpp_tmp.close()
         cb_cpp_tmp.close()
         shutil.move(cb_cpp_tmp_path, cb_cpp_path)
         shutil.move(cb_cpp_tmp_path, cb_cpp_path)
 
 
+
 class BuildCb(BuildCbBase):
 class BuildCb(BuildCbBase):
     def run(self, argv):
     def run(self, argv):
         if len(argv) < 5:
         if len(argv) < 5:
-            print >>sys.stderr, "BuildCb.Run(<ARCADIA_ROOT> <archiver> <mninfo> <mnname> <cppOutput> [params...])"
+            print >> sys.stderr, "BuildCb.Run(<ARCADIA_ROOT> <archiver> <mninfo> <mnname> <cppOutput> [params...])"
             sys.exit(1)
             sys.exit(1)
 
 
         self.SrcRoot = argv[0]
         self.SrcRoot = argv[0]
@@ -62,10 +64,10 @@ def build_cb_f(argv):
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
     if len(sys.argv) < 2:
     if len(sys.argv) < 2:
-        print >>sys.stderr, "Usage: build_cb.py <funcName> <args...>"
+        print >> sys.stderr, "Usage: build_cb.py <funcName> <args...>"
         sys.exit(1)
         sys.exit(1)
 
 
-    if (sys.argv[2:]):
+    if sys.argv[2:]:
         globals()[sys.argv[1]](sys.argv[2:])
         globals()[sys.argv[1]](sys.argv[2:])
     else:
     else:
         globals()[sys.argv[1]]()
         globals()[sys.argv[1]]()

+ 2 - 2
build/scripts/build_info_gen.py

@@ -46,8 +46,8 @@ def get_compiler_info(compiler):
         env['LOCALE'] = 'C'
         env['LOCALE'] = 'C'
         compiler_ver_out = (
         compiler_ver_out = (
             subprocess.Popen(compiler_ver_cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env)
             subprocess.Popen(compiler_ver_cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env)
-                .stdout.read()
-                .decode('utf-8')
+            .stdout.read()
+            .decode('utf-8')
         )
         )
     return "\n".join(
     return "\n".join(
         # fmt: off
         # fmt: off

+ 6 - 1
build/scripts/build_java_codenav_index.py

@@ -29,7 +29,11 @@ def just_do_it(argv):
         arcadia_root: fake_arcadia_root,
         arcadia_root: fake_arcadia_root,
         build_root: fake_build_root,
         build_root: fake_build_root,
     }
     }
-    modify_sources_file(sources_file, os.path.join(os.path.dirname(sources_file), '_' + os.path.basename(sources_file)), fake_source_roots)
+    modify_sources_file(
+        sources_file,
+        os.path.join(os.path.dirname(sources_file), '_' + os.path.basename(sources_file)),
+        fake_source_roots,
+    )
     kindex_data_root = '{}/kindex'.format(os.path.join(build_root, os.path.dirname(corpus_name)))
     kindex_data_root = '{}/kindex'.format(os.path.join(build_root, os.path.dirname(corpus_name)))
     if not os.path.exists(kindex_data_root):
     if not os.path.exists(kindex_data_root):
         os.makedirs(kindex_data_root)
         os.makedirs(kindex_data_root)
@@ -45,5 +49,6 @@ def just_do_it(argv):
         os.unlink(fake_arcadia_root)
         os.unlink(fake_arcadia_root)
         os.unlink(fake_build_root)
         os.unlink(fake_build_root)
 
 
+
 if __name__ == '__main__':
 if __name__ == '__main__':
     just_do_it(sys.argv[1:])
     just_do_it(sys.argv[1:])

+ 15 - 3
build/scripts/build_java_with_error_prone.py

@@ -14,7 +14,7 @@ JAVA10_EXPORTS = [
     '--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED',
     '--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED',
     '--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED',
     '--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED',
     '--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED',
     '--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED',
-    '--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED'
+    '--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED',
 ]
 ]
 
 
 
 
@@ -27,9 +27,21 @@ def just_do_it(argv):
         for f in ERROR_PRONE_FLAGS:
         for f in ERROR_PRONE_FLAGS:
             if f in javac_cmd:
             if f in javac_cmd:
                 javac_cmd.remove(f)
                 javac_cmd.remove(f)
-        os.execv(java, [java] + JAVA10_EXPORTS + ['-processorpath', error_prone_tool, '-XDcompilePolicy=byfile'] + [(' '.join(['-Xplugin:ErrorProne'] + ERROR_PRONE_FLAGS))] + javac_cmd)
+        os.execv(
+            java,
+            [java]
+            + JAVA10_EXPORTS
+            + ['-processorpath', error_prone_tool, '-XDcompilePolicy=byfile']
+            + [(' '.join(['-Xplugin:ErrorProne'] + ERROR_PRONE_FLAGS))]
+            + javac_cmd,
+        )
     else:
     else:
-        os.execv(java, [java, '-Xbootclasspath/p:' + error_prone_tool, 'com.google.errorprone.ErrorProneCompiler'] + ERROR_PRONE_FLAGS + javac_cmd)
+        os.execv(
+            java,
+            [java, '-Xbootclasspath/p:' + error_prone_tool, 'com.google.errorprone.ErrorProneCompiler']
+            + ERROR_PRONE_FLAGS
+            + javac_cmd,
+        )
 
 
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':

+ 13 - 3
build/scripts/build_java_with_error_prone2.py

@@ -55,7 +55,7 @@ def parse_args(argv):
             parsed.append(argv[i])
             parsed.append(argv[i])
             if len(parsed) >= 3:
             if len(parsed) >= 3:
                 break
                 break
-    return parsed + [argv[i + 1:]]
+    return parsed + [argv[i + 1 :]]
 
 
 
 
 def just_do_it(argv):
 def just_do_it(argv):
@@ -74,9 +74,19 @@ def just_do_it(argv):
             classpath = get_classpath(javac_cmd)
             classpath = get_classpath(javac_cmd)
             if classpath:
             if classpath:
                 error_prone_tool = error_prone_tool + os.pathsep + classpath
                 error_prone_tool = error_prone_tool + os.pathsep + classpath
-        cmd = [javac] + JAVA10_EXPORTS + ['-processorpath', error_prone_tool, '-XDcompilePolicy=byfile'] + [(' '.join(['-Xplugin:ErrorProne'] + ERROR_PRONE_FLAGS))] + javac_cmd
+        cmd = (
+            [javac]
+            + JAVA10_EXPORTS
+            + ['-processorpath', error_prone_tool, '-XDcompilePolicy=byfile']
+            + [(' '.join(['-Xplugin:ErrorProne'] + ERROR_PRONE_FLAGS))]
+            + javac_cmd
+        )
     else:
     else:
-        cmd = [java, '-Xbootclasspath/p:' + error_prone_tool, 'com.google.errorprone.ErrorProneCompiler'] + ERROR_PRONE_FLAGS + javac_cmd
+        cmd = (
+            [java, '-Xbootclasspath/p:' + error_prone_tool, 'com.google.errorprone.ErrorProneCompiler']
+            + ERROR_PRONE_FLAGS
+            + javac_cmd
+        )
     if platform.system() == 'Windows':
     if platform.system() == 'Windows':
         sys.exit(subprocess.Popen(cmd).wait())
         sys.exit(subprocess.Popen(cmd).wait())
     else:
     else:

+ 5 - 1
build/scripts/c_templates/ya.make

@@ -1,7 +1,11 @@
 OWNER(g:ymake)
 OWNER(g:ymake)
 
 
 LIBRARY(dummy-vcs)
 LIBRARY(dummy-vcs)
+
 NO_PLATFORM()
 NO_PLATFORM()
 
 
-SRCS(svn_interface.c)
+SRCS(
+    svn_interface.c
+)
+
 END()
 END()

+ 1 - 1
build/scripts/cgo1_wrapper.py

@@ -4,7 +4,7 @@ import subprocess
 import sys
 import sys
 
 
 
 
-CGO1_SUFFIX='.cgo1.go'
+CGO1_SUFFIX = '.cgo1.go'
 
 
 
 
 def call(cmd, cwd, env=None):
 def call(cmd, cwd, env=None):

+ 4 - 4
build/scripts/clang_tidy.py

@@ -113,20 +113,20 @@ def find_header(p, h):
     raise Exception('can not find inc dir')
     raise Exception('can not find inc dir')
 
 
 
 
-def fix_cmd(l, bin):
+def fix_cmd(cmd, bin):
     sp = '--sysroot='
     sp = '--sysroot='
 
 
-    for x in l:
+    for x in cmd:
         if '-isystem' in x and '/share/include' in x:
         if '-isystem' in x and '/share/include' in x:
             # reparent compiler headers dir into clang-tidy install path
             # reparent compiler headers dir into clang-tidy install path
             yield '-isystem' + find_header(os.path.dirname(os.path.dirname(bin)), 'stddef.h')
             yield '-isystem' + find_header(os.path.dirname(os.path.dirname(bin)), 'stddef.h')
         elif x.startswith(sp):
         elif x.startswith(sp):
             yield '-nostdinc'
             yield '-nostdinc'
-            sr = x[len(sp):]
+            sr = x[len(sp) :]
             yield '-isystem' + sr + '/usr/include'
             yield '-isystem' + sr + '/usr/include'
             yield '-isystem' + sr + '/usr/include/x86_64-linux-gnu'
             yield '-isystem' + sr + '/usr/include/x86_64-linux-gnu'
         elif x == '-nostdinc++':
         elif x == '-nostdinc++':
-            if '.c.o' in str(l):
+            if '.c.o' in str(cmd):
                 pass
                 pass
             else:
             else:
                 yield x
                 yield x

Some files were not shown because too many files changed in this diff