aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorr-vetrov <r-vetrov@yandex-team.ru>2022-02-10 16:48:37 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:48:37 +0300
commit57ec4be909691453c290c719a2055a1563ca9940 (patch)
tree5d5cb817648f650d76cf1076100726fd9b8448e8
parente9e4986eda97ffe44139887e03f9ae77852ff8d9 (diff)
downloadydb-57ec4be909691453c290c719a2055a1563ca9940.tar.gz
Restoring authorship annotation for <r-vetrov@yandex-team.ru>. Commit 2 of 2.
-rw-r--r--build/scripts/gen_py_protos.py2
-rw-r--r--build/scripts/gen_tasklet_reg.py36
-rw-r--r--build/ymake.core.conf28
-rw-r--r--contrib/python/ya.make4
-rw-r--r--library/python/testing/yatest_common/yatest/common/process.py4
5 files changed, 37 insertions, 37 deletions
diff --git a/build/scripts/gen_py_protos.py b/build/scripts/gen_py_protos.py
index 38bbec778b..08397472f9 100644
--- a/build/scripts/gen_py_protos.py
+++ b/build/scripts/gen_py_protos.py
@@ -44,7 +44,7 @@ def main():
assert out_dir_temp, 'Param "{0}" not found'.format(OUT_DIR_ARG)
retcode = subprocess.call(args)
- assert not retcode, 'Protoc failed for command {}'.format(' '.join(args))
+ assert not retcode, 'Protoc failed for command {}'.format(' '.join(args))
for root_temp, dirs, files in os.walk(out_dir_temp):
sub_dir = path.relpath(root_temp, out_dir_temp)
diff --git a/build/scripts/gen_tasklet_reg.py b/build/scripts/gen_tasklet_reg.py
index 5e2266dbb0..5b747c2eca 100644
--- a/build/scripts/gen_tasklet_reg.py
+++ b/build/scripts/gen_tasklet_reg.py
@@ -1,33 +1,33 @@
import argparse
-TEMPLATE = '''\
-{includes}\
-#include <tasklet/runtime/lib/{language}_wrapper.h>
+TEMPLATE = '''\
+{includes}\
+#include <tasklet/runtime/lib/{language}_wrapper.h>
#include <tasklet/runtime/lib/registry.h>
static const NTasklet::TRegHelper REG(
"{name}",
- new NTasklet::{wrapper}
+ new NTasklet::{wrapper}
);
'''
-WRAPPER = {
- 'cpp': 'TCppWrapper<{impl}>()',
+WRAPPER = {
+ 'cpp': 'TCppWrapper<{impl}>()',
'js': 'TJsWrapper("{impl}")',
- 'go': 'TGoWrapper("{impl}")',
- 'py': 'TPythonWrapper("{impl}")',
+ 'go': 'TGoWrapper("{impl}")',
+ 'py': 'TPythonWrapper("{impl}")',
'java': 'TJavaWrapper("{impl}", "{py_wrapper}")',
-}
+}
def parse_args():
parser = argparse.ArgumentParser()
- parser.add_argument('name')
- parser.add_argument('output')
- parser.add_argument('-l', '--lang', choices=WRAPPER, required=True)
- parser.add_argument('-i', '--impl', required=True)
+ parser.add_argument('name')
+ parser.add_argument('output')
+ parser.add_argument('-l', '--lang', choices=WRAPPER, required=True)
+ parser.add_argument('-i', '--impl', required=True)
parser.add_argument('-w', '--wrapper', required=False)
- parser.add_argument('includes', nargs='*')
+ parser.add_argument('includes', nargs='*')
return parser.parse_args()
@@ -35,17 +35,17 @@ def parse_args():
if __name__ == '__main__':
args = parse_args()
- includes = ''.join(
- '#include <{}>\n'.format(include)
+ includes = ''.join(
+ '#include <{}>\n'.format(include)
for include in args.includes
)
code = TEMPLATE.format(
includes=includes,
- language=args.lang,
+ language=args.lang,
name=args.name,
wrapper=WRAPPER[args.lang].format(impl=args.impl, py_wrapper=args.wrapper),
)
- with open(args.output, 'w') as f:
+ with open(args.output, 'w') as f:
f.write(code)
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 759697e2f6..081833998b 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -4992,14 +4992,14 @@ macro JAR_EXCLUDE(Filters...) {
### and will select multimodule variants accordingly.
###
### Documentation: https://wiki.yandex-team.ru/sandbox/tasks/binary
-multimodule SANDBOX_TASK {
+multimodule SANDBOX_TASK {
module SB_TASK_BIN: _PY2_PROGRAM {
- PY_MAIN(sandbox.taskbox.binary)
- PEERDIR(sandbox/bin sandbox/sdk2 sandbox/sandboxsdk 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*)
+ PY_MAIN(sandbox.taskbox.binary)
+ PEERDIR(sandbox/bin sandbox/sdk2 sandbox/sandboxsdk 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})
when ($FAIL_PY2 == "yes") {
_OK=no
@@ -5009,11 +5009,11 @@ multimodule SANDBOX_TASK {
}
ASSERT(_OK You are using deprecated Python2-only code (SANDBOX_TASK). Please consider rewriting to 2/3-compatible code.)
- }
+ }
module PY2: PY2_LIBRARY {
- PEERDIR(sandbox/sdk2 sandbox/sandboxsdk)
+ PEERDIR(sandbox/sdk2 sandbox/sandboxsdk)
REGISTER_SANDBOX_IMPORT(${MODDIR})
- }
+ }
}
# tag:sandbox-specific
@@ -7395,14 +7395,14 @@ macro TASKLET() {
TASKLET_REG_INCLUDES= \
${output_include;hide:"tasklet/runtime/lib/cpp_wrapper.h"} \
- ${output_include;hide:"tasklet/runtime/lib/go_wrapper.h"} \
- ${output_include;hide:"tasklet/runtime/lib/py_wrapper.h"} \
+ ${output_include;hide:"tasklet/runtime/lib/go_wrapper.h"} \
+ ${output_include;hide:"tasklet/runtime/lib/py_wrapper.h"} \
${output_include;hide:"tasklet/runtime/lib/js_wrapper.h"} \
${output_include;hide:"tasklet/runtime/lib/registry.h"}
macro TASKLET_REG(Name, Lang, Impl, Includes...) {
- PEERDIR(tasklet/domain sandbox/bin sandbox/taskbox/worker)
-
+ PEERDIR(tasklet/domain sandbox/bin sandbox/taskbox/worker)
+
when($Lang == "js") {
# JS runtime links the Node.js from contrib as a library, which is a bit heavy,
# so we do it, only if any JS tasklets are linked into the target
diff --git a/contrib/python/ya.make b/contrib/python/ya.make
index ee36bb0228..d01ced9f3a 100644
--- a/contrib/python/ya.make
+++ b/contrib/python/ya.make
@@ -287,7 +287,7 @@ RECURSE(
django-redis-cache
django-replicated
django-rest-framework-docs
- django-rest-multiple-models
+ django-rest-multiple-models
django-reversion
django-select2-forms
django-sentinel
@@ -610,7 +610,7 @@ RECURSE(
marshmallow_dataclass
marshmallow-enum
marshmallow-mongoengine
- marshmallow-oneofschema
+ marshmallow-oneofschema
marshmallow-sqlalchemy
marshmallow-union
matplotlib
diff --git a/library/python/testing/yatest_common/yatest/common/process.py b/library/python/testing/yatest_common/yatest/common/process.py
index 5b51063173..a8bcc21f51 100644
--- a/library/python/testing/yatest_common/yatest/common/process.py
+++ b/library/python/testing/yatest_common/yatest/common/process.py
@@ -443,7 +443,7 @@ def execute(
:param preexec_fn: subrpocess.Popen preexec_fn arg
:param on_timeout: on_timeout(<execution object>, <timeout value>) callback
- :return _Execution: Execution object
+ :return _Execution: Execution object
"""
if env is None:
env = os.environ.copy()
@@ -584,7 +584,7 @@ def py_execute(
:param creationflags: command creation flags
:param wait: should wait until the command finishes
:param process_progress_listener=object that is polled while execution is in progress
- :return _Execution: Execution object
+ :return _Execution: Execution object
"""
if isinstance(command, six.string_types):
command = [command]