Intermediate changes

commit_hash:2f3b2dd78467e6c3496e0b36c099cb3592152f1c

5 files changed, 16 insertions, 6 deletions

diff --git a/contrib/python/ydb/py3/.dist-info/METADATA b/contrib/python/ydb/py3/.dist-info/METADATA
index 92b8ab460cb..5c03724bac5 100644
--- a/contrib/python/ydb/py3/.dist-info/METADATA
+++ b/contrib/python/ydb/py3/.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ydb
-Version: 3.24.1
+Version: 3.25.0
 Summary: YDB Python SDK
 Home-page: http://github.com/ydb-platform/ydb-python-sdk
 Author: Yandex LLC
@@ -16,7 +16,7 @@ License-File: LICENSE
 License-File: AUTHORS
 Requires-Dist: grpcio >=1.42.0
 Requires-Dist: packaging
-Requires-Dist: protobuf <6.0.0,>=3.13.0
+Requires-Dist: protobuf <7.0.0,>=3.13.0
 Requires-Dist: aiohttp <4
 Provides-Extra: yc
 Requires-Dist: yandexcloud ; extra == 'yc'
diff --git a/contrib/python/ydb/py3/.yandex_meta/yamaker.yaml b/contrib/python/ydb/py3/.yandex_meta/yamaker.yaml
index 9a946e3f480..a95504a4cf7 100644
--- a/contrib/python/ydb/py3/.yandex_meta/yamaker.yaml
+++ b/contrib/python/ydb/py3/.yandex_meta/yamaker.yaml
@@ -2,6 +2,7 @@ exclude:
   - ydb/_grpc/v3/*
   - ydb/_grpc/v4/*
   - ydb/_grpc/v5/*
+  - ydb/_grpc/v6/*
 mark_as_tests:
   - "**/*_test.py"
   - ydb/_topic_common/test_helpers.py
diff --git a/contrib/python/ydb/py3/patches/01-arcadia-protobufs.patch b/contrib/python/ydb/py3/patches/01-arcadia-protobufs.patch
index a00b02b6881..7a30efd84d3 100644
--- a/contrib/python/ydb/py3/patches/01-arcadia-protobufs.patch
+++ b/contrib/python/ydb/py3/patches/01-arcadia-protobufs.patch
@@ -1,6 +1,6 @@
 --- contrib/python/ydb/py3/ydb/_grpc/common/__init__.py	(index)
 +++ contrib/python/ydb/py3/ydb/_grpc/common/__init__.py	(working tree)
-@@ -1,55 +0,0 @@
+@@ -1,64 +0,0 @@
 -import sys
 -
 -import google.protobuf
@@ -48,7 +48,7 @@
 -
 -        sys.modules["ydb._grpc.common.protos"] = sys.modules["ydb._grpc.v4.protos"]
 -
--    else:
+-    elif protobuf_version < Version("6.0"):
 -        from ydb._grpc.v5 import *  # noqa
 -
 -        sys.modules["ydb._grpc.common"] = sys.modules["ydb._grpc.v5"]
@@ -56,3 +56,12 @@
 -        from ydb._grpc.v5 import protos  # noqa
 -
 -        sys.modules["ydb._grpc.common.protos"] = sys.modules["ydb._grpc.v5.protos"]
+-
+-    else:
+-        from ydb._grpc.v6 import *  # noqa
+-
+-        sys.modules["ydb._grpc.common"] = sys.modules["ydb._grpc.v6"]
+-
+-        from ydb._grpc.v6 import protos  # noqa
+-
+-        sys.modules["ydb._grpc.common.protos"] = sys.modules["ydb._grpc.v6.protos"]
diff --git a/contrib/python/ydb/py3/ya.make b/contrib/python/ydb/py3/ya.make
index 69885677fe8..e1d75f61a08 100644
--- a/contrib/python/ydb/py3/ya.make
+++ b/contrib/python/ydb/py3/ya.make
@@ -2,7 +2,7 @@
 
 PY3_LIBRARY()
 
-VERSION(3.24.1)
+VERSION(3.25.0)
 
 LICENSE(Apache-2.0)
 
diff --git a/contrib/python/ydb/py3/ydb/ydb_version.py b/contrib/python/ydb/py3/ydb/ydb_version.py
index b531e13bbff..e78c67c70ba 100644
--- a/contrib/python/ydb/py3/ydb/ydb_version.py
+++ b/contrib/python/ydb/py3/ydb/ydb_version.py
@@ -1 +1 @@
-VERSION = "3.24.1"
+VERSION = "3.25.0"