fixup! Add github actions CI

CZ-NIC · Jun 27, 2022 · 6bab690 · 6bab690
1 parent 8f55c98
commit 6bab690
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/setuptools_grpc/build_grpc.py b/setuptools_grpc/build_grpc.py
@@ -35,14 +35,14 @@ def finalize_options(self):
 
         proto_files, grpc_files = [], []
 
-        for fileglob in filter(None, listify_value(self.proto_files, '\n')):
+        for fileglob in (v for v in listify_value(self.proto_files, '\n') if v):
             proto_files.extend([
                 filename[len(self.proto_path)+1:]
                 for filename in glob(os.path.join(self.proto_path, fileglob), recursive=True)
             ])
         self.proto_files = proto_files
 
-        for fileglob in filter(None, listify_value(self.grpc_files, '\n')):
+        for fileglob in (v for v in listify_value(self.proto_files, '\n') if v):
             grpc_files.extend([
                 filename[len(self.proto_path)+1:]
                 for filename in glob(os.path.join(self.proto_path, fileglob), recursive=True)
@@ -57,13 +57,19 @@ def run(self):
         # Generate protobuf modules
         log.info('building protos')
         for proto_file in self.proto_files:
-            log.info('generating %s -> %s', proto_file, py_module_name(proto_file))
-            if protoc_main(args + ['--python_out', self.output_path, os.path.join(self.proto_path, proto_file)]):
-                raise RuntimeError('grpc_build failed')
+            log.info('generating %s → %s', proto_file, py_module_name(proto_file))
+        if protoc_main(
+            args + ['--python_out', self.output_path]
+            + [os.path.join(self.proto_path, proto_file) for proto_file in self.proto_files]
+        ):
+            raise RuntimeError('grpc_build failed')
 
         # Generate grpc modules
         log.info('building grpc')
         for grpc_file in self.grpc_files:
-            log.info('generating %s -> %s', grpc_file, grpc_py_module_name(grpc_file))
-            if protoc_main(args + ['--grpc_python_out', self.output_path, os.path.join(self.proto_path, grpc_file)]):
-                raise RuntimeError('grpc_build failed')
+            log.info('generating %s → %s', grpc_file, grpc_py_module_name(grpc_file))
+        if protoc_main(
+            args + ['--grpc_python_out', self.output_path]
+            + [os.path.join(self.proto_path, grpc_file) for grpc_file in self.grpc_files]
+        ):
+            raise RuntimeError('grpc_build failed')