| commit | 43815e936d3dcf00818b18ca132606cba754fb04 | [log] [tgz] |
|---|---|---|
| author | Petteri Aimonen <jpa@git.mail.kapsi.fi> | Mon May 30 11:41:52 2022 +0300 |
| committer | Petteri Aimonen <jpa@git.mail.kapsi.fi> | Mon May 30 11:41:52 2022 +0300 |
| tree | 015b81e1a786cba707c019964ea0d87a563c356c | |
| parent | 1ed261750915de96ddcf07b4c469e57f988d4db2 [diff] |
Fix compatibility problems in pip package with newest python-protobuf https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
diff --git a/.github/workflows/pypi_publish.yml b/.github/workflows/pypi_publish.yml index f53d93f..b2243a7 100644 --- a/.github/workflows/pypi_publish.yml +++ b/.github/workflows/pypi_publish.yml
@@ -21,9 +21,7 @@ - name: Install dependencies run: | - sudo apt-get update - sudo apt-get install python3-protobuf protobuf-compiler scons - python3 -m pip install --user --upgrade pyinstaller poetry + python3 -m pip install --user --upgrade pyinstaller poetry protobuf grpcio-tools - name: Build PyPI package run: |
diff --git a/extra/poetry/pyproject.toml b/extra/poetry/pyproject.toml index 07910a9..b9af332 100644 --- a/extra/poetry/pyproject.toml +++ b/extra/poetry/pyproject.toml
@@ -18,8 +18,8 @@ [tool.poetry.dependencies] python = ">=2.7" -protobuf = ">=3.6" -grpcio-tools = {version = ">=1.26.0rc1", allow-prereleases = true, optional=true} +protobuf = ">=3.19" +grpcio-tools = ">=1.46.0" [tool.poetry.dev-dependencies]
diff --git a/generator/proto/Makefile b/generator/proto/Makefile index ef5b4ef..a93d88f 100644 --- a/generator/proto/Makefile +++ b/generator/proto/Makefile
@@ -1,4 +1,4 @@ -PROTOC?=protoc +PROTOC?=../protoc all: nanopb_pb2.py