Skip to content

Commit 621e3d8

Browse files
EnjectionEnjection
committed
Merge branch 'mergelibs11' into main
2 parents a7dad28 + 00b9982 commit 621e3d8

File tree

646 files changed

+17057
-9254
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

646 files changed

+17057
-9254
lines changed

‎build/conf/go.conf

-3
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,6 @@ GOSTD_VERSION=1.21
6363
when ($GOSTD_VERSION == "1.21") {
6464
GOSTD=contrib/go/_std_1.21/src
6565
}
66-
elsewhen ($GOSTD_VERSION == "1.20") {
67-
GOSTD=contrib/go/_std_1.20/src
68-
}
6966
otherwise {
7067
GOSTD=__unsupported_go_std_library_version_[$GOSTD_VERSION]__
7168
}

‎build/conf/python.conf

+11
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,17 @@ macro STYLE_PYTHON(pyproject...) {
236236
SET(STYLE_PYTHON_PYPROJECT_VALUE ${pyproject})
237237
}
238238

239+
# tag:python-specific tag:test
240+
STYLE_RUFF_VALUE=no
241+
STYLE_RUFF_PYPROJECT_VALUE=
242+
### @usage: STYLE_RUFF([pyproject])
243+
###
244+
### Check python3 sources for style issues using ruff.
245+
macro STYLE_RUFF(pyproject...) {
246+
SET(STYLE_RUFF_VALUE yes)
247+
SET(STYLE_RUFF_PYPROJECT_VALUE ${pyproject})
248+
}
249+
239250
# tag:python-specific tag:test
240251
### @usage: NO_DOCTESTS()
241252
###

‎build/export_generators/hardcoded-cmake/cmake/common.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -296,13 +296,13 @@ function(set_yunittest_property)
296296
get_property(SPLIT_FACTOR TARGET ${YUNITTEST_ARGS_TEST} PROPERTY SPLIT_FACTOR)
297297

298298
if ((${SPLIT_FACTOR} EQUAL 1) OR (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/run_testpack"))
299-
set_property(TEST ${YUNITTEST_ARGS_TEST} PROPERTY ${YUNITTEST_ARGS_PROPERTY} ${YUNITTEST_ARGS_UNPARSED_ARGUMENTS})
299+
set_property(TEST ${YUNITTEST_ARGS_TEST} PROPERTY ${YUNITTEST_ARGS_PROPERTY} "${YUNITTEST_ARGS_UNPARSED_ARGUMENTS}")
300300
return()
301301
endif()
302302

303303
math(EXPR LastIdx "${SPLIT_FACTOR} - 1")
304304
foreach(Idx RANGE ${LastIdx})
305-
set_property(TEST ${YUNITTEST_ARGS_TEST}_${Idx} PROPERTY ${YUNITTEST_ARGS_PROPERTY} ${YUNITTEST_ARGS_UNPARSED_ARGUMENTS})
305+
set_property(TEST ${YUNITTEST_ARGS_TEST}_${Idx} PROPERTY ${YUNITTEST_ARGS_PROPERTY} "${YUNITTEST_ARGS_UNPARSED_ARGUMENTS}")
306306
endforeach()
307307
endfunction()
308308

‎build/export_generators/hardcoded-cmake/generator.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ attrs=[
8484
"target_sources_custom",
8585
"use_export_script",
8686
"add_yunittest",
87-
"set_yunittest_property",
87+
"set_yunittest_property",
8888
]
8989
copy=[
9090
"cmake/common.cmake",

‎build/external_resources/gdb/resources.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
"uri": "sbr:2319130389"
88
},
99
"linux-x86_64": {
10-
"uri": "sbr:5709310220"
10+
"uri": "sbr:5720181629"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:5709435327"
13+
"uri": "sbr:5720688825"
1414
}
1515
},
1616
"platform_replacements": {},

‎build/external_resources/go_tools/go1.20.json

-19
This file was deleted.

‎build/external_resources/go_tools/go1.21.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"by_platform": {
33
"darwin-arm64": {
4-
"uri": "sbr:5424061624"
4+
"uri": "sbr:5720722976"
55
},
66
"darwin-x86_64": {
7-
"uri": "sbr:5424057306"
7+
"uri": "sbr:5720717636"
88
},
99
"linux-x86_64": {
10-
"uri": "sbr:5424033677"
10+
"uri": "sbr:5720706939"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:5424038053"
13+
"uri": "sbr:5720713011"
1414
},
1515
"win32-x86_64": {
16-
"uri": "sbr:5424051723"
16+
"uri": "sbr:5720736838"
1717
}
1818
}
1919
}

