Skip to content

Commit 2747776

Browse files
alexv-smirnovalexv-smirnov
committed
Merge pull request #18635 from ydb-platform/merge-libs-250521-1607
2 parents c633020 + f111cf8 commit 2747776

File tree

483 files changed

+38106
-11488
lines changed

Some content is hidden

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

483 files changed

+38106
-11488
lines changed

‎build/conf/python.conf

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ contrib/tools/cython/Cython/Utility/arrayarray.h \
1010
contrib/tools/cython/Cython/Utility/AsyncGen.c \
1111
contrib/tools/cython/Cython/Utility/Buffer.c \
1212
contrib/tools/cython/Cython/Utility/Builtins.c \
13-
contrib/tools/cython/Cython/Utility/Capsule.c \
1413
contrib/tools/cython/Cython/Utility/CConvert.pyx \
1514
contrib/tools/cython/Cython/Utility/CMath.c \
1615
contrib/tools/cython/Cython/Utility/CommonStructures.c \
@@ -21,6 +20,7 @@ contrib/tools/cython/Cython/Utility/CpdefEnums.pyx \
2120
contrib/tools/cython/Cython/Utility/CppConvert.pyx \
2221
contrib/tools/cython/Cython/Utility/CppSupport.cpp \
2322
contrib/tools/cython/Cython/Utility/CythonFunction.c \
23+
contrib/tools/cython/Cython/Utility/Dataclasses.c \
2424
contrib/tools/cython/Cython/Utility/Embed.c \
2525
contrib/tools/cython/Cython/Utility/Exceptions.c \
2626
contrib/tools/cython/Cython/Utility/ExtensionTypes.c \
@@ -29,6 +29,7 @@ contrib/tools/cython/Cython/Utility/ImportExport.c \
2929
contrib/tools/cython/Cython/Utility/MemoryView.pyx \
3030
contrib/tools/cython/Cython/Utility/MemoryView_C.c \
3131
contrib/tools/cython/Cython/Utility/ModuleSetupCode.c \
32+
contrib/tools/cython/Cython/Utility/NumpyImportArray.c \
3233
contrib/tools/cython/Cython/Utility/ObjectHandling.c \
3334
contrib/tools/cython/Cython/Utility/Optimize.c \
3435
contrib/tools/cython/Cython/Utility/Overflow.c \
@@ -38,7 +39,7 @@ contrib/tools/cython/Cython/Utility/StringTools.c \
3839
contrib/tools/cython/Cython/Utility/TestCythonScope.pyx \
3940
contrib/tools/cython/Cython/Utility/TestCyUtilityLoader.pyx \
4041
contrib/tools/cython/Cython/Utility/TestUtilityLoader.c \
41-
contrib/tools/cython/Cython/Utility/TypeConversion.c
42+
contrib/tools/cython/Cython/Utility/UFuncs_C.c
4243

4344
macro _UNWRAP_TEXT_INPUTS(Files...) {
4445
.CMD=${hide;context=TEXT;input=TEXT:Files}
@@ -73,7 +74,8 @@ CYTHON_PREDEFINED_INDUCED=\
7374
contrib/libs/python/Include/Python.h
7475

7576
# tag:cython-specific
76-
CYTHON_OPTIONS=
77+
# TODO(akhropov): Update code with proper exception declarations
78+
CYTHON_OPTIONS= -X legacy_implicit_noexcept=True
7779
when ($OS_LINUX) {
7880
CYTHON_OPTIONS += -E UNAME_SYSNAME=Linux
7981
}

‎build/external_resources/ymake/public.resources.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:8680458709"
4+
"uri": "sbr:8736412769"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:8680458278"
7+
"uri": "sbr:8736411948"
88
},
99
"linux": {
10-
"uri": "sbr:8680459548"
10+
"uri": "sbr:8736414621"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:8680457575"
13+
"uri": "sbr:8736411209"
1414
},
1515
"win32": {
16-
"uri": "sbr:8680458980"
16+
"uri": "sbr:8736413688"
1717
}
1818
}
1919
}

‎build/external_resources/ymake/resources.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:8680460659"
4+
"uri": "sbr:8736398606"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:8680460293"
7+
"uri": "sbr:8736397686"
88
},
99
"linux": {
10-
"uri": "sbr:8680461449"
10+
"uri": "sbr:8736400297"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:8680459807"
13+
"uri": "sbr:8736396712"
1414
},
1515
"win32": {
16-
"uri": "sbr:8680461018"
16+
"uri": "sbr:8736399378"
1717
}
1818
}
1919
}

