Skip to content

Commit 75959d3

Browse files
authored
fix deprecation warning due to pkg_resources usage (#6245)
1 parent 8a523e2 commit 75959d3

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

ydb/tests/library/harness/kikimr_config.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import six
1010
import yaml
1111
from google.protobuf.text_format import Parse
12-
from pkg_resources import resource_string
12+
from importlib_resources import read_binary
1313

1414
import ydb.tests.library.common.yatest_common as yatest_common
1515
from ydb.core.protos import config_pb2
@@ -62,7 +62,7 @@ def get_grpc_host():
6262

6363

6464
def load_default_yaml(default_tablet_node_ids, ydb_domain_name, static_erasure, log_configs):
65-
data = resource_string(__name__, "resources/default_yaml.yml")
65+
data = read_binary(__name__, "resources/default_yaml.yml")
6666
if isinstance(data, bytes):
6767
data = data.decode('utf-8')
6868
data = data.format(
@@ -466,7 +466,7 @@ def grpc_tls_ca(self):
466466
@property
467467
def domains_txt(self):
468468
app_config = config_pb2.TAppConfig()
469-
Parse(resource_string(__name__, "resources/default_domains.txt"), app_config.DomainsConfig)
469+
Parse(read_binary(__name__, "resources/default_domains.txt"), app_config.DomainsConfig)
470470
return app_config.DomainsConfig
471471

472472
@property

ydb/tests/library/harness/kikimr_runner.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import tempfile
66
import time
77
import itertools
8-
from pkg_resources import resource_string
8+
from importlib_resources import read_binary
99
from google.protobuf import text_format
1010

1111
import ydb.tests.library.common.yatest_common as yatest_common
@@ -346,12 +346,7 @@ def __run(self):
346346
logger.info("Cluster started and initialized")
347347

348348
if bs_needed:
349-
self.client.add_config_item(
350-
resource_string(
351-
__name__,
352-
"resources/default_profile.txt"
353-
)
354-
)
349+
self.client.add_config_item(read_binary(__name__, "resources/default_profile.txt"))
355350

356351
def __run_node(self, node_id):
357352
"""

ydb/tests/library/ya.make

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ PEERDIR(
9696
contrib/python/PyHamcrest
9797
contrib/python/PyYAML
9898
contrib/python/cryptography
99+
contrib/python/importlib-resources
99100
contrib/python/protobuf
100101
contrib/python/pytest
101102
contrib/python/setuptools

0 commit comments

Comments
 (0)