‎build/external_resources/go_tools/ya.make

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
RESOURCES_LIBRARY()
22

3-
IF(GOSTD_VERSION == 1.20)
4-
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(GO_TOOLS go1.20.json)
5-
ELSEIF(GOSTD_VERSION == 1.21)
3+
IF(GOSTD_VERSION == 1.21)
64
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(GO_TOOLS go1.21.json)
75
ELSE()
86
MESSAGE(FATAL_ERROR Unsupported version [${GOSTD_VERSION}] of Go Standard Library)

‎build/mapping.conf.json

+20
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@
3636
"5424033677": "https://devtools-registry.s3.yandex.net/5424033677",
3737
"5424038053": "https://devtools-registry.s3.yandex.net/5424038053",
3838
"5424051723": "https://devtools-registry.s3.yandex.net/5424051723",
39+
"5720717636": "https://devtools-registry.s3.yandex.net/5720717636",
40+
"5720722976": "https://devtools-registry.s3.yandex.net/5720722976",
41+
"5720706939": "https://devtools-registry.s3.yandex.net/5720706939",
42+
"5720713011": "https://devtools-registry.s3.yandex.net/5720713011",
43+
"5720736838": "https://devtools-registry.s3.yandex.net/5720736838",
3944
"5543659225": "https://devtools-registry.s3.yandex.net/5543659225",
4045
"5560184603": "https://devtools-registry.s3.yandex.net/5560184603",
4146
"5553311553": "https://devtools-registry.s3.yandex.net/5553311553",
@@ -51,7 +56,9 @@
5156
"1966560555": "https://devtools-registry.s3.yandex.net/1966560555",
5257
"309054781": "https://devtools-registry.s3.yandex.net/309054781",
5358
"5298918458": "https://devtools-registry.s3.yandex.net/5298918458",
59+
"5720688825": "https://devtools-registry.s3.yandex.net/5720688825",
5460
"5298901591": "https://devtools-registry.s3.yandex.net/5298901591",
61+
"5720181629": "https://devtools-registry.s3.yandex.net/5720181629",
5562
"5709310220": "https://devtools-registry.s3.yandex.net/5709310220",
5663
"5709435327": "https://devtools-registry.s3.yandex.net/5709435327",
5764
"360916612": "https://devtools-registry.s3.yandex.net/360916612",
@@ -102,6 +109,7 @@
102109
"5675381622": "https://devtools-registry.s3.yandex.net/5675381622",
103110
"5683487438": "https://devtools-registry.s3.yandex.net/5683487438",
104111
"5707396874": "https://devtools-registry.s3.yandex.net/5707396874",
112+
"5720350134": "https://devtools-registry.s3.yandex.net/5720350134",
105113
"5486731632": "https://devtools-registry.s3.yandex.net/5486731632",
106114
"5514350352": "https://devtools-registry.s3.yandex.net/5514350352",
107115
"5514360398": "https://devtools-registry.s3.yandex.net/5514360398",
@@ -121,6 +129,8 @@
121129
"5683523790": "https://devtools-registry.s3.yandex.net/5683523790",
122130
"5707396152": "https://devtools-registry.s3.yandex.net/5707396152",
123131
"5707407435": "https://devtools-registry.s3.yandex.net/5707407435",
132+
"5720351188": "https://devtools-registry.s3.yandex.net/5720351188",
133+
"5720356918": "https://devtools-registry.s3.yandex.net/5720356918",
124134
"4307890075": "https://devtools-registry.s3.yandex.net/4307890075",
125135
"5517245192": "https://devtools-registry.s3.yandex.net/5517245192",
126136
"4307901240": "https://devtools-registry.s3.yandex.net/4307901240",
@@ -235,6 +245,11 @@
235245
"5424033677": "OTHER_RESOURCE-none-1.21.3-y_go1.21.3.linux-amd64.tar.gz",
236246
"5424038053": "OTHER_RESOURCE-none-1.21.3-y_go1.21.3.linux-arm64.tar.gz",
237247
"5424051723": "OTHER_RESOURCE-none-1.21.3-y_go1.21.3.windows-amd64.tar.gz",
248+
"5720717636": "OTHER_RESOURCE-none-1.21.6-y_go1.21.6.darwin-amd64.tar.gz",
249+
"5720722976": "OTHER_RESOURCE-none-1.21.6-y_go1.21.6.darwin-arm64.tar.gz",
250+
"5720706939": "OTHER_RESOURCE-none-1.21.6-y_go1.21.6.linux-amd64.tar.gz",
251+
"5720713011": "OTHER_RESOURCE-none-1.21.6-y_go1.21.6.linux-arm64.tar.gz",
252+
"5720736838": "OTHER_RESOURCE-none-1.21.6-y_go1.21.6.windows-amd64.tar.gz",
238253
"5543659225": "OTHER_RESOURCE-none-none-clang-darwin-arm64.tgz",
239254
"5560184603": "OTHER_RESOURCE-none-none-clang-mingw64.tgz",
240255
"5553311553": "OTHER_RESOURCE-none-none-clang-new-darwin-arm64.tgz",
@@ -250,7 +265,9 @@
250265
"1966560555": "Ubuntu 14 x86-64 native SDK (patched, v3)",
251266
"309054781": "Ubuntu 16 x86-64 -> Ubuntu 16 aarch64 cross SDK",
252267
"5298918458": "bin-gdb-reloc-ya-linux-aarch64-62901b3b39a8b08c2d39a3bf08a1fc3a6d76eb78",
268+
"5720688825": "bin-gdb-reloc-ya-linux-aarch64-62901b3b39a8b08c2d39a3bf08a1fc3a6d76eb78",
253269
"5298901591": "bin-gdb-reloc-ya-linux-x86_64-62901b3b39a8b08c2d39a3bf08a1fc3a6d76eb78",
270+
"5720181629": "bin-gdb-reloc-ya-linux-x86_64-62901b3b39a8b08c2d39a3bf08a1fc3a6d76eb78",
254271
"5709310220": "bin-gdb-reloc-ya-linux-x86_64-70970b31ef83c56b51291cd8fe4f24449b582b59",
255272
"5709435327": "bin-gdb-reloc-ya-linux-x86_64-70970b31ef83c56b51291cd8fe4f24449b582b59",
256273
"360916612": "binutils 2.26 for linux_ubuntu_10.04_lucid",
@@ -301,6 +318,7 @@
301318
"5675381622": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
302319
"5683487438": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
303320
"5707396874": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
321+
"5720350134": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
304322
"5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
305323
"5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
306324
"5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
@@ -320,6 +338,8 @@
320338
"5683523790": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
321339
"5707396152": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
322340
"5707407435": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
341+
"5720351188": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
342+
"5720356918": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
323343
"4307890075": "flake8_linter for linux",
324344
"5517245192": "flake8_linter for linux",
325345
"4307901240": "flake8_linter for linux-aarch64",

‎build/platform/test_tool/host.ya.make.inc

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
2-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5707394532)
3-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5707406472)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5720349017)
3+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5720356281)
44
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
5-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5707393572)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5707406025)
5+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5720348354)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5720355987)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5707396874)
9-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5707407435)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5720350134)
9+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5720356918)
1010
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
11-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5707391802)
12-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5707405475)
11+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5720347692)
12+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5720355628)
1313
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
14-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5707395940)
15-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5707406839)
14+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5720349493)
15+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5720356619)
1616

1717
ENDIF()

‎build/platform/test_tool/host_os.ya.make.inc

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
2-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5707395021)
3-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5707395021)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5720350265)
3+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5720350265)
44
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
5-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5707394418)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5707394418)
5+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5720349877)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5720349877)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5707396152)
9-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5707396152)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5720351188)
9+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5720351188)
1010
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
11-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5707393967)
12-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5707393967)
11+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5720349514)
12+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5720349514)
1313
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
14-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5707395714)
15-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5707395714)
14+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:5720350722)
15+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL3_HOST sbr:5720350722)
1616

1717
ENDIF()

‎build/plugins/lib/test_const/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@
200200
JSTYLE_RUNNER_LIB = 'JSTYLE_LIB_RESOURCE_GLOBAL'
201201
NODEJS_RESOURCE = 'NODEJS_RESOURCE_GLOBAL'
202202
NYC_RESOURCE = 'NYC_RESOURCE_GLOBAL'
203+
RUFF_RESOURCE = 'RUFF_RESOURCE_GLOBAL'
203204
TEST_TOOL3_HOST = 'TEST_TOOL3_HOST_RESOURCE_GLOBAL'
204205
TEST_TOOL3_HOST_LOCAL = 'TEST_TOOL3_HOST_LOCAL'
205206
TEST_TOOL_HOST = 'TEST_TOOL_HOST_RESOURCE_GLOBAL'

