Autoformat files after rendering

danielgtaylor · danielgtaylor · commit 7e2dc595dbe4 · 2019-10-28T20:44:50.000-07:00
diff --git a/Pipfile b/Pipfile
@@ -15,6 +15,7 @@ protobuf = "*"
 jinja2 = "*"
 grpclib = "*"
 stringcase = "*"
+black = "*"
 
 [requires]
 python_version = "3.7"
@@ -23,3 +24,6 @@ python_version = "3.7"
 plugin = "protoc --plugin=protoc-gen-custom=betterproto/plugin.py --custom_out=output"
 generate = "python betterproto/tests/generate.py"
 test = "pytest ./betterproto/tests"
+
+[pipenv]
+allow_prereleases = true
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/betterproto/plugin.py b/betterproto/plugin.py
@@ -9,13 +9,14 @@
 from typing import Any, List, Tuple
 
 try:
-    import jinja2
+    import black
 except ImportError:
     print(
-        "Unable to import `jinja2`. Did you install the compiler feature with `pip install betterproto[compiler]`?"
+        "Unable to import `black` formatter. Did you install the compiler feature with `pip install betterproto[compiler]`?"
     )
     raise SystemExit(1)
 
+import jinja2
 import stringcase
 
 from google.protobuf.compiler import plugin_pb2 as plugin
@@ -398,8 +399,11 @@ def generate_code(request, response):
         # print(filename, file=sys.stderr)
         f.name = filename.replace(".", os.path.sep) + ".py"
 
-        # f.content = json.dumps(output, indent=2)
-        f.content = template.render(description=output).rstrip("\n") + "\n"
+        # Render and then format the output file.
+        f.content = black.format_str(
+            template.render(description=output),
+            mode=black.FileMode(target_versions=set([black.TargetVersion.PY37])),
+        )
 
     inits = set([""])
     for f in response.file:
diff --git a/setup.py b/setup.py
@@ -19,6 +19,6 @@
     package_data={"betterproto": ["py.typed", "templates/template.py"]},
     python_requires=">=3.7",
     install_requires=["grpclib", "stringcase"],
-    extras_require={"compiler": ["jinja2", "protobuf"]},
+    extras_require={"compiler": ["black", "jinja2", "protobuf"]},
     zip_safe=False,
 )

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@`
`19`	`19`	`package_data={"betterproto": ["py.typed", "templates/template.py"]},`
`20`	`20`	`python_requires=">=3.7",`
`21`	`21`	`install_requires=["grpclib", "stringcase"],`
`22`		`- extras_require={"compiler": ["jinja2", "protobuf"]},`
	`22`	`+ extras_require={"compiler": ["black", "jinja2", "protobuf"]},`
`23`	`23`	`zip_safe=False,`
`24`	`24`	`)`