Restoring authorship annotation for exprmntr <exprmntr@yandex-team.ru>. Commit 1 of 2.

build/plugins/_test_const.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 import re
-import sys
+import sys 
 
 
 RESTART_TEST_INDICATOR = '##restart-test##'
@@ -227,20 +227,20 @@ class YaTestTags(Enum):
     NotAutocheck = "ya:not_autocheck"
 
 
-class Status(object):
+class Status(object): 
     GOOD, XFAIL, FAIL, XPASS, MISSING, CRASHED, TIMEOUT = range(1, 8)
-    SKIPPED = -100
-    NOT_LAUNCHED = -200
-    CANON_DIFF = -300
-    DESELECTED = -400
-    INTERNAL = -sys.maxint
+    SKIPPED = -100 
+    NOT_LAUNCHED = -200 
+    CANON_DIFF = -300 
+    DESELECTED = -400 
+    INTERNAL = -sys.maxint 
     FLAKY = -50
-    BY_NAME = {'good': GOOD, 'fail': FAIL, 'xfail': XFAIL, 'xpass': XPASS, 'missing': MISSING, 'crashed': CRASHED,
-               'skipped': SKIPPED, 'flaky': FLAKY, 'not_launched': NOT_LAUNCHED, 'timeout': TIMEOUT, 'diff': CANON_DIFF,
-               'internal': INTERNAL, 'deselected': DESELECTED}
-    TO_STR = {GOOD: 'good', FAIL: 'fail', XFAIL: 'xfail', XPASS: 'xpass', MISSING: 'missing', CRASHED: 'crashed',
-              SKIPPED: 'skipped', FLAKY: 'flaky', NOT_LAUNCHED: 'not_launched', TIMEOUT: 'timeout', CANON_DIFF: 'diff',
-              INTERNAL: 'internal', DESELECTED: 'deselected'}
+    BY_NAME = {'good': GOOD, 'fail': FAIL, 'xfail': XFAIL, 'xpass': XPASS, 'missing': MISSING, 'crashed': CRASHED, 
+               'skipped': SKIPPED, 'flaky': FLAKY, 'not_launched': NOT_LAUNCHED, 'timeout': TIMEOUT, 'diff': CANON_DIFF, 
+               'internal': INTERNAL, 'deselected': DESELECTED} 
+    TO_STR = {GOOD: 'good', FAIL: 'fail', XFAIL: 'xfail', XPASS: 'xpass', MISSING: 'missing', CRASHED: 'crashed', 
+              SKIPPED: 'skipped', FLAKY: 'flaky', NOT_LAUNCHED: 'not_launched', TIMEOUT: 'timeout', CANON_DIFF: 'diff', 
+              INTERNAL: 'internal', DESELECTED: 'deselected'} 
 
 
 class _Colors(object):

build/plugins/pybuild.py

@@ -128,7 +128,7 @@ def add_python_lint_checks(unit, py_ver, files):
             # temporary allowed, TODO: remove
             "taxi/uservices/",
             "travel/",
-            "market/report/lite/",  # MARKETOUT-38662, deadline: 2021-08-12
+            "market/report/lite/",  # MARKETOUT-38662, deadline: 2021-08-12 
             "passport/backend/oauth/",  # PASSP-35982
         )
 
@@ -522,15 +522,15 @@ def onpy_srcs(unit, *args):
         unit.onsrcs(['GLOBAL', '{}.fbs.pysrc'.format(pysrc_base_name)])
 
 
-def _check_test_srcs(*args):
+def _check_test_srcs(*args): 
     used = set(args) & {"NAMESPACE", "TOP_LEVEL", "__main__.py"}
     if used:
         param = list(used)[0]
         ymake.report_configure_error('in TEST_SRCS: you cannot use {} here - it would broke testing machinery'.format(param))
-
-
-def ontest_srcs(unit, *args):
-    _check_test_srcs(*args)
+ 
+ 
+def ontest_srcs(unit, *args): 
+    _check_test_srcs(*args) 
     if unit.get('PY3TEST_BIN' if is_py3(unit) else 'PYTEST_BIN') != 'no':
         unit.onpy_srcs(["NAMESPACE", "__tests__"] + list(args))
 

