aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraripinen <aripinen@yandex-team.ru>2022-02-10 16:51:40 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:51:40 +0300
commitebc3b27e44d5f5720b1a1fe3cc8dfc1bc15658b7 (patch)
tree3e407c1a56ca0b28a6dff13bef4ea5060e40997c
parent6018ed17c37797f38d832535223970c73863306f (diff)
downloadydb-ebc3b27e44d5f5720b1a1fe3cc8dfc1bc15658b7.tar.gz
Restoring authorship annotation for <aripinen@yandex-team.ru>. Commit 1 of 2.
-rw-r--r--build/plugins/sandbox_registry.py42
-rw-r--r--build/scripts/fetch_resource.py2
-rw-r--r--build/ya.conf.json2
-rw-r--r--build/ymake.core.conf64
4 files changed, 55 insertions, 55 deletions
diff --git a/build/plugins/sandbox_registry.py b/build/plugins/sandbox_registry.py
index dc1be399b3..a96456ebe1 100644
--- a/build/plugins/sandbox_registry.py
+++ b/build/plugins/sandbox_registry.py
@@ -1,21 +1,21 @@
-import os
-
-import ymake
-
-
-def onregister_sandbox_import(unit, *args):
- args = iter(args)
- for path in args:
- path = os.path.normpath(path)
- source = unit.resolve_arc_path(path)
- abs_source = unit.resolve(source)
- if not os.path.exists(abs_source):
- ymake.report_configure_error('REGISTER_SANDBOX_IMPORT: File or directory {} does not exists'.format(path))
- splited_path = path.split(os.sep)
- l, r = 0, len(splited_path)
- if splited_path[-1] == "__init__.py":
- r -= 1
- if not splited_path[0]:
- l += 1
- path = ".".join(splited_path[l:r])
- unit.onresource(["-", "{}.{}={}".format("SANDBOX_TASK_REGISTRY", path, path)])
+import os
+
+import ymake
+
+
+def onregister_sandbox_import(unit, *args):
+ args = iter(args)
+ for path in args:
+ path = os.path.normpath(path)
+ source = unit.resolve_arc_path(path)
+ abs_source = unit.resolve(source)
+ if not os.path.exists(abs_source):
+ ymake.report_configure_error('REGISTER_SANDBOX_IMPORT: File or directory {} does not exists'.format(path))
+ splited_path = path.split(os.sep)
+ l, r = 0, len(splited_path)
+ if splited_path[-1] == "__init__.py":
+ r -= 1
+ if not splited_path[0]:
+ l += 1
+ path = ".".join(splited_path[l:r])
+ unit.onresource(["-", "{}.{}={}".format("SANDBOX_TASK_REGISTRY", path, path)])
diff --git a/build/scripts/fetch_resource.py b/build/scripts/fetch_resource.py
index d5af311e5d..4d0091b902 100644
--- a/build/scripts/fetch_resource.py
+++ b/build/scripts/fetch_resource.py
@@ -24,7 +24,7 @@ def fetch(url, retries=4, timeout=5):
def fetch_resource(id_):
- urls = xmlrpclib.ServerProxy("https://sandbox.yandex-team.ru/sandbox/xmlrpc").get_resource_http_links(id_)
+ urls = xmlrpclib.ServerProxy("https://sandbox.yandex-team.ru/sandbox/xmlrpc").get_resource_http_links(id_)
for u in urls:
try:
diff --git a/build/ya.conf.json b/build/ya.conf.json
index 5f7cc875d6..e68292b2ff 100644
--- a/build/ya.conf.json
+++ b/build/ya.conf.json
@@ -5786,7 +5786,7 @@
},
"maven_import_sandbox_uploader": {
"formula": {
- "sandbox_id": 1031028343,
+ "sandbox_id": 1031028343,
"match": "uploader"
},
"executable": {
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 081833998b..33d1d8d224 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -5000,7 +5000,7 @@ multimodule SANDBOX_TASK {
SET_APPEND(NO_CHECK_IMPORTS_FOR_VALUE kernel.*)
SET_APPEND(NO_CHECK_IMPORTS_FOR_VALUE library.*)
SET_APPEND(NO_CHECK_IMPORTS_FOR_VALUE sky*)
- REGISTER_SANDBOX_IMPORT(${MODDIR})
+ REGISTER_SANDBOX_IMPORT(${MODDIR})
when ($FAIL_PY2 == "yes") {
_OK=no
}
@@ -5012,7 +5012,7 @@ multimodule SANDBOX_TASK {
}
module PY2: PY2_LIBRARY {
PEERDIR(sandbox/sdk2 sandbox/sandboxsdk)
- REGISTER_SANDBOX_IMPORT(${MODDIR})
+ REGISTER_SANDBOX_IMPORT(${MODDIR})
}
}
@@ -5025,11 +5025,11 @@ multimodule SANDBOX_PY23_TASK {
SET_APPEND(NO_CHECK_IMPORTS_FOR_VALUE kernel.*)
SET_APPEND(NO_CHECK_IMPORTS_FOR_VALUE library.*)
SET_APPEND(NO_CHECK_IMPORTS_FOR_VALUE sky*)
- REGISTER_SANDBOX_IMPORT(${MODDIR})
+ REGISTER_SANDBOX_IMPORT(${MODDIR})
}
module PY2: PY2_LIBRARY {
PEERDIR(sandbox/sdk2 sandbox/sandboxsdk)
- REGISTER_SANDBOX_IMPORT(${MODDIR})
+ REGISTER_SANDBOX_IMPORT(${MODDIR})
OBJ_SUF=.py2
RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT
}
@@ -5043,39 +5043,39 @@ multimodule SANDBOX_PY23_TASK {
OBJ_SUF=.py3
RUN_CYTHON_SCRIPT=$YMAKE_PYTHON $CYTHON_SCRIPT
PEERDIR(sandbox/sdk2)
- REGISTER_SANDBOX_IMPORT(${MODDIR})
+ REGISTER_SANDBOX_IMPORT(${MODDIR})
}
}
# tag:sandbox-specific
-### @usage: SANDBOX_PY3_TASK([Name])
-###
-### Multimodule describing Sandbox task (Python3 code that can be executed by Sandbox system).
-###
-### When being a final target, this multimodule builds Sandbox binary task. It may PEERDIR other SANDBOX_PY3_TASKs as libraries.
-### The final artifact is provided when SANDBOX_PY3_TASK is referred to by DEPENDS and BUNDLE macros.
-### As PEERDIR target, it works like regular PY3_LIBRARY with predefined dependencies on Sandbox SDK to allow code reuse among SANDBOX_PY3_TASKs.
-###
-### Currently Sandbox supports Python 3.x only in binary tasks, both variants will be compatible only with Python 3.x and py23 libraries
-### and will select multimodule variants accordingly.
-###
-### Documentation: https://wiki.yandex-team.ru/sandbox/tasks/binary
-multimodule SANDBOX_PY3_TASK {
+### @usage: SANDBOX_PY3_TASK([Name])
+###
+### Multimodule describing Sandbox task (Python3 code that can be executed by Sandbox system).
+###
+### When being a final target, this multimodule builds Sandbox binary task. It may PEERDIR other SANDBOX_PY3_TASKs as libraries.
+### The final artifact is provided when SANDBOX_PY3_TASK is referred to by DEPENDS and BUNDLE macros.
+### As PEERDIR target, it works like regular PY3_LIBRARY with predefined dependencies on Sandbox SDK to allow code reuse among SANDBOX_PY3_TASKs.
+###
+### Currently Sandbox supports Python 3.x only in binary tasks, both variants will be compatible only with Python 3.x and py23 libraries
+### and will select multimodule variants accordingly.
+###
+### Documentation: https://wiki.yandex-team.ru/sandbox/tasks/binary
+multimodule SANDBOX_PY3_TASK {
module SB_TASK_BIN: PY3_PROGRAM_BIN {
- PY_MAIN(sandbox.taskbox.binary)
- PEERDIR(sandbox/bin sandbox/sdk2 sandbox/taskbox/worker)
- SET_APPEND(NO_CHECK_IMPORTS_FOR_VALUE api.*)
- SET_APPEND(NO_CHECK_IMPORTS_FOR_VALUE kernel.*)
- SET_APPEND(NO_CHECK_IMPORTS_FOR_VALUE library.*)
- SET_APPEND(NO_CHECK_IMPORTS_FOR_VALUE sky*)
- REGISTER_SANDBOX_IMPORT(${MODDIR})
- }
- module PY3: PY3_LIBRARY {
- PEERDIR(sandbox/sdk2)
- REGISTER_SANDBOX_IMPORT(${MODDIR})
- }
-}
-
+ PY_MAIN(sandbox.taskbox.binary)
+ PEERDIR(sandbox/bin sandbox/sdk2 sandbox/taskbox/worker)
+ SET_APPEND(NO_CHECK_IMPORTS_FOR_VALUE api.*)
+ SET_APPEND(NO_CHECK_IMPORTS_FOR_VALUE kernel.*)
+ SET_APPEND(NO_CHECK_IMPORTS_FOR_VALUE library.*)
+ SET_APPEND(NO_CHECK_IMPORTS_FOR_VALUE sky*)
+ REGISTER_SANDBOX_IMPORT(${MODDIR})
+ }
+ module PY3: PY3_LIBRARY {
+ PEERDIR(sandbox/sdk2)
+ REGISTER_SANDBOX_IMPORT(${MODDIR})
+ }
+}
+
# tag:python-specific tag:internal
NO_PYTHON_INCLS=no
### @usage: NO_PYTHON_INCLUDES() # internal