‎build/mapping.conf.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,7 @@
767767
"8542905826": "{registry_endpoint}/8542905826",
768768
"8601993004": "{registry_endpoint}/8601993004",
769769
"8680458709": "{registry_endpoint}/8680458709",
770+
"8736412769": "{registry_endpoint}/8736412769",
770771
"5766171800": "{registry_endpoint}/5766171800",
771772
"5805430761": "{registry_endpoint}/5805430761",
772773
"5829025456": "{registry_endpoint}/5829025456",
@@ -848,6 +849,7 @@
848849
"8542904543": "{registry_endpoint}/8542904543",
849850
"8601992132": "{registry_endpoint}/8601992132",
850851
"8680458278": "{registry_endpoint}/8680458278",
852+
"8736411948": "{registry_endpoint}/8736411948",
851853
"5766173070": "{registry_endpoint}/5766173070",
852854
"5805432830": "{registry_endpoint}/5805432830",
853855
"5829031598": "{registry_endpoint}/5829031598",
@@ -929,6 +931,7 @@
929931
"8542907827": "{registry_endpoint}/8542907827",
930932
"8601994579": "{registry_endpoint}/8601994579",
931933
"8680459548": "{registry_endpoint}/8680459548",
934+
"8736414621": "{registry_endpoint}/8736414621",
932935
"5766171341": "{registry_endpoint}/5766171341",
933936
"5805430188": "{registry_endpoint}/5805430188",
934937
"5829023352": "{registry_endpoint}/5829023352",
@@ -1010,6 +1013,7 @@
10101013
"8542903617": "{registry_endpoint}/8542903617",
10111014
"8601991137": "{registry_endpoint}/8601991137",
10121015
"8680457575": "{registry_endpoint}/8680457575",
1016+
"8736411209": "{registry_endpoint}/8736411209",
10131017
"8270821739": "{registry_endpoint}/8270821739",
10141018
"8295446553": "{registry_endpoint}/8295446553",
10151019
"8326170338": "{registry_endpoint}/8326170338",
@@ -1021,6 +1025,7 @@
10211025
"8542906865": "{registry_endpoint}/8542906865",
10221026
"8601993868": "{registry_endpoint}/8601993868",
10231027
"8680458980": "{registry_endpoint}/8680458980",
1028+
"8736413688": "{registry_endpoint}/8736413688",
10241029
"5766172695": "{registry_endpoint}/5766172695",
10251030
"5805432230": "{registry_endpoint}/5805432230",
10261031
"5829029743": "{registry_endpoint}/5829029743",
@@ -2182,6 +2187,7 @@
21822187
"8542905826": "devtools/ymake/bin/ymake for darwin",
21832188
"8601993004": "devtools/ymake/bin/ymake for darwin",
21842189
"8680458709": "devtools/ymake/bin/ymake for darwin",
2190+
"8736412769": "devtools/ymake/bin/ymake for darwin",
21852191
"5766171800": "devtools/ymake/bin/ymake for darwin-arm64",
21862192
"5805430761": "devtools/ymake/bin/ymake for darwin-arm64",
21872193
"5829025456": "devtools/ymake/bin/ymake for darwin-arm64",
@@ -2263,6 +2269,7 @@
22632269
"8542904543": "devtools/ymake/bin/ymake for darwin-arm64",
22642270
"8601992132": "devtools/ymake/bin/ymake for darwin-arm64",
22652271
"8680458278": "devtools/ymake/bin/ymake for darwin-arm64",
2272+
"8736411948": "devtools/ymake/bin/ymake for darwin-arm64",
22662273
"5766173070": "devtools/ymake/bin/ymake for linux",
22672274
"5805432830": "devtools/ymake/bin/ymake for linux",
22682275
"5829031598": "devtools/ymake/bin/ymake for linux",
@@ -2344,6 +2351,7 @@
23442351
"8542907827": "devtools/ymake/bin/ymake for linux",
23452352
"8601994579": "devtools/ymake/bin/ymake for linux",
23462353
"8680459548": "devtools/ymake/bin/ymake for linux",
2354+
"8736414621": "devtools/ymake/bin/ymake for linux",
23472355
"5766171341": "devtools/ymake/bin/ymake for linux-aarch64",
23482356
"5805430188": "devtools/ymake/bin/ymake for linux-aarch64",
23492357
"5829023352": "devtools/ymake/bin/ymake for linux-aarch64",
@@ -2425,6 +2433,7 @@
24252433
"8542903617": "devtools/ymake/bin/ymake for linux-aarch64",
24262434
"8601991137": "devtools/ymake/bin/ymake for linux-aarch64",
24272435
"8680457575": "devtools/ymake/bin/ymake for linux-aarch64",
2436+
"8736411209": "devtools/ymake/bin/ymake for linux-aarch64",
24282437
"8270821739": "devtools/ymake/bin/ymake for win32",
24292438
"8295446553": "devtools/ymake/bin/ymake for win32",
24302439
"8326170338": "devtools/ymake/bin/ymake for win32",
@@ -2436,6 +2445,7 @@
24362445
"8542906865": "devtools/ymake/bin/ymake for win32",
24372446
"8601993868": "devtools/ymake/bin/ymake for win32",
24382447
"8680458980": "devtools/ymake/bin/ymake for win32",
2448+
"8736413688": "devtools/ymake/bin/ymake for win32",
24392449
"5766172695": "devtools/ymake/bin/ymake for win32-clang-cl",
24402450
"5805432230": "devtools/ymake/bin/ymake for win32-clang-cl",
24412451
"5829029743": "devtools/ymake/bin/ymake for win32-clang-cl",