build/plugins/ytest.py

@@ -4,7 +4,7 @@ import sys
 import json
 import copy
 import base64
-import shlex
+import shlex 
 import _common
 import lib._metric_resolvers as mr
 import _test_const as consts
@@ -50,17 +50,17 @@ def save_in_file(filepath, data):
             print >> file_handler, data
 
 
-def prepare_recipes(data):
-    data = data.replace('"USE_RECIPE_DELIM"', "\n")
-    data = data.replace("$TEST_RECIPES_VALUE", "")
-    return base64.b64encode(data or "")
-
-
-def prepare_env(data):
-    data = data.replace("$TEST_ENV_VALUE", "")
-    return serialize_list(shlex.split(data))
-
-
+def prepare_recipes(data): 
+    data = data.replace('"USE_RECIPE_DELIM"', "\n") 
+    data = data.replace("$TEST_RECIPES_VALUE", "") 
+    return base64.b64encode(data or "") 
+ 
+ 
+def prepare_env(data): 
+    data = data.replace("$TEST_ENV_VALUE", "") 
+    return serialize_list(shlex.split(data)) 
+ 
+ 
 def is_yt_spec_contain_pool_info(filename):  # XXX switch to yson in ymake + perf test for configure
     pool_re = re.compile(r"""['"]*pool['"]*\s*?=""")
     cypress_root_re = re.compile(r"""['"]*cypress_root['"]*\s*=""")
@@ -484,9 +484,9 @@ def onadd_ytest(unit, *args):
         'BINARY-PATH': "{}/{}".format(unit_path, unit.filename()),
         'GLOBAL-LIBRARY-PATH': unit.global_filename(),
         'CUSTOM-DEPENDENCIES': ' '.join(spec_args.get('DEPENDS', []) + get_values_list(unit, 'TEST_DEPENDS_VALUE')),
-        'TEST-RECIPES': prepare_recipes(unit.get("TEST_RECIPES_VALUE")),
-        'TEST-ENV': prepare_env(unit.get("TEST_ENV_VALUE")),
-        #  'TEST-PRESERVE-ENV': 'da',
+        'TEST-RECIPES': prepare_recipes(unit.get("TEST_RECIPES_VALUE")), 
+        'TEST-ENV': prepare_env(unit.get("TEST_ENV_VALUE")), 
+        #  'TEST-PRESERVE-ENV': 'da', 
         'TEST-DATA': serialize_list(test_data),
         'TEST-TIMEOUT': test_timeout,
         'FORK-MODE': fork_mode,
@@ -553,11 +553,11 @@ def onadd_check(unit, *args):
     test_dir = get_norm_unit_path(unit)
 
     test_timeout = ''
-    fork_mode = ''
+    fork_mode = '' 
     extra_test_data = ''
     extra_test_dart_data = {}
     ymake_java_test = unit.get('YMAKE_JAVA_TEST') == 'yes'
-
+ 
     if check_type in ["flake8.py2", "flake8.py3"]:
         script_rel_path = check_type
         fork_mode = unit.get('TEST_FORK_MODE') or ''
@@ -580,7 +580,7 @@ def onadd_check(unit, *args):
             return
         script_rel_path = "java.style"
         test_timeout = '120'
-        fork_mode = unit.get('TEST_FORK_MODE') or ''
+        fork_mode = unit.get('TEST_FORK_MODE') or '' 
         if ymake_java_test:
             extra_test_data = java_srcdirs_to_data(unit, 'ALL_SRCDIRS')
         extra_test_dart_data['JDK_RESOURCE'] = 'JDK' + (unit.get('JDK_VERSION') or '_DEFAULT')
@@ -594,10 +594,10 @@ def onadd_check(unit, *args):
 
     use_arcadia_python = unit.get('USE_ARCADIA_PYTHON')
     uid_ext = ''
