aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorqrort <qrort@yandex-team.com>2023-04-24 13:08:42 +0300
committerqrort <qrort@yandex-team.com>2023-04-24 13:08:42 +0300
commite7596bf9ee03bb4ebb8b9b124753414c59998add (patch)
tree1e947a9d51f4ee39f90cff41299491895c2402e8
parent69f46d405f28213e905c59854e9a30dc57ee6792 (diff)
downloadydb-e7596bf9ee03bb4ebb8b9b124753414c59998add.tar.gz
ydb sdk namespace package
-rw-r--r--ydb/public/sdk/python3/ydb/__init__.py4
-rw-r--r--ydb/tests/functional/pytest.ini2
-rw-r--r--ydb/tests/functional/rename/test_rename.py (renamed from ydb/tests/functional/rename/test.py)0
-rw-r--r--ydb/tests/oss/launch/launch.py2
-rwxr-xr-xydb/tests/oss/launch/prepare.sh2
-rw-r--r--ydb/tests/oss/ydb_sdk_import/__init__.py24
6 files changed, 8 insertions, 26 deletions
diff --git a/ydb/public/sdk/python3/ydb/__init__.py b/ydb/public/sdk/python3/ydb/__init__.py
index 861cdd0a72b..902b1e0850f 100644
--- a/ydb/public/sdk/python3/ydb/__init__.py
+++ b/ydb/public/sdk/python3/ydb/__init__.py
@@ -1,3 +1,7 @@
+from pkgutil import extend_path
+
+__path__ = extend_path(__path__, __name__)
+
from .credentials import * # noqa
from .driver import * # noqa
from .global_settings import * # noqa
diff --git a/ydb/tests/functional/pytest.ini b/ydb/tests/functional/pytest.ini
index f9d828ad4e6..4b45bb109fa 100644
--- a/ydb/tests/functional/pytest.ini
+++ b/ydb/tests/functional/pytest.ini
@@ -1,2 +1,2 @@
[pytest]
-addopts = --ignore=clickbench --ignore=dynumber --ignore=large_serializable --ignore=rename --ignore=serializable
+addopts = --ignore=clickbench --ignore=dynumber --ignore=large_serializable --ignore=serializable --ignore=postgresql
diff --git a/ydb/tests/functional/rename/test.py b/ydb/tests/functional/rename/test_rename.py
index 40f60a1b9b2..40f60a1b9b2 100644
--- a/ydb/tests/functional/rename/test.py
+++ b/ydb/tests/functional/rename/test_rename.py
diff --git a/ydb/tests/oss/launch/launch.py b/ydb/tests/oss/launch/launch.py
index c02e9b9cfad..41ab3e5514b 100644
--- a/ydb/tests/oss/launch/launch.py
+++ b/ydb/tests/oss/launch/launch.py
@@ -5,7 +5,7 @@ import os
disabled_suites = {
- 'clickbench', 'dynumber', 'large_serializable', 'rename', 'serializable'
+ 'clickbench', 'dynumber', 'large_serializable', 'postgresql', 'serializable'
}
if __name__ == '__main__':
diff --git a/ydb/tests/oss/launch/prepare.sh b/ydb/tests/oss/launch/prepare.sh
index b692e706992..f2bb14ace23 100755
--- a/ydb/tests/oss/launch/prepare.sh
+++ b/ydb/tests/oss/launch/prepare.sh
@@ -11,7 +11,7 @@ mkdir ${testresults}/py3test/testing_out_stuff
python ${source_root}/ydb/tests/oss/launch/generate_test_context.py --build-root ${build_root} --source-root ${source_root} --out-dir ${testresults}
-export PYTHONPATH=${source_root}:${source_root}/library/python/testing/yatest_common:${source_root}/library/python/testing:${source_root}/library/python/pytest/plugins:${source_root}/ydb/tests/oss/canonical
+export PYTHONPATH=${source_root}/ydb/public/sdk/python3:${source_root}:${source_root}/library/python/testing/yatest_common:${source_root}/library/python/testing:${source_root}/library/python/pytest/plugins:${source_root}/ydb/tests/oss/canonical
export YDB_DRIVER_BINARY="ydb/apps/ydbd/ydbd"
export PYTEST_PLUGINS=ya,conftests,canonical
diff --git a/ydb/tests/oss/ydb_sdk_import/__init__.py b/ydb/tests/oss/ydb_sdk_import/__init__.py
index e29b21910bf..e6232b5a82f 100644
--- a/ydb/tests/oss/ydb_sdk_import/__init__.py
+++ b/ydb/tests/oss/ydb_sdk_import/__init__.py
@@ -1,23 +1 @@
-from ydb.tests.oss.canonical import is_oss
-import os
-import sys
-
-if is_oss:
- python_2 = os.getenv('PYTHON2_YDB_IMPORT')
- sdk_path = ""
- if python_2:
- sdk_path = "ydb.public.sdk.python2"
- else:
- sdk_path = "ydb.public.sdk.python3"
-
- from ydb.public.api.grpc import * # noqa
- sys.modules[sdk_path + ".ydb._grpc.common"] = sys.modules["ydb.public.api.grpc"]
- from ydb.public.api import protos # noqa
- sys.modules[sdk_path + ".ydb._grpc.common.protos"] = sys.modules["ydb.public.api.protos"]
-
- if python_2:
- from ydb.public.sdk.python2 import ydb # noqa
- else:
- from ydb.public.sdk.python3 import ydb # noqa
-else:
- import ydb # noqa
+import ydb # noqa