fix style

Author: rekby

generate_protoc.py

@@ -35,8 +35,8 @@ def remove_protos(rootdirpath: str):
                 os.remove(os.path.join(root, file))
 
 
-def fiximports(rootdir: str):
-    flake_ignore_line = "# flake8: " + "noqa" # prevent ignore the file
+def fix_file_contents(rootdir: str):
+    flake_ignore_line = "# flake8: " + "noqa"  # prevent ignore the file
 
     for dirpath, _, fnames in os.walk(rootdir):
         for fname in fnames:
@@ -45,8 +45,12 @@ def fiximports(rootdir: str):
 
             with open(os.path.join(dirpath, fname), 'r+t') as f:
                 content = f.read()
+
+                # Fix imports
                 content = content.replace("from protos", "from ydb._grpc.protos")
-                content += "\n" + flake_ignore_line + "\n"
+
+                # Add ignore style check
+                content = content.replace("# -*- coding: utf-8 -*-", "# -*- coding: utf-8 -*-\n" + flake_ignore_line)
                 f.seek(0)
                 f.write(content)
 
@@ -59,8 +63,8 @@ def generate_protobuf(src_proto_dir: str, dst_dir: str):
 
     command.build_package_protos(dst_dir)
     remove_protos(dst_dir)
-    fiximports(dst_dir)
+    fix_file_contents(dst_dir)
 
 
 if __name__ == '__main__':
-    generate_protobuf("ydb-api-protos", "ydb/_grpc")
+    generate_protobuf("ydb-api-protos", "ydb/_grpc")

tox.ini

@@ -46,13 +46,13 @@ commands =
 skip_install = true
 deps = black
 commands =
-    black ydb examples tests --extend-exclude ydb/public/api
+    black ydb examples tests --extend-exclude ydb/_grpc
 
 [testenv:black]
 skip_install = true
 deps = black
 commands =
-    black --check ydb examples tests --extend-exclude ydb/public/api
+    black --check ydb examples tests --extend-exclude ydb/_grpc
 
 [testenv:pylint]
 deps = pylint

ydb/_grpc/__init__.py

@@ -1,2 +0,0 @@
-
-# flake8: noqa

ydb/_grpc/protos/__init__.py

@@ -1,2 +0,0 @@
-
-# flake8: noqa

ydb/_grpc/protos/annotations/__init__.py

@@ -1,2 +0,0 @@
-
-# flake8: noqa

ydb/_grpc/protos/annotations/validation_pb2.py

@@ -2,5 +2,3 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
-
-# flake8: noqa

ydb/_grpc/protos/annotations/validation_pb2_grpc.py

@@ -2,5 +2,3 @@
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
-
-# flake8: noqa