From bf8eaffaffeb00612a08d1b298e140a3a53613c0 Mon Sep 17 00:00:00 2001
From: Vitalii Gridnev <gvit@yandex-team.ru>
Date: Sun, 20 Feb 2022 21:01:47 +0300
Subject: [PATCH] fix tests

---
 .github/workflows/main.yaml         |  4 +++-
 .gitignore                          |  2 ++
 tests/aio/test_async_iter_stream.py |  4 ++--
 ydb/connection.py                   |  4 ++--
 ydb/convert.py                      | 12 ++++++------
 ydb/driver.py                       | 10 +++-------
 ydb/ydb_version.py                  |  2 +-
 7 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 .gitignore

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 4be7ce54..c3338498 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -1,6 +1,8 @@
 name: Python package
 
-on: [push]
+on:
+  push:
+  pull_request:
 
 jobs:
   build:
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..95f23d1c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+__pycache__
+ydb.egg-info/
diff --git a/tests/aio/test_async_iter_stream.py b/tests/aio/test_async_iter_stream.py
index 799cb7aa..c8810499 100644
--- a/tests/aio/test_async_iter_stream.py
+++ b/tests/aio/test_async_iter_stream.py
@@ -63,7 +63,7 @@ async def test_read_shard_table(driver, database):
 
     data_by_shard_id = {}
     with session.transaction() as tx:
-        max_value = 2 ** 64
+        max_value = 2**64
         shard_key_bound = max_value >> 3
         data = []
 
@@ -75,7 +75,7 @@ async def test_read_shard_table(driver, database):
             table_row = {
                 "Key1": shard_id * shard_key_bound + idx,
                 "Key2": idx + 1000,
-                "Value": str(idx ** 4),
+                "Value": str(idx**4),
             }
             data_by_shard_id[shard_id].append(table_row)
             data.append(table_row)
diff --git a/ydb/connection.py b/ydb/connection.py
index 573b276e..e3af3d5d 100644
--- a/ydb/connection.py
+++ b/ydb/connection.py
@@ -176,7 +176,7 @@ def _construct_channel_options(driver_config, endpoint_options=None):
     :param endpoint_options: Endpoint options
     :return: A channel initialization options
     """
-    _max_message_size = 64 * 10 ** 6
+    _max_message_size = 64 * 10**6
     _default_connect_options = [
         ("grpc.max_receive_message_length", _max_message_size),
         ("grpc.max_send_message_length", _max_message_size),
@@ -269,7 +269,7 @@ def _cancel_callback(f):
         return self.rendezvous, self.result_future
 
 
-_nanos_in_second = 10 ** 9
+_nanos_in_second = 10**9
 
 
 def _set_duration(duration_value, seconds_float):
diff --git a/ydb/convert.py b/ydb/convert.py
index 0b0176e0..2be209bf 100644
--- a/ydb/convert.py
+++ b/ydb/convert.py
@@ -7,11 +7,11 @@
 
 
 _SHIFT_BIT_COUNT = 64
-_SHIFT = 2 ** 64
-_SIGN_BIT = 2 ** 63
-_DecimalNanRepr = 10 ** 35 + 1
-_DecimalInfRepr = 10 ** 35
-_DecimalSignedInfRepr = -(10 ** 35)
+_SHIFT = 2**64
+_SIGN_BIT = 2**63
+_DecimalNanRepr = 10**35 + 1
+_DecimalInfRepr = 10**35
+_DecimalSignedInfRepr = -(10**35)
 _primitive_type_by_id = {}
 
 
@@ -49,7 +49,7 @@ def _pb_to_decimal(type_pb, value_pb, table_client_settings):
     elif int128_value == _DecimalSignedInfRepr:
         return decimal.Decimal("-Inf")
     return decimal.Decimal(int128_value) / decimal.Decimal(
-        10 ** type_pb.decimal_type.scale
+        10**type_pb.decimal_type.scale
     )
 
 
diff --git a/ydb/driver.py b/ydb/driver.py
index e14f9017..f04fb3ad 100644
--- a/ydb/driver.py
+++ b/ydb/driver.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
-import ydb
-
 from . import credentials as credentials_impl, table, scheme, pool
+from . import tracing
 import six
 import os
 
@@ -41,7 +40,7 @@ def parse_connection_string(connection_string):
 
 
 def default_credentials(credentials=None, tracer=None):
-    tracer = tracer if tracer is not None else ydb.Tracer(None)
+    tracer = tracer if tracer is not None else tracing.Tracer(None)
     with tracer.trace("Driver.default_credentials") as ctx:
         if credentials is not None:
             ctx.trace({"credentials.prepared": True})
@@ -117,7 +116,6 @@ def __init__(
         grpc_lb_policy_name="round_robin",
         discovery_request_timeout=10,
     ):
-        # type:(str, str, str, str, Any, ydb.Credentials, bool, bytes, bytes, bytes, float, ydb.TableClientSettings, list, str, ydb.Tracer) -> None
         """
         A driver config to initialize a driver instance
 
@@ -158,7 +156,7 @@ def __init__(
         self.grpc_keep_alive_timeout = grpc_keep_alive_timeout
         self.table_client_settings = table_client_settings
         self.primary_user_agent = primary_user_agent
-        self.tracer = tracer if tracer is not None else ydb.Tracer(None)
+        self.tracer = tracer if tracer is not None else tracing.Tracer(None)
         self.grpc_lb_policy_name = grpc_lb_policy_name
         self.discovery_request_timeout = discovery_request_timeout
 
@@ -235,8 +233,6 @@ def __init__(
         credentials=None,
         **kwargs
     ):
-        # type:(DriverConfig, str, str, str, bytes, ydb.AbstractCredentials, **Any) -> None
-
         """
         Constructs a driver instance to be used in table and scheme clients.
         It encapsulates endpoints discovery mechanism and provides ability to execute RPCs
diff --git a/ydb/ydb_version.py b/ydb/ydb_version.py
index 0f7ea410..127c148a 100644
--- a/ydb/ydb_version.py
+++ b/ydb/ydb_version.py
@@ -1 +1 @@
-VERSION = "1.1.15"
+VERSION = "2.1.0"