Configure release to PyPI (#30)

* Configure release to PyPI

* betterproto -> betterproto2

* Update version

* Format code

* Condition to update workflow

* Move distributing condition

Author: AdrienVannson

.github/workflows/release.yml

@@ -12,20 +12,30 @@ on:
 
 jobs:
   packaging:
+    if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
     name: Distribution
     runs-on: ubuntu-latest
+
+    permissions:
+      id-token: write
+
+    environment:
+      name: pypi
+      url: https://pypi.org/p/betterproto2
+
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+
       - name: Set up Python 3.8
         uses: actions/setup-python@v4
         with:
-          python-version: 3.8
+          python-version: "3.8"
+
       - name: Install poetry
         run: python -m pip install poetry
+
       - name: Build package
         run: poetry build
-      - name: Publish package to PyPI
-        if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
-        env:
-          POETRY_PYPI_TOKEN_PYPI: ${{ secrets.pypi }}
-        run: poetry publish -n
+
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1.12

benchmarks/benchmarks.py

@@ -1,37 +1,37 @@
 from dataclasses import dataclass
 from typing import List
 
-import betterproto
+import betterproto2
 
 
 @dataclass
-class TestMessage(betterproto.Message):
-    foo: int = betterproto.uint32_field(1)
-    bar: str = betterproto.string_field(2)
-    baz: float = betterproto.float_field(3)
+class TestMessage(betterproto2.Message):
+    foo: int = betterproto2.uint32_field(1)
+    bar: str = betterproto2.string_field(2)
+    baz: float = betterproto2.float_field(3)
 
 
 @dataclass
-class TestNestedChildMessage(betterproto.Message):
-    str_key: str = betterproto.string_field(1)
-    bytes_key: bytes = betterproto.bytes_field(2)
-    bool_key: bool = betterproto.bool_field(3)
-    float_key: float = betterproto.float_field(4)
-    int_key: int = betterproto.uint64_field(5)
+class TestNestedChildMessage(betterproto2.Message):
+    str_key: str = betterproto2.string_field(1)
+    bytes_key: bytes = betterproto2.bytes_field(2)
+    bool_key: bool = betterproto2.bool_field(3)
+    float_key: float = betterproto2.float_field(4)
+    int_key: int = betterproto2.uint64_field(5)
 
 
 @dataclass
-class TestNestedMessage(betterproto.Message):
-    foo: TestNestedChildMessage = betterproto.message_field(1)
-    bar: TestNestedChildMessage = betterproto.message_field(2)
-    baz: TestNestedChildMessage = betterproto.message_field(3)
+class TestNestedMessage(betterproto2.Message):
+    foo: TestNestedChildMessage = betterproto2.message_field(1)
+    bar: TestNestedChildMessage = betterproto2.message_field(2)
+    baz: TestNestedChildMessage = betterproto2.message_field(3)
 
 
 @dataclass
-class TestRepeatedMessage(betterproto.Message):
-    foo_repeat: List[str] = betterproto.string_field(1)
-    bar_repeat: List[int] = betterproto.int64_field(2)
-    baz_repeat: List[bool] = betterproto.bool_field(3)
+class TestRepeatedMessage(betterproto2.Message):
+    foo_repeat: List[str] = betterproto2.string_field(1)
+    bar_repeat: List[int] = betterproto2.int64_field(2)
+    baz_repeat: List[bool] = betterproto2.bool_field(3)
 
 
 class BenchMessage:
@@ -59,10 +59,10 @@ def time_overhead(self):
         """Overhead in class definition."""
 
         @dataclass
-        class Message(betterproto.Message):
-            foo: int = betterproto.uint32_field(1)
-            bar: str = betterproto.string_field(2)
-            baz: float = betterproto.float_field(3)
+        class Message(betterproto2.Message):
+            foo: int = betterproto2.uint32_field(1)
+            bar: str = betterproto2.string_field(2)
+            baz: float = betterproto2.float_field(3)
 
     def time_instantiation(self):
         """Time instantiation"""

pyproject.toml

@@ -1,14 +1,14 @@
 [tool.poetry]
-name = "betterproto"
-version = "2.0.0b7"
+name = "betterproto2"
+version = "0.0.2"
 description = "A better Protobuf / gRPC generator & library"
-authors = ["Daniel G. Taylor <danielgtaylor@gmail.com>"]
+authors = ["Adrien Vannson <adrien.vannson@protonmail.com>", "Daniel G. Taylor <danielgtaylor@gmail.com>"]
 readme = "README.md"
-repository = "https://github.com/danielgtaylor/python-betterproto"
+repository = "https://github.com/betterproto/python-betterproto2"
 keywords = ["protobuf", "gRPC"]
 license = "MIT"
 packages = [
-    { include = "betterproto", from = "src" }
+    { include = "betterproto2", from = "src" }
 ]
 
 [tool.poetry.dependencies]
@@ -44,7 +44,7 @@ cachelib = "^0.10.2"
 tomlkit = ">=0.7.0"
 
 [tool.poetry.scripts]
-protoc-gen-python_betterproto = "betterproto.plugin:main"
+protoc-gen-python_betterproto = "betterproto2.plugin:main"
 
 [tool.poetry.extras]
 compiler = ["ruff", "jinja2"]
@@ -130,7 +130,7 @@ help = "Clean out generated files from the workspace"
 [tool.poe.tasks.generate_lib]
 cmd = """
 protoc
-    --plugin=protoc-gen-custom=src/betterproto/plugin/main.py
+    --plugin=protoc-gen-custom=src/betterproto2/plugin/main.py
     --custom_opt=INCLUDE_GOOGLE
     --custom_out=src/betterproto/lib/std
     -I /usr/local/include/

src/betterproto/lib/google/protobuf/__init__.py

@@ -0,0 +1,3 @@
+from importlib import metadata
+
+__version__ = metadata.version("betterproto2")