Set target version to 3.10 (#60)

Author: AdrienVannson

.pre-commit-config.yaml

@@ -3,7 +3,7 @@ ci:
 
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.4
+    rev: v0.9.3
     hooks:
       - id: ruff-format
         args: ["--diff", "src", "tests"]

poetry.lock

@@ -16,9 +16,6 @@ dynamic = ["dependencies"]
 Documentation = "https://betterproto.github.io/python-betterproto2/"
 Repository = "https://github.com/betterproto/python-betterproto2"
 
-[project.scripts]
-protoc-gen-python_betterproto = "betterproto2.plugin:main"
-
 [project.optional-dependencies]
 rust-codec = ["betterproto2-rust-codec"]
 
@@ -41,7 +38,7 @@ tox = "^4.0.0"
 mkdocs-material = {version = "^9.5.49", python = ">=3.10"}
 mkdocstrings = {version = "^0.27.0", python = ">=3.10", extras = ["python"]}
 # The Ruff version is pinned. To update it, also update it in .pre-commit-config.yaml
-ruff = { version = "~0.7.4" }
+ruff = { version = "~0.9.3" }
 ipykernel = "^6.29.5"
 
 [tool.poetry.group.test.dependencies]
@@ -56,7 +53,7 @@ cachelib = "^0.10.2"
 
 [tool.ruff]
 extend-exclude = ["tests/output_*", "src/betterproto2/lib"]
-target-version = "py38"
+target-version = "py310"
 line-length = 120
 
 [tool.ruff.lint]

pyproject.toml

@@ -259,7 +259,7 @@ def dump_varint(value: int, stream: "SupportsWrite[bytes]") -> None:
     """Encodes a single varint and dumps it into the provided stream."""
     if value < -(1 << 63):
         raise ValueError(
-            "Negative value is not representable as a 64-bit integer" " - unable to encode a varint within 10 bytes."
+            "Negative value is not representable as a 64-bit integer - unable to encode a varint within 10 bytes."
         )
     elif value < 0:
         value += 1 << 64
@@ -1335,7 +1335,7 @@ def _validate_field_groups(cls, values):
 
             if len(set_fields) > 1:
                 set_fields_str = ", ".join(set_fields)
-                raise ValueError(f"Group {group} has more than one value;" f" fields {set_fields_str} are not None")
+                raise ValueError(f"Group {group} has more than one value; fields {set_fields_str} are not None")
 
         return values
 

src/betterproto2/__init__.py

@@ -145,7 +145,7 @@ async def generate_test_case_output(test_case_input_path: Path, test_case_name:
         "Usage: python generate.py [-h] [-v] [DIRECTORIES or NAMES]",
         "Generate python classes for standard tests.",
         "",
-        "DIRECTORIES    One or more relative or absolute directories of test-cases to generate" "classes for.",
+        "DIRECTORIES    One or more relative or absolute directories of test-cases to generateclasses for.",
         "               python generate.py inputs/bool inputs/double inputs/enum",
         "",
         "NAMES          One or more test-case names to generate classes for.",

src/betterproto2/internal_lib/google/protobuf/__init__.py

@@ -26,12 +26,12 @@ async def _test_client(client: ThingServiceClient, name="clean room", **kwargs):
 
 def _assert_request_meta_received(deadline, metadata):
     def server_side_test(stream):
-        assert stream.deadline._timestamp == pytest.approx(
-            deadline._timestamp, 1
-        ), "The provided deadline should be received serverside"
-        assert (
-            stream.metadata["authorization"] == metadata["authorization"]
-        ), "The provided authorization metadata should be received serverside"
+        assert stream.deadline._timestamp == pytest.approx(deadline._timestamp, 1), (
+            "The provided deadline should be received serverside"
+        )
+        assert stream.metadata["authorization"] == metadata["authorization"], (
+            "The provided authorization metadata should be received serverside"
+        )
 
     return server_side_test
 

tests/generate.py

@@ -76,9 +76,10 @@ def test_dump_varint_file(tmp_path):
         betterproto2.dump_varint(123456789, stream)  # Multi-byte varint
 
     # Check that file contents are as expected
-    with open(tmp_path / "dump_varint_file.out", "rb") as test_stream, open(
-        streams_path / "message_dump_file_single.expected", "rb"
-    ) as exp_stream:
+    with (
+        open(tmp_path / "dump_varint_file.out", "rb") as test_stream,
+        open(streams_path / "message_dump_file_single.expected", "rb") as exp_stream,
+    ):
         assert betterproto2.load_varint(test_stream) == betterproto2.load_varint(exp_stream)
         exp_stream.read(2)
         assert betterproto2.load_varint(test_stream) == betterproto2.load_varint(exp_stream)
@@ -100,9 +101,10 @@ def test_message_dump_file_single(tmp_path):
         oneof_example.dump(stream)
 
     # Check that the outputted file is exactly as expected
-    with open(tmp_path / "message_dump_file_single.out", "rb") as test_stream, open(
-        streams_path / "message_dump_file_single.expected", "rb"
-    ) as exp_stream:
+    with (
+        open(tmp_path / "message_dump_file_single.out", "rb") as test_stream,
+        open(streams_path / "message_dump_file_single.expected", "rb") as exp_stream,
+    ):
         assert test_stream.read() == exp_stream.read()
 
 
@@ -114,9 +116,10 @@ def test_message_dump_file_multiple(tmp_path):
         nested_example.dump(stream)
 
     # Check that all three Messages were outputted to the file correctly
-    with open(tmp_path / "message_dump_file_multiple.out", "rb") as test_stream, open(
-        streams_path / "message_dump_file_multiple.expected", "rb"
-    ) as exp_stream:
+    with (
+        open(tmp_path / "message_dump_file_multiple.out", "rb") as test_stream,
+        open(streams_path / "message_dump_file_multiple.expected", "rb") as exp_stream,
+    ):
         assert test_stream.read() == exp_stream.read()
 
 
@@ -126,9 +129,10 @@ def test_message_dump_delimited(tmp_path):
         oneof_example.dump(stream, True)
         nested_example.dump(stream, True)
 
-    with open(tmp_path / "message_dump_delimited.out", "rb") as test_stream, open(
-        streams_path / "delimited_messages.in", "rb"
-    ) as exp_stream:
+    with (
+        open(tmp_path / "message_dump_delimited.out", "rb") as test_stream,
+        open(streams_path / "delimited_messages.in", "rb") as exp_stream,
+    ):
         assert test_stream.read() == exp_stream.read()
 
 
@@ -202,9 +206,10 @@ def test_dump_varint_negative(tmp_path):
         with pytest.raises(ValueError):
             betterproto2.dump_varint(beyond, stream)
 
-    with open(streams_path / "dump_varint_negative.expected", "rb") as exp_stream, open(
-        tmp_path / "dump_varint_negative.out", "rb"
-    ) as test_stream:
+    with (
+        open(streams_path / "dump_varint_negative.expected", "rb") as exp_stream,
+        open(tmp_path / "dump_varint_negative.out", "rb") as test_stream,
+    ):
         assert test_stream.read() == exp_stream.read()
 
 
@@ -216,9 +221,10 @@ def test_dump_varint_positive(tmp_path):
         betterproto2.dump_varint(single_byte, stream)
         betterproto2.dump_varint(multi_byte, stream)
 
-    with open(tmp_path / "dump_varint_positive.out", "rb") as test_stream, open(
-        streams_path / "dump_varint_positive.expected", "rb"
-    ) as exp_stream:
+    with (
+        open(tmp_path / "dump_varint_positive.out", "rb") as test_stream,
+        open(streams_path / "dump_varint_positive.expected", "rb") as exp_stream,
+    ):
         assert test_stream.read() == exp_stream.read()
 
 

tests/grpc/test_grpclib_client.py

@@ -7,17 +7,17 @@ def test_check_compiler_version():
     x, y, z = (int(x) for x in __version__.split("."))
 
     check_compiler_version(__version__)
-    check_compiler_version(f"{x}.{y}.{z-1}")
-    check_compiler_version(f"{x}.{y}.{z+1}")
+    check_compiler_version(f"{x}.{y}.{z - 1}")
+    check_compiler_version(f"{x}.{y}.{z + 1}")
 
     with pytest.raises(ImportError):
-        check_compiler_version(f"{x}.{y-1}.{z}")
+        check_compiler_version(f"{x}.{y - 1}.{z}")
 
     with pytest.raises(ImportError):
-        check_compiler_version(f"{x}.{y+1}.{z}")
+        check_compiler_version(f"{x}.{y + 1}.{z}")
 
     with pytest.raises(ImportError):
-        check_compiler_version(f"{x+1}.{y}.{z}")
+        check_compiler_version(f"{x + 1}.{y}.{z}")
 
     with pytest.raises(ImportError):
-        check_compiler_version(f"{x-1}.{y}.{z}")
+        check_compiler_version(f"{x - 1}.{y}.{z}")