-    if check_type in ("check.data", "check.resource"):
+    if check_type in ("check.data", "check.resource"): 
         if unit.get("VALIDATE_DATA") == "no":
             return
-    if check_type == "check.data":
+    if check_type == "check.data": 
         uid_ext = unit.get("SBR_UID_EXT").split(" ", 1)[-1]  # strip variable name
         data_re = re.compile(r"sbr:/?/?(\d+)=?.*")
         data = flat_args[1:]
@@ -624,7 +624,7 @@ def onadd_check(unit, *args):
         "SBR-UID-EXT": uid_ext,
         'SPLIT-FACTOR': '',
         'TEST_PARTITION': 'SEQUENTIAL',
-        'FORK-MODE': fork_mode,
+        'FORK-MODE': fork_mode, 
         'FORK-TEST-FILES': '',
         'SIZE': 'SMALL',
         'TAG': '',
@@ -638,7 +638,7 @@ def onadd_check(unit, *args):
         'NO_JBUILD': 'yes' if ymake_java_test else 'no',
     }
     test_record.update(extra_test_dart_data)
-
+ 
     data = dump_test(unit, test_record)
     if data:
         unit.set_property(["DART_DATA", data])
@@ -657,7 +657,7 @@ def onadd_check_py_imports(unit, *args):
         return
     if unit.get('NO_CHECK_IMPORTS_FOR_VALUE').strip() == "":
         return
-    unit.onpeerdir(['library/python/testing/import_test'])
+    unit.onpeerdir(['library/python/testing/import_test']) 
     check_type = "py.imports"
     test_dir = get_norm_unit_path(unit)
 
@@ -832,27 +832,27 @@ def onjava_test(unit, *args):
     test_cwd = unit.get('TEST_CWD_VALUE') or ''  # TODO: validate test_cwd value
 
     if unit.get('MODULE_TYPE') == 'JUNIT5':
-        script_rel_path = 'junit5.test'
-    else:
-        script_rel_path = 'junit.test'
-
+        script_rel_path = 'junit5.test' 
+    else: 
+        script_rel_path = 'junit.test' 
+ 
     ymake_java_test = unit.get('YMAKE_JAVA_TEST') == 'yes'
     test_record = {
         'SOURCE-FOLDER-PATH': path,
         'TEST-NAME': '-'.join([os.path.basename(os.path.dirname(path)), os.path.basename(path)]),
-        'SCRIPT-REL-PATH': script_rel_path,
+        'SCRIPT-REL-PATH': script_rel_path, 
         'TEST-TIMEOUT': unit.get('TEST_TIMEOUT') or '',
         'TESTED-PROJECT-NAME': path,
-        'TEST-ENV': prepare_env(unit.get("TEST_ENV_VALUE")),
-        #  'TEST-PRESERVE-ENV': 'da',
+        'TEST-ENV': prepare_env(unit.get("TEST_ENV_VALUE")), 
+        #  'TEST-PRESERVE-ENV': 'da', 
         'TEST-DATA': serialize_list(sorted(_common.filter_out_by_keyword(test_data, 'AUTOUPDATED'))),
         'FORK-MODE': unit.get('TEST_FORK_MODE') or '',
         'SPLIT-FACTOR': unit.get('TEST_SPLIT_FACTOR') or '',
         'CUSTOM-DEPENDENCIES': ' '.join(get_values_list(unit, 'TEST_DEPENDS_VALUE')),
         'TAG': serialize_list(_get_test_tags(unit)),
         'SIZE': unit.get('TEST_SIZE_NAME') or '',
-        'REQUIREMENTS': serialize_list(get_values_list(unit, 'TEST_REQUIREMENTS_VALUE')),
-        'TEST-RECIPES': prepare_recipes(unit.get("TEST_RECIPES_VALUE")),
+        'REQUIREMENTS': serialize_list(get_values_list(unit, 'TEST_REQUIREMENTS_VALUE')), 
+        'TEST-RECIPES': prepare_recipes(unit.get("TEST_RECIPES_VALUE")), 
 
         # JTEST/JTEST_FOR only
         'MODULE_TYPE': unit.get('MODULE_TYPE'),

build/rules/jstyle/migrations.yaml

@@ -1,8 +1,8 @@
-jstyle:
-    NoLint:
-        ignore:
-            - '*'
-        prefixes: []
+jstyle: 
+    NoLint: 
+        ignore: 
+            - '*' 
+        prefixes: [] 
     NoParameterNumber:
         ignore:
             - 'ParameterNumber'

build/rules/jstyle/ya.make

@@ -1 +1 @@
-OWNER(g:yatest g:java-contrib)
+OWNER(g:yatest g:java-contrib) 

build/ya.conf.json

@@ -3960,7 +3960,7 @@
                     "default": true
                 }
             ]
