preparations to protobuf 5 compat

Co-authored-by: Yaroslav Leonov <[email protected]>

Author: vgvoleg

.github/workflows/tests.yaml

@@ -18,10 +18,10 @@ jobs:
       fail-fast: false
       matrix:
         python-version: [3.8]
-        environment: [py, py-tls, py-proto3, py-tls-proto3]
+        environment: [py-proto4, py-tls-proto4, py-proto3, py-tls-proto3]
         folder: [ydb, tests]
         exclude:
-          - environment: py-tls
+          - environment: py-tls-proto4
             folder: ydb
           - environment: py-tls-proto3
             folder: ydb

Makefile

@@ -1,9 +1,13 @@
-protobuf: protobuf-3 protobuf-4
+protobuf: protobuf-3 protobuf-4 protobuf-5
 
 protobuf-3:
 	docker build -f generate-protobuf.Dockerfile . -t ydb-python-sdk-proto-generator-env-3 --build-arg GRPCIO_VER=1.39.0 --build-arg PY_PROTOBUF_VER=3.20.3
 	docker run --rm -it -v $${PWD}:$${PWD} -w $${PWD} ydb-python-sdk-proto-generator-env-3 python generate_protoc.py --target-version=v3
 
 protobuf-4:
 	docker build -f generate-protobuf.Dockerfile . -t ydb-python-sdk-proto-generator-env-4
-	docker run --rm -it -v $${PWD}:$${PWD} -w $${PWD} ydb-python-sdk-proto-generator-env-4 python generate_protoc.py
+	docker run --rm -it -v $${PWD}:$${PWD} -w $${PWD} ydb-python-sdk-proto-generator-env-4 python generate_protoc.py --target-version=v4
+
+protobuf-5:
+	docker build -f generate-protobuf.Dockerfile . -t ydb-python-sdk-proto-generator-env-5 --build-arg PY_PROTOBUF_VER=5.26.1 --build-arg PROTOC_VER=26.1
+	docker run --rm -it -v $${PWD}:$${PWD} -w $${PWD} ydb-python-sdk-proto-generator-env-5 python generate_protoc.py --target-version=v5

generate-protobuf.Dockerfile

@@ -9,7 +9,7 @@ RUN \
     python -m pip install grpcio-tools==${GRPCIO_VER} && \
     python -m pip install protobuf==${PY_PROTOBUF_VER}
 
-ENV PROTOC_VER=21.8
+ARG PROTOC_VER=21.8
 RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VER}/protoc-${PROTOC_VER}-linux-x86_64.zip && \
     unzip protoc-*.zip && \
     rm -f protoc-*.zip && \

requirements.txt

@@ -1,4 +1,4 @@
 grpcio>=1.42.0
 packaging
-protobuf>=3.13.0,<5.0.0
+protobuf>=3.13.0,<6.0.0
 aiohttp<4

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py,py-proto3,py-tls,py-tls-proto3,style,pylint,black,protoc,py-cov
+envlist = py-proto4,py-proto3,py-tls-proto4,py-tls-proto3,style,pylint,black,protoc,py-cov
 minversion = 4.2.6
 skipsdist = True
 ignore_basepython_conflict = true
@@ -12,24 +12,33 @@ setenv =
 deps =
     -r{toxinidir}/test-requirements.txt
 
-[testenv:dev]
+[testenv:dev-proto4]
 commands =
+deps =
+    -r{toxinidir}/test-requirements.txt
+    protobuf<5.0.0
 
 [testenv:dev-proto3]
 commands =
 deps =
     -r{toxinidir}/test-requirements.txt
     protobuf<4.0.0
 
-[testenv:py]
+[testenv:py-proto4]
 commands =
     pytest -v -m "not tls" --docker-compose-remove-volumes --docker-compose=docker-compose.yml {posargs}
+deps =
+    -r{toxinidir}/test-requirements.txt
+    protobuf<5.0.0
 
-[testenv:py-cov]
+[testenv:py-cov-proto4]
 commands =
     pytest -v -m "not tls" \
         --cov-report html:cov_html --cov=ydb \
         --docker-compose-remove-volumes --docker-compose=docker-compose.yml {posargs}
+deps =
+    -r{toxinidir}/test-requirements.txt
+    protobuf<5.0.0
 
 [testenv:py-proto3]
 commands =
@@ -38,9 +47,12 @@ deps =
     -r{toxinidir}/test-requirements.txt
     protobuf<4.0.0
 
-[testenv:py-tls]
+[testenv:py-tls-proto4]
 commands =
     pytest -v -m tls --docker-compose-remove-volumes --docker-compose=docker-compose-tls.yml {posargs}
+deps =
+    -r{toxinidir}/test-requirements.txt
+    protobuf<5.0.0
 
 [testenv:py-tls-proto3]
 commands =
@@ -52,12 +64,12 @@ deps =
 [testenv:black-format]
 skip_install = true
 commands =
-    black ydb examples tests --extend-exclude "ydb/_grpc/v3|ydb/_grpc/v4"
+    black ydb examples tests --extend-exclude "ydb/_grpc/v3|ydb/_grpc/v4|ydb/_grpc/v5"
 
 [testenv:black]
 skip_install = true
 commands =
-    black --diff --check ydb examples tests --extend-exclude "ydb/_grpc/v3|ydb/_grpc/v4"
+    black --diff --check ydb examples tests --extend-exclude "ydb/_grpc/v3|ydb/_grpc/v4|ydb/_grpc/v5"
 
 [testenv:pylint]
 deps = pylint