fix: generate packages in the output directory

cpcloud · Nov 24, 2021 · a00cc06 · a00cc06
1 parent ae75384
commit a00cc06
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/protoletariat/fdsetgen.py b/protoletariat/fdsetgen.py
@@ -54,6 +54,11 @@ def fix_imports(
         if create_init:
             generated_python_dir.joinpath("__init__.py").touch(exist_ok=True)
 
+            # recursively create packages
+            for dir_entry in generated_python_dir.rglob("*"):
+                if dir_entry.is_dir():
+                    dir_entry.joinpath("__init__.py").touch(exist_ok=True)
+
 
 class Protoc(FileDescriptorSetGenerator):
     def __init__(

diff --git a/protoletariat/tests/test_rewrite.py b/protoletariat/tests/test_rewrite.py
@@ -477,3 +477,10 @@ def test_nested_buf(
         importlib.import_module("out_nested")
         importlib.import_module("out_nested.a.b.c.thing2_pb2")
         importlib.import_module("out_nested.d.thing1_pb2")
+
+    # check that we created packages in the correct locations
+    assert out.joinpath("__init__.py").exists()
+    assert out.joinpath("a", "__init__.py").exists()
+    assert out.joinpath("a", "b", "__init__.py").exists()
+    assert out.joinpath("a", "b", "c", "__init__.py").exists()
+    assert out.joinpath("d", "__init__.py").exists()