‎build/plugins/lib/nots/package_manager/base/ya.make

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ PY_SRCS(
1616
)
1717

1818
PEERDIR(
19-
contrib/python/six
2019
library/python/archive
2120
devtools/frontend_build_platform/libraries/logging
2221
)

‎build/plugins/lib/nots/package_manager/npm/npm_lockfile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import os
44
import io
55

6-
from six.moves.urllib import parse as urlparse
6+
import urllib.parse as urlparse
77

88
from ..base import BaseLockfile, LockfilePackageMeta, LockfilePackageMetaInvalidError
99

‎build/plugins/lib/nots/package_manager/pnpm/lockfile.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,12 +269,15 @@ def get_importers(self):
269269
return {".": importer} if importer else {}
270270

271271
def validate_importers(self):
272+
validate_keys = ("dependencies", "devDependencies", "peerDependencies", "optionalDependencies")
272273
importers = self.get_importers()
273274
pkg = importers.get(".")
274275
peers = set(["."])
275276
problem_importers = []
276277

277-
for _, deps in pkg.items():
278+
for deps_key, deps in pkg.items():
279+
if deps_key not in validate_keys:
280+
continue
278281
for _, dep in deps.items():
279282
specifier = dep.get("specifier")
280283
if specifier and specifier.startswith(WS_PREFIX):

‎build/plugins/pybuild.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,6 @@ def get_srcdir(path, unit):
144144
return rootrel_arc_src(path, unit)[: -len(path)].rstrip('/')
145145

146146

147-
@lazy
148-
def get_ruff_configs(unit):
149-
rel_config_path = rootrel_arc_src(unit.get('RUFF_CONFIG_PATHS_FILE'), unit)
150-
arc_config_path = unit.resolve_arc_path(rel_config_path)
151-
abs_config_path = unit.resolve(arc_config_path)
152-
with open(abs_config_path, 'r') as fd:
153-
return list(json.load(fd).values())
154-
155-
156147
def add_python_lint_checks(unit, py_ver, files):
157148
@lazy
158149
def get_resolved_files():
@@ -223,7 +214,7 @@ def py_program(unit, py3):
223214
unit.onpeerdir(peers)
224215

225216
# DEVTOOLSSUPPORT-53161
226-
if os.name == 'nt':
217+
if unit.get('OS_WINDOWS') == 'yes':
227218
unit.onwindows_long_path_manifest()
228219

229220
if unit.get('MODULE_TYPE') == 'PROGRAM': # can not check DLL

‎build/ymake.core.conf

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ CPP_FAKEID=2024-01-23
1313
GO_FAKEID=11100371
1414
ANDROID_FAKEID=2023-05-17
1515
CLANG_TIDY_FAKEID=2023-06-06
16-
CYTHON_FAKEID=10784829
16+
CYTHON_FAKEID=16584065
1717
JAVA_FAKEID=14386852
1818
PROTO_FAKEID=0
1919
FBS_FAKEID=2024-03-13
@@ -2315,6 +2315,27 @@ macro PACK(Ext) {
23152315
SET(PACKED_PACKAGE_EXT $Ext)
23162316
}
23172317

