add protobuf 5 compatibility

Author: vgvoleg

.github/workflows/tests.yaml

@@ -17,14 +17,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8]
-        environment: [py-proto4, py-tls-proto4, py-proto3, py-tls-proto3]
-        folder: [ydb, tests]
+        python-version: [3.8, 3.9]
+        environment: [py-proto5, py-tls-proto5, py-proto4, py-tls-proto4, py-proto3, py-tls-proto3]
+        folder: [ydb, tests --ignore=tests/topics, tests/topics]
         exclude:
+          - environment: py-tls-proto5
+            folder: ydb
           - environment: py-tls-proto4
             folder: ydb
           - environment: py-tls-proto3
             folder: ydb
+          - environment: py-tls-proto5
+            folder: tests/topics
+          - environment: py-tls-proto4
+            folder: tests/topics
+          - environment: py-tls-proto3
+            folder: tests/topics
 
     steps:
     - uses: actions/checkout@v1

test-requirements.txt

@@ -11,15 +11,15 @@ docker==5.0.0
 docker-compose==1.29.2
 dockerpty==0.4.1
 docopt==0.6.2
-grpcio==1.42.0
+grpcio>=1.42.0
 idna==3.2
 importlib-metadata==4.6.1
 iniconfig==1.1.1
 jsonschema==3.2.0
 packaging==21.0
 paramiko==2.10.1
 pluggy==0.13.1
-protobuf>=3.13.0,<5.0.0
+protobuf>=3.13.0,<6.0.0
 py==1.10.0
 pycparser==2.20
 PyNaCl==1.4.0

tox.ini

@@ -32,14 +32,14 @@ deps =
 
 [testenv:py-proto5]
 commands =
-    pytest -v -m "not tls" --docker-compose-remove-volumes --docker-compose=docker-compose.yml {posargs}
+    pytest -v -m "not tls" --docker-compose-remove-volumes --docker-compose=docker-compose.yml {posargs} --ignore=tests/topics
 deps =
     -r{toxinidir}/test-requirements.txt
     protobuf<6.0.0
 
 [testenv:py-proto4]
 commands =
-    pytest -v -m "not tls" --docker-compose-remove-volumes --docker-compose=docker-compose.yml {posargs}
+    pytest -v -m "not tls" --docker-compose-remove-volumes --docker-compose=docker-compose.yml {posargs} --ignore=tests/topics
 deps =
     -r{toxinidir}/test-requirements.txt
     protobuf<5.0.0
@@ -55,7 +55,7 @@ deps =
 
 [testenv:py-proto3]
 commands =
-    pytest -v -m "not tls" --docker-compose-remove-volumes --docker-compose=docker-compose.yml {posargs}
+    pytest -v -m "not tls" --docker-compose-remove-volumes --docker-compose=docker-compose.yml {posargs} --ignore=tests/topics
 deps =
     -r{toxinidir}/test-requirements.txt
     protobuf<4.0.0

ydb/_grpc/common/__init__.py

@@ -36,11 +36,20 @@
         from ydb._grpc.v3 import protos  # noqa
 
         sys.modules["ydb._grpc.common.protos"] = sys.modules["ydb._grpc.v3.protos"]
-    else:
+    elif protobuf_version < Version("5.0"):
         from ydb._grpc.v4 import *  # noqa
 
         sys.modules["ydb._grpc.common"] = sys.modules["ydb._grpc.v4"]
 
         from ydb._grpc.v4 import protos  # noqa
 
         sys.modules["ydb._grpc.common.protos"] = sys.modules["ydb._grpc.v4.protos"]
+
+    else:
+        from ydb._grpc.v5 import *  # noqa
+
+        sys.modules["ydb._grpc.common"] = sys.modules["ydb._grpc.v5"]
+
+        from ydb._grpc.v5 import protos  # noqa
+
+        sys.modules["ydb._grpc.common.protos"] = sys.modules["ydb._grpc.v5.protos"]