-        },
+        }, 
         "idea_run_plugin": {
             "tools": {
                 "idea_run_plugin": {
@@ -4270,12 +4270,12 @@
                 }
             ]
         },
-        "kiwi_protos": {
-            "tools": {
+        "kiwi_protos": { 
+            "tools": { 
                 "kiwi_protos": {
                     "bottle": "kiwi_protos"
                 }
-            },
+            }, 
             "platforms": [
                 {
                     "host": {
@@ -7026,7 +7026,7 @@
         },
         "kwfeed": {
             "formula": {
-                "sandbox_id": 36077631,
+                "sandbox_id": 36077631, 
                 "match": "KWFeed"
             },
             "executable": {
@@ -7073,7 +7073,7 @@
         },
         "kwmktorrent": {
             "formula": {
-                "sandbox_id": 451506451,
+                "sandbox_id": 451506451, 
                 "match": "KWMKTorrent"
             },
             "executable": {
@@ -7084,7 +7084,7 @@
         },
         "kwmqbuild": {
             "formula": {
-                "sandbox_id": 41067877,
+                "sandbox_id": 41067877, 
                 "match": "KWMQBuild"
             },
             "executable": {
@@ -7129,16 +7129,16 @@
                 "sandbox_id": 42519064,
                 "match": "fast_diff"
             }
-        },
+        }, 
         "kiwi_protos": {
-            "formula": {
-                "sandbox_id": 32521995,
-                "match": "KiWi python protos"
-            }
+            "formula": { 
+                "sandbox_id": 32521995, 
+                "match": "KiWi python protos" 
+            } 
         },
         "allure_commandline": {
             "formula": {
-                "sandbox_id": 569859192,
+                "sandbox_id": 569859192, 
                 "match": "Allure Commandline"
             },
             "executable": {

build/ymake.core.conf

@@ -1838,12 +1838,12 @@ module _BASE_UNITTEST: _BASE_PROGRAM {
     .FINAL_TARGET=no
     .NODE_TYPE=Program
     .ALLOWED=YT_SPEC
-    when ($UT_SKIP_EXCEPTIONS == "yes") {
-        C_DEFINES+=-DUT_SKIP_EXCEPTIONS
-    }
+    when ($UT_SKIP_EXCEPTIONS == "yes") { 
+        C_DEFINES+=-DUT_SKIP_EXCEPTIONS 
+    } 
     SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
-}
-
+} 
+ 
 UNITTEST_SEM=$CPP_PROGRAM_SEM && add_test NAME $REALPRJNAME COMMAND $REALPRJNAME
 # tag:test
 ### @usage: UNITTEST([name])
@@ -1864,10 +1864,10 @@ module UNITTEST: _BASE_UNITTEST {
 ###
 ### YT Unit test module based on mapreduce/yt/library/utlib
 module YT_UNITTEST: _BASE_UNITTEST {
-    PEERDIR(mapreduce/yt/library/utlib)
+    PEERDIR(mapreduce/yt/library/utlib) 
     ADD_YTEST($MODULE_PREFIX$REALPRJNAME unittest.py)
-}
-
+} 
+ 
 # tag:test
 ### @usage: UNITTEST_WITH_CUSTOM_ENTRY_POINT([name])
 ###
@@ -2070,14 +2070,14 @@ macro REQUIREMENTS(Tags...) {
 }
 
 # tag:test
-TEST_ENV_VALUE=
-### @usage: ENV(key[=value])
-###
+TEST_ENV_VALUE= 
+### @usage: ENV(key[=value]) 
+### 
 ### Sets env variable key to value (gets value from system env by default).
 macro ENV(Data...) {
-    SET_APPEND(TEST_ENV_VALUE ${quo:Data})
-}
-
+    SET_APPEND(TEST_ENV_VALUE ${quo:Data}) 
+} 
+ 
 ### @usage: CONFTEST_LOAD_POLICY_LOCAL()
 ###
 ### Loads conftest.py files in a way that pytest does it
@@ -2086,17 +2086,17 @@ macro CONFTEST_LOAD_POLICY_LOCAL() {
 }
 
 # tag:test
-TEST_RECIPES_VALUE=
+TEST_RECIPES_VALUE= 
 ### @usage: USE_RECIPE(path [arg1 arg2...])
-###
+### 
 ### Provides prepared environment via recipe for test.
 ###
 ### Documentation: https://wiki.yandex-team.ru/yatool/test/recipes
 macro USE_RECIPE(Data...) {
-    SET_APPEND(TEST_RECIPES_VALUE $Data)
-    SET_APPEND(TEST_RECIPES_VALUE "USE_RECIPE_DELIM")
-}
-
+    SET_APPEND(TEST_RECIPES_VALUE $Data) 
+    SET_APPEND(TEST_RECIPES_VALUE "USE_RECIPE_DELIM") 
+} 
+ 
 # tag:python-specific tag:test
 TEST_PYTHON_PATH_VALUE=
 
@@ -2156,7 +2156,7 @@ module _BASE_PYTEST: _BASE_PY_PROGRAM {
         MODULE_SUFFIX=.pkg.fake
         PEERDIR+=library/python/pytest/empty
     }
-
+ 
     SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
 }
 
@@ -2195,15 +2195,15 @@ module PY2TEST: PYTEST_BIN {
 ###
 ### Same as PY3TEST. Don't use this, use PY3TEST instead.
 module PY3TEST_BIN: _BASE_PY3_PROGRAM {
-    .NODE_TYPE=Program
+    .NODE_TYPE=Program 
     .FINAL_TARGET=no
     .ALLOWED=YT_SPEC NO_DOCTESTS
     SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)
     SET(MODULE_LANG PY3)
-    SETUP_PYTEST_BIN()
-    PEERDIR+=library/python/pytest
-}
-
+    SETUP_PYTEST_BIN() 
+    PEERDIR+=library/python/pytest 
+} 
+ 
 # tag:python-specific tag:test
 ### Disable submodules with the specified name(s).
 ### Unlike EXCLUDE_TAGS this variable:
@@ -2230,8 +2230,8 @@ multimodule PY3TEST {
         PEERDIR+=library/python/pytest
         _REQUIRE_EXPLICIT_LICENSE()
     }
-}
-
+} 
+ 
 # tag:cpp-specific tag:test
 module CPP_STYLE_TEST: PY3TEST_BIN {
     DEPENDS(contrib/libs/clang12/tools/clang-format)
@@ -2290,7 +2290,7 @@ module EXECTEST: _BARE_UNIT {
     .NODE_TYPE=Program
     .FINAL_TARGET=no
     .ALLOWED=YT_SPEC
-    .RESTRICTED=FORK_TEST_FILES
+    .RESTRICTED=FORK_TEST_FILES 
     SET(MODULE_SUFFIX .pkg.fake)
     SETUP_EXECTEST()
     SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS canondata/result.json)

build/ymake_conf.py

@@ -629,7 +629,7 @@ class Build(object):
         swiftc.print_compiler()
 
         if host.is_linux or host.is_macos or host.is_cygwin:
-            if is_negative('USE_ARCADIA_PYTHON'):
+            if is_negative('USE_ARCADIA_PYTHON'): 
                 python = Python(self.tc)
                 python.configure_posix()
                 python.print_variables()
@@ -2040,7 +2040,7 @@ class LD(Linker):
             '$C_FLAGS_PLATFORM', '$BEFORE_PEERS', self.start_group, '${rootrel:PEERS}', self.end_group, '$AFTER_PEERS',
             '$EXPORTS_VALUE $LINKER_SCRIPT_VALUE $LDFLAGS $LDFLAGS_GLOBAL $OBJADDE $OBJADDE_LIB',
             '$C_LIBRARY_PATH $C_SYSTEM_LIBRARIES_INTERCEPT $C_SYSTEM_LIBRARIES $STRIP_FLAG $DCE_FLAG $ICF_FLAG $LINKER_TIME_TRACE_FLAG']
