diff options
| author | thegeorg <thegeorg@yandex-team.ru> | 2022-02-10 16:45:12 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:45:12 +0300 |
| commit | 49116032d905455a7b1c994e4a696afc885c1e71 (patch) | |
| tree | be835aa92c6248212e705f25388ebafcf84bc7a1 /build/plugins | |
| parent | 4e839db24a3bbc9f1c610c43d6faaaa99824dcca (diff) | |
| download | ydb-49116032d905455a7b1c994e4a696afc885c1e71.tar.gz | |
Restoring authorship annotation for <thegeorg@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'build/plugins')
| -rw-r--r-- | build/plugins/pybuild.py | 24 | ||||
| -rw-r--r-- | build/plugins/ytest.py | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/build/plugins/pybuild.py b/build/plugins/pybuild.py index b2f47fc890..f32a2d39a0 100644 --- a/build/plugins/pybuild.py +++ b/build/plugins/pybuild.py @@ -483,19 +483,19 @@ def onpy_srcs(unit, *args): unit.onresource(res) add_python_lint_checks(unit, 2, [path for path, mod in pys] + unit.get(['_PY_EXTRA_LINT_FILES_VALUE']).split()) - use_vanilla_protoc = unit.get('USE_VANILLA_PROTOC') == 'yes' - if use_vanilla_protoc: - cpp_runtime_path = 'contrib/libs/protobuf_std' - py_runtime_path = 'contrib/python/protobuf_std' - builtin_proto_path = cpp_runtime_path + '/' + BUILTIN_PROTO - else: - cpp_runtime_path = 'contrib/libs/protobuf' - py_runtime_path = 'contrib/python/protobuf' - builtin_proto_path = cpp_runtime_path + '/' + BUILTIN_PROTO + use_vanilla_protoc = unit.get('USE_VANILLA_PROTOC') == 'yes' + if use_vanilla_protoc: + cpp_runtime_path = 'contrib/libs/protobuf_std' + py_runtime_path = 'contrib/python/protobuf_std' + builtin_proto_path = cpp_runtime_path + '/' + BUILTIN_PROTO + else: + cpp_runtime_path = 'contrib/libs/protobuf' + py_runtime_path = 'contrib/python/protobuf' + builtin_proto_path = cpp_runtime_path + '/' + BUILTIN_PROTO if protos: - if not upath.startswith(py_runtime_path) and not upath.startswith(builtin_proto_path): - unit.onpeerdir(py_runtime_path) + if not upath.startswith(py_runtime_path) and not upath.startswith(builtin_proto_path): + unit.onpeerdir(py_runtime_path) unit.onpeerdir(unit.get("PY_PROTO_DEPS").split()) @@ -511,7 +511,7 @@ def onpy_srcs(unit, *args): unit.onpeerdir(['kernel/gazetteer/proto']) if evs: - unit.onpeerdir([cpp_runtime_path]) + unit.onpeerdir([cpp_runtime_path]) unit.on_generate_py_evs_internal([path for path, mod in evs]) unit.onpy_srcs([ev_arg(path, mod, unit) for path, mod in evs]) diff --git a/build/plugins/ytest.py b/build/plugins/ytest.py index f8ba5d834e..8970837f0f 100644 --- a/build/plugins/ytest.py +++ b/build/plugins/ytest.py @@ -136,7 +136,7 @@ def validate_test(unit, kw): elif valid_kw.get('SCRIPT-REL-PATH') == 'gtest': project_path = valid_kw.get('BUILD-FOLDER-PATH', "") if not project_path.startswith(("contrib", "devtools", "mail", "mds", "taxi")): - errors.append("GTEST_UGLY is not allowed here, use GTEST instead") + errors.append("GTEST_UGLY is not allowed here, use GTEST instead") size_timeout = collections.OrderedDict(sorted(consts.TestSize.DefaultTimeouts.items(), key=lambda t: t[1])) |