Fix Python 3.9 Tests (#284)

Co-authored-by: James Hilton-Balfe <[email protected]>

Author: kalzoo

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         os: [Ubuntu, MacOS, Windows]
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ['3.6.7', 3.7, 3.8, 3.9]
         exclude:
           - os: Windows
             python-version: 3.6

poetry.lock

@@ -12,7 +12,7 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.6"
+python = ">=3.6.2,<4.0"
 black = { version = ">=19.3b0", optional = true }
 dataclasses = { version = "^0.7", python = ">=3.6, <3.7" }
 grpclib = "^0.4.1"
@@ -21,7 +21,7 @@ python-dateutil = "^2.8"
 
 [tool.poetry.dev-dependencies]
 asv = "^0.4.2"
-black = "^20.8b1"
+black = "^21.11b0"
 bpython = "^0.19"
 grpcio-tools = "^1.30.0"
 jinja2 = "^2.11.2"

pyproject.toml

@@ -33,5 +33,5 @@ def outputfile_compiler(output_file: OutputTemplate) -> str:
 
     return black.format_str(
         template.render(output_file=output_file),
-        mode=black.FileMode(target_versions={black.TargetVersion.PY37}),
+        mode=black.Mode(),
     )

src/betterproto/plugin/compiler.py

@@ -60,13 +60,15 @@ async def generate(whitelist: Set[str], verbose: bool):
         if result != 0:
             failed_test_cases.append(test_case_name)
 
-    if failed_test_cases:
+    if len(failed_test_cases) > 0:
         sys.stderr.write(
             "\n\033[31;1;4mFailed to generate the following test cases:\033[0m\n"
         )
         for failed_test_case in failed_test_cases:
             sys.stderr.write(f"- {failed_test_case}\n")
 
+        sys.exit(1)
+
 
 async def generate_test_case_output(
     test_case_input_path: Path, test_case_name: str, verbose: bool
@@ -92,21 +94,41 @@ async def generate_test_case_output(
         protoc(test_case_input_path, test_case_output_path_betterproto, False),
     )
 
-    message = f"Generated output for {test_case_name!r}"
+    if ref_code == 0:
+        print(f"\033[31;1;4mGenerated reference output for {test_case_name!r}\033[0m")
+    else:
+        print(
+            f"\033[31;1;4mFailed to generate reference output for {test_case_name!r}\033[0m"
+        )
+
     if verbose:
-        print(f"\033[31;1;4m{message}\033[0m")
         if ref_out:
+            print("Reference stdout:")
             sys.stdout.buffer.write(ref_out)
+            sys.stdout.buffer.flush()
+
         if ref_err:
+            print("Reference stderr:")
             sys.stderr.buffer.write(ref_err)
+            sys.stderr.buffer.flush()
+
+    if plg_code == 0:
+        print(f"\033[31;1;4mGenerated plugin output for {test_case_name!r}\033[0m")
+    else:
+        print(
+            f"\033[31;1;4mFailed to generate plugin output for {test_case_name!r}\033[0m"
+        )
+
+    if verbose:
         if plg_out:
+            print("Plugin stdout:")
             sys.stdout.buffer.write(plg_out)
+            sys.stdout.buffer.flush()
+
         if plg_err:
+            print("Plugin stderr:")
             sys.stderr.buffer.write(plg_err)
-        sys.stdout.buffer.flush()
-        sys.stderr.buffer.flush()
-    else:
-        print(message)
+            sys.stderr.buffer.flush()
 
     return max(ref_code, plg_code)