2318+
module _PACKAGE_FINAL: _BASE_UNIT {
2319+
.CMD=TOUCH_PACKAGE_MF
2320+
.ALIASES=SRCS=FILES
2321+
.ALLOWED=PACK
2322+
.USE_PEERS_LATE_OUTS=yes
2323+
.PEERDIR_POLICY=as_build_from
2324+
.FINAL_TARGET=yes
2325+
2326+
SET(PEERDIR_TAGS CPP_PROTO CPP_PROTO_FROM_SCHEMA CPP_FBS PY2 PY3 PY2_NATIVE PY3_NATIVE YQL_UDF_SHARED __EMPTY__ RESOURCE_LIB DOCSBOOK JAR_RUNNABLE PY3_BIN PY3TEST_PROGRAM DLL GO_PROGRAM TS PACKAGE_UNION)
2327+
2328+
SET(MODULE_SUFFIX .final.pkg.fake)
2329+
SET(DONT_RESOLVE_INCLUDES yes)
2330+
NO_PLATFORM()
2331+
when ($PACKED_PACKAGE_EXT) {
2332+
PACKED_PACKAGE_ARGS+=--dest-arch ${output;pre=$MODULE_PREFIX;suf=.$PACKED_PACKAGE_EXT:REALPRJNAME}
2333+
}
2334+
SET(NEED_PLATFORM_PEERDIRS no)
2335+
SET(_COPY_FILE_CONTEXT TEXT)
2336+
DISABLE(_NEED_SBOM_INFO)
2337+
}
2338+
23182339
### @usage: PACKAGE(name)
23192340
###
23202341
### Module collects what is described directly inside it, builds and collects all its transitively available PEERDIRs.
@@ -2327,27 +2348,10 @@ macro PACK(Ext) {
23272348
###
23282349
### @see: [PACK()](#macro_PACK)
23292350
multimodule PACKAGE {
2330-
module PACKAGE_FINAL: _BASE_UNIT {
2331-
.CMD=TOUCH_PACKAGE_MF
2332-
.ALIASES=SRCS=FILES
2333-
.ALLOWED=PACK
2351+
module PACKAGE_FINAL: _PACKAGE_FINAL {
23342352
.PEERDIRSELF=PACKAGE_UNION
2335-
.USE_PEERS_LATE_OUTS=yes
2336-
.PEERDIR_POLICY=as_build_from
2337-
.FINAL_TARGET=yes
2338-
2339-
SET(PEERDIR_TAGS CPP_PROTO CPP_PROTO_FROM_SCHEMA CPP_FBS PY2 PY3 PY2_NATIVE PY3_NATIVE YQL_UDF_SHARED __EMPTY__ RESOURCE_LIB DOCSBOOK JAR_RUNNABLE PY3_BIN PY3TEST_PROGRAM DLL GO_PROGRAM TS PACKAGE_UNION)
2340-
2341-
SET(MODULE_SUFFIX .final.pkg.fake)
2342-
SET(DONT_RESOLVE_INCLUDES yes)
2343-
NO_PLATFORM()
2344-
when ($PACKED_PACKAGE_EXT) {
2345-
PACKED_PACKAGE_ARGS+=--dest-arch ${output;pre=$MODULE_PREFIX;suf=.$PACKED_PACKAGE_EXT:REALPRJNAME}
2346-
}
2347-
SET(NEED_PLATFORM_PEERDIRS no)
2348-
SET(_COPY_FILE_CONTEXT TEXT)
2349-
DISABLE(_NEED_SBOM_INFO)
23502353
}
2354+
23512355
module PACKAGE_UNION: UNION {
23522356
.CMD=UNION_CMD
23532357
.FINAL_TARGET=no
@@ -3112,9 +3116,12 @@ otherwise {
31123116
# but Numpy's variant should be preferred
31133117
# https://github.com/cython/cython/issues/6249#issuecomment-2176633822
31143118
_CYTHON_SYS_INCLUDES=\
3115-
FOR cython contrib/python/numpy/include/numpy/core/include \
3116-
FOR cython contrib/python/numpy/include/numpy/core/include/numpy \
3117-
FOR cython contrib/tools/cython/Cython/Includes
3119+
FOR cython contrib/tools/cython/Cython/Includes \
3120+
contrib/python/numpy/include/numpy/core/include \
3121+
contrib/python/numpy/include/numpy/core/include/numpy \
3122+
contrib/python/numpy/include/numpy/core/src/common \
3123+
contrib/python/numpy/include/numpy/core/src/npymath \
3124+
contrib/python/numpy/include/numpy/distutils/include
31183125
}
31193126

31203127

@@ -5677,7 +5684,7 @@ when ($CUDA11) {
56775684

56785685
when ($CUDA12) {
56795686
CUDA_VERSION=12.6
5680-
CUDNN_VERSION=8.6.0
5687+
CUDNN_VERSION=9.0.0
56815688
TENSORRT_VERSION=10
56825689
CUDA_ARCHITECTURES=
56835690
NVCC_STD_VER=20

‎contrib/libs/grpc/patches/09-use-native-dns-resolver.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)