update protobuf to 4 version, regenerate stubs

evo-company · Nov 28, 2023 · 01c0c23 · 01c0c23
1 parent 237742d
commit 01c0c23
Show file tree

Hide file tree

Showing 12 changed files with 1,395 additions and 3,669 deletions.
diff --git a/.pdm-python b/.pdm-python
@@ -0,0 +1 @@
+/Users/max/code/evo/featureflags/.venv/bin/python
diff --git a/client/pdm.lock b/client/pdm.lock
diff --git a/client/pyproject.toml b/client/pyproject.toml
@@ -30,7 +30,7 @@ test = [
     "faker",
     "tox-pdm",
     "grpclib",
-    "protobuf==3.20.1",
+    "protobuf>=4.24.4",
     "grpcio",
     "evo-featureflags-protobuf @ file:///${PROJECT_ROOT}/../protobuf",
 ]

diff --git a/pdm.lock b/pdm.lock
diff --git a/protobuf/.pdm-python b/protobuf/.pdm-python
@@ -0,0 +1 @@
+/Users/max/code/evo/featureflags/protobuf/.venv/bin/python
diff --git a/protobuf/featureflags/protobuf/backend_pb2.py b/protobuf/featureflags/protobuf/backend_pb2.py
diff --git a/protobuf/featureflags/protobuf/graph_pb2.py b/protobuf/featureflags/protobuf/graph_pb2.py
diff --git a/protobuf/featureflags/protobuf/service_pb2.py b/protobuf/featureflags/protobuf/service_pb2.py
diff --git a/protobuf/pdm.lock b/protobuf/pdm.lock
diff --git a/protobuf/pyproject.toml b/protobuf/pyproject.toml
@@ -14,5 +14,26 @@ license = {text = "MIT"}
 requires = ["pdm-pep517>=1.0.0"]
 build-backend = "pdm.pep517.api"
 
+[project.optional-dependencies]
+dev = [
+    "protobuf>=4.24.4",
+    "grpcio-tools>=1.59.3",
+    "hiku==0.6.0",
+    "grpclib>=0.4.6",
+]
+
+[tool]
+
 [tool.pdm]
 
+[tool.pdm.scripts.generate-proto]
+shell = """
+set -e
+
+export PROTO_PATH=$(python3 -c 'import os.path, hiku;\
+                    print(os.path.dirname(os.path.dirname(hiku.__file__)))')
+
+python3 -m grpc_tools.protoc -I. -I$PROTO_PATH --python_out=. featureflags/protobuf/backend.proto
+python3 -m grpc_tools.protoc -I. -I$PROTO_PATH --python_out=. featureflags/protobuf/graph.proto
+python3 -m grpc_tools.protoc -I. -I$PROTO_PATH --python_out=. --python_grpc_out=.  --grpc_python_out=. featureflags/protobuf/service.proto
+"""
diff --git a/pyproject.toml b/pyproject.toml
@@ -11,7 +11,7 @@ dependencies = [
     'grpclib>=0.4.3',
     "click==8",
     "hiku==0.6.0",
-    "protobuf==3.20.1",
+    "protobuf>=4.25.1",
     "sqlalchemy==1.4.42",
     "aiopg[sa]==1.4.0",
     "psycopg2==2.9.5",

diff --git a/scripts/protoc.sh b/scripts/protoc.sh
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/Users/max/code/evo/featureflags/.venv/bin/python
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/Users/max/code/evo/featureflags/protobuf/.venv/bin/python