Merge 69a3d2f into e1feb74

ydb-platform · Jul 3, 2024 · 6b3562f · 6b3562f
2 parents e1feb74 + 69a3d2f
commit 6b3562f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/ydb/tests/library/harness/kikimr_config.py b/ydb/tests/library/harness/kikimr_config.py
@@ -9,7 +9,7 @@
 import six
 import yaml
 from google.protobuf.text_format import Parse
-from pkg_resources import resource_string
+from importlib_resources import read_binary
 
 import ydb.tests.library.common.yatest_common as yatest_common
 from ydb.core.protos import config_pb2
@@ -62,7 +62,7 @@ def get_grpc_host():
 
 
 def load_default_yaml(default_tablet_node_ids, ydb_domain_name, static_erasure, log_configs):
-    data = resource_string(__name__, "resources/default_yaml.yml")
+    data = read_binary(__name__, "resources/default_yaml.yml")
     if isinstance(data, bytes):
         data = data.decode('utf-8')
     data = data.format(
@@ -466,7 +466,7 @@ def grpc_tls_ca(self):
     @property
     def domains_txt(self):
         app_config = config_pb2.TAppConfig()
-        Parse(resource_string(__name__, "resources/default_domains.txt"), app_config.DomainsConfig)
+        Parse(read_binary(__name__, "resources/default_domains.txt"), app_config.DomainsConfig)
         return app_config.DomainsConfig
 
     @property

diff --git a/ydb/tests/library/harness/kikimr_runner.py b/ydb/tests/library/harness/kikimr_runner.py
@@ -5,7 +5,7 @@
 import tempfile
 import time
 import itertools
-from pkg_resources import resource_string
+from importlib_resources import read_binary
 from google.protobuf import text_format
 
 import ydb.tests.library.common.yatest_common as yatest_common
@@ -346,12 +346,7 @@ def __run(self):
         logger.info("Cluster started and initialized")
 
         if bs_needed:
-            self.client.add_config_item(
-                resource_string(
-                    __name__,
-                    "resources/default_profile.txt"
-                )
-            )
+            self.client.add_config_item(read_binary(__name__, "resources/default_profile.txt"))
 
     def __run_node(self, node_id):
         """

diff --git a/ydb/tests/library/ya.make b/ydb/tests/library/ya.make
@@ -96,6 +96,7 @@ PEERDIR(
     contrib/python/PyHamcrest
     contrib/python/PyYAML
     contrib/python/cryptography
+    contrib/python/importlib-resources
     contrib/python/protobuf
     contrib/python/pytest
     contrib/python/setuptools