-
+ 
         arch_flag = '--arch={arch}'.format(arch=self.target.os_compat)
         soname_flag = '-Wl,{option},${{_SONAME}}'.format(option=self.soname_option)
         shared_flag = '-shared'
@@ -2050,9 +2050,9 @@ class LD(Linker):
             + ' ${rootrel;ext=.o:SRCS_GLOBAL} ${rootrel;ext=.supp:SRCS_GLOBAL}'
         else:
             srcs_globals = '--start-wa ${rootrel;ext=.a:SRCS_GLOBAL} --end-wa ${rootrel;ext=.o:SRCS_GLOBAL} ${rootrel;ext=.supp:SRCS_GLOBAL}'
-
+ 
         ld_env_style = '${cwd:ARCADIA_BUILD_ROOT} $TOOLCHAIN_ENV ${kv;hide:"p LD"} ${requirements;hide:LD_REQUIREMENTS} ${kv;hide:"pc light-blue"} ${kv;hide:"show_out"}'
-
+ 
         # Program
         emit(
             "GENERATE_MF_CMD",
@@ -2153,7 +2153,7 @@ class LD(Linker):
             # Static Library
             emit('LINK_LIB', '$GENERATE_MF &&', archiver, '$TARGET', tail_link_lib)
         emit('GLOBAL_LINK_LIB', archiver, '$GLOBAL_TARGET', tail_link_lib)
-
+ 
         # "Fat Object" : pre-linked global objects and static library with all dependencies
         def emit_link_fat_obj(cmd_name, need_wa_option, *extended_flags):
             prefix = ['$GENERATE_MF && $GENERATE_VCS_C_INFO_NODEP &&',
@@ -2164,7 +2164,7 @@ class LD(Linker):
                       '-Ya,linker $CXX_COMPILER $LDFLAGS_GLOBAL $C_FLAGS_PLATFORM', self.ld_sdk, '-Ya,archiver', archiver,
                       '$TOOLCHAIN_ENV ${kv;hide:"p LD"} ${requirements;hide:LD_REQUIREMENTS} ${kv;hide:"pc light-blue"} ${kv;hide:"show_out"}']
             emit(cmd_name, *(prefix + list(extended_flags) + suffix))
-
+ 
         # TODO(somov): Проверить, не нужны ли здесь все остальные флаги компоновки (LDFLAGS и т. д.).
         emit_link_fat_obj('LINK_FAT_OBJECT', True, '--obj=$TARGET', '--lib=${output:REALPRJNAME.a}')
         emit_link_fat_obj('LINK_RECURSIVE_LIBRARY', False, '--lib=$TARGET', '--with-own-obj', '--with-global-srcs')
@@ -3095,9 +3095,9 @@ class Cuda(object):
         if self.use_arcadia_cuda.value:
             return '10.1'
 
-        if not self.have_cuda.value:
-            return None
-
+        if not self.have_cuda.value: 
+            return None 
+ 
         nvcc_exe = self.build.host.exe(os.path.expanduser(self.cuda_root.value), 'bin', 'nvcc')
 
         def error():

contrib/libs/python/ya.make

@@ -45,7 +45,7 @@ ELSE()
     ENDIF()
 ENDIF()
 
-END()
+END() 
 
 RECURSE(
     Include