Skip to content

Commit 8c83b54

Browse files
committed
Merge branch 'refs/heads/main' into fix-leak-sessions-on-timeout
# Conflicts: # CHANGELOG.md
2 parents 3f96440 + 295fb74 commit 8c83b54

File tree

5 files changed

+16
-5
lines changed

5 files changed

+16
-5
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
* Fixed leak sessions on asyncio timeout
22

3+
## 3.12.2 ##
4+
* Added support ydb github repo with own auth protobuf
5+
6+
## 3.12.1 ##
7+
* Fixed error while read the account key from a file (release version)
8+
39
## 3.12.1b1 ##
410
* Fixed error while read the account key from a file
511

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
setuptools.setup(
1515
name="ydb",
16-
version="3.12.1b1", # AUTOVERSION
16+
version="3.12.2", # AUTOVERSION
1717
description="YDB Python SDK",
1818
author="Yandex LLC",
1919
author_email="[email protected]",

ydb/aio/credentials.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ async def _refresh(self):
7171
try:
7272
auth_metadata = await self._make_token_request()
7373
await self._cached_token.update(auth_metadata["access_token"])
74-
self.update_expiration_info(auth_metadata)
74+
self._update_expiration_info(auth_metadata)
7575
self.logger.info(
7676
"Token refresh successful. current_time %s, refresh_in %s",
7777
current_time,

ydb/iam/auth.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,13 @@
1616
from yandex.cloud.iam.v1 import iam_token_service_pb2_grpc
1717
from yandex.cloud.iam.v1 import iam_token_service_pb2
1818
except ImportError:
19-
iam_token_service_pb2_grpc = None
20-
iam_token_service_pb2 = None
19+
try:
20+
# This attempt is to enable the IAM auth inside the YDB repository on GitHub
21+
from ydb.public.api.client.yc_public.iam import iam_token_service_pb2_grpc
22+
from ydb.public.api.client.yc_public.iam import iam_token_service_pb2
23+
except ImportError:
24+
iam_token_service_pb2_grpc = None
25+
iam_token_service_pb2 = None
2126

2227
try:
2328
import requests

ydb/ydb_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VERSION = "3.12.1b1"
1+
VERSION = "3.12.2"

0 commit comments

Comments
 (0)