‎build/plugins/pybuild.py

+23-2
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@ def get_resolved_files():
145145
resolved_files.append(resolved)
146146
return resolved_files
147147

148+
upath = unit.path()[3:]
149+
148150
no_lint_value = get_no_lint_value(unit)
149151
if no_lint_value == "none":
150152
no_lint_allowed_paths = (
@@ -161,8 +163,6 @@ def get_resolved_files():
161163
"yt/python/", # YT-20053
162164
)
163165

164-
upath = unit.path()[3:]
165-
166166
if not upath.startswith(no_lint_allowed_paths):
167167
ymake.report_configure_error("NO_LINT() is allowed only in " + ", ".join(no_lint_allowed_paths))
168168

@@ -193,6 +193,27 @@ def get_resolved_files():
193193
params += ["EXTRA_PARAMS"] + extra_params
194194
unit.on_add_linter_check(params)
195195

196+
# ruff related stuff
197+
if unit.get('STYLE_RUFF_VALUE') == 'yes':
198+
if no_lint_value in ("none", "none_internal"):
199+
ymake.report_configure_error(
200+
'NO_LINT() and STYLE_RUFF() can\'t be enabled both at the same time',
201+
)
202+
# temporary allow using ruff for taxi only
203+
ruff_allowed_paths = ("taxi/",)
204+
if not upath.startswith(ruff_allowed_paths):
205+
ymake.report_configure_error("STYLE_RUFF() is allowed only in " + ", ".join(ruff_allowed_paths))
206+
207+
resolved_files = get_resolved_files()
208+
if resolved_files:
209+
resource = "build/external_resources/ruff"
210+
params = ["ruff", "tools/ruff_linter/bin/ruff_linter"]
211+
params += ["FILES"] + resolved_files
212+
params += ["GLOBAL_RESOURCES", resource]
213+
ruff_cfg = unit.get('STYLE_RUFF_PYPROJECT_VALUE') or 'build/config/tests/ruff/ruff.toml'
214+
params += ['CONFIGS', ruff_cfg]
215+
unit.on_add_linter_check(params)
216+
196217
if files and unit.get('STYLE_PYTHON_VALUE') == 'yes' and is_py3(unit):
197218
resolved_files = get_resolved_files()
198219
if resolved_files:

0 commit comments

Comments
 (0)