Merge branch 'rightlib' into merge-libs-250521-1607

9 files changed, 62 insertions, 50 deletions

diff --git a/build/conf/python.conf b/build/conf/python.conf
index cde9afe49f5..0da55239701 100644
--- a/build/conf/python.conf
+++ b/build/conf/python.conf
@@ -10,7 +10,6 @@ contrib/tools/cython/Cython/Utility/arrayarray.h \
 contrib/tools/cython/Cython/Utility/AsyncGen.c \
 contrib/tools/cython/Cython/Utility/Buffer.c \
 contrib/tools/cython/Cython/Utility/Builtins.c \
-contrib/tools/cython/Cython/Utility/Capsule.c \
 contrib/tools/cython/Cython/Utility/CConvert.pyx \
 contrib/tools/cython/Cython/Utility/CMath.c \
 contrib/tools/cython/Cython/Utility/CommonStructures.c \
@@ -21,6 +20,7 @@ contrib/tools/cython/Cython/Utility/CpdefEnums.pyx \
 contrib/tools/cython/Cython/Utility/CppConvert.pyx \
 contrib/tools/cython/Cython/Utility/CppSupport.cpp \
 contrib/tools/cython/Cython/Utility/CythonFunction.c \
+contrib/tools/cython/Cython/Utility/Dataclasses.c \
 contrib/tools/cython/Cython/Utility/Embed.c \
 contrib/tools/cython/Cython/Utility/Exceptions.c \
 contrib/tools/cython/Cython/Utility/ExtensionTypes.c \
@@ -29,6 +29,7 @@ contrib/tools/cython/Cython/Utility/ImportExport.c \
 contrib/tools/cython/Cython/Utility/MemoryView.pyx \
 contrib/tools/cython/Cython/Utility/MemoryView_C.c \
 contrib/tools/cython/Cython/Utility/ModuleSetupCode.c \
+contrib/tools/cython/Cython/Utility/NumpyImportArray.c \
 contrib/tools/cython/Cython/Utility/ObjectHandling.c \
 contrib/tools/cython/Cython/Utility/Optimize.c \
 contrib/tools/cython/Cython/Utility/Overflow.c \
@@ -38,7 +39,7 @@ contrib/tools/cython/Cython/Utility/StringTools.c \
 contrib/tools/cython/Cython/Utility/TestCythonScope.pyx \
 contrib/tools/cython/Cython/Utility/TestCyUtilityLoader.pyx \
 contrib/tools/cython/Cython/Utility/TestUtilityLoader.c \
-contrib/tools/cython/Cython/Utility/TypeConversion.c
+contrib/tools/cython/Cython/Utility/UFuncs_C.c
 
 macro _UNWRAP_TEXT_INPUTS(Files...) {
     .CMD=${hide;context=TEXT;input=TEXT:Files}
@@ -73,7 +74,8 @@ CYTHON_PREDEFINED_INDUCED=\
     contrib/libs/python/Include/Python.h
 
 # tag:cython-specific
-CYTHON_OPTIONS=
+# TODO(akhropov): Update code with proper exception declarations
+CYTHON_OPTIONS= -X legacy_implicit_noexcept=True
 when ($OS_LINUX) {
     CYTHON_OPTIONS += -E UNAME_SYSNAME=Linux
 }
diff --git a/build/external_resources/ymake/public.resources.json b/build/external_resources/ymake/public.resources.json
index edaf00d3105..5a77bbc24d9 100644
--- a/build/external_resources/ymake/public.resources.json
+++ b/build/external_resources/ymake/public.resources.json
@@ -1,19 +1,19 @@
 {
     "by_platform": {
         "darwin": {
-            "uri": "sbr:8680458709"
+            "uri": "sbr:8736412769"
         },
         "darwin-arm64": {
-            "uri": "sbr:8680458278"
+            "uri": "sbr:8736411948"
         },
         "linux": {
-            "uri": "sbr:8680459548"
+            "uri": "sbr:8736414621"
         },
         "linux-aarch64": {
-            "uri": "sbr:8680457575"
+            "uri": "sbr:8736411209"
         },
         "win32": {
-            "uri": "sbr:8680458980"
+            "uri": "sbr:8736413688"
         }
     }
 }
diff --git a/build/external_resources/ymake/resources.json b/build/external_resources/ymake/resources.json
index be434013198..50467843c36 100644
--- a/build/external_resources/ymake/resources.json
+++ b/build/external_resources/ymake/resources.json
@@ -1,19 +1,19 @@
 {
     "by_platform": {
         "darwin": {
-            "uri": "sbr:8680460659"
+            "uri": "sbr:8736398606"
         },
         "darwin-arm64": {
-            "uri": "sbr:8680460293"
+            "uri": "sbr:8736397686"
         },
         "linux": {
-            "uri": "sbr:8680461449"
+            "uri": "sbr:8736400297"
         },
         "linux-aarch64": {
-            "uri": "sbr:8680459807"
+            "uri": "sbr:8736396712"
         },
         "win32": {
-            "uri": "sbr:8680461018"
+            "uri": "sbr:8736399378"
         }
     }
 }
diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index 13e6c5caccd..be35db7cc6e 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -767,6 +767,7 @@
         "8542905826": "{registry_endpoint}/8542905826",
         "8601993004": "{registry_endpoint}/8601993004",
         "8680458709": "{registry_endpoint}/8680458709",
+        "8736412769": "{registry_endpoint}/8736412769",
         "5766171800": "{registry_endpoint}/5766171800",
         "5805430761": "{registry_endpoint}/5805430761",
         "5829025456": "{registry_endpoint}/5829025456",
@@ -848,6 +849,7 @@
         "8542904543": "{registry_endpoint}/8542904543",
         "8601992132": "{registry_endpoint}/8601992132",
         "8680458278": "{registry_endpoint}/8680458278",
+        "8736411948": "{registry_endpoint}/8736411948",
         "5766173070": "{registry_endpoint}/5766173070",
         "5805432830": "{registry_endpoint}/5805432830",
         "5829031598": "{registry_endpoint}/5829031598",
@@ -929,6 +931,7 @@
         "8542907827": "{registry_endpoint}/8542907827",
         "8601994579": "{registry_endpoint}/8601994579",
         "8680459548": "{registry_endpoint}/8680459548",
+        "8736414621": "{registry_endpoint}/8736414621",
         "5766171341": "{registry_endpoint}/5766171341",
         "5805430188": "{registry_endpoint}/5805430188",
         "5829023352": "{registry_endpoint}/5829023352",
@@ -1010,6 +1013,7 @@
         "8542903617": "{registry_endpoint}/8542903617",
         "8601991137": "{registry_endpoint}/8601991137",
         "8680457575": "{registry_endpoint}/8680457575",
+        "8736411209": "{registry_endpoint}/8736411209",
         "8270821739": "{registry_endpoint}/8270821739",
         "8295446553": "{registry_endpoint}/8295446553",
         "8326170338": "{registry_endpoint}/8326170338",
@@ -1021,6 +1025,7 @@
         "8542906865": "{registry_endpoint}/8542906865",
         "8601993868": "{registry_endpoint}/8601993868",
         "8680458980": "{registry_endpoint}/8680458980",
+        "8736413688": "{registry_endpoint}/8736413688",
         "5766172695": "{registry_endpoint}/5766172695",
         "5805432230": "{registry_endpoint}/5805432230",
         "5829029743": "{registry_endpoint}/5829029743",
@@ -2182,6 +2187,7 @@
         "8542905826": "devtools/ymake/bin/ymake for darwin",
         "8601993004": "devtools/ymake/bin/ymake for darwin",
         "8680458709": "devtools/ymake/bin/ymake for darwin",
+        "8736412769": "devtools/ymake/bin/ymake for darwin",
         "5766171800": "devtools/ymake/bin/ymake for darwin-arm64",
         "5805430761": "devtools/ymake/bin/ymake for darwin-arm64",
         "5829025456": "devtools/ymake/bin/ymake for darwin-arm64",
@@ -2263,6 +2269,7 @@
         "8542904543": "devtools/ymake/bin/ymake for darwin-arm64",
         "8601992132": "devtools/ymake/bin/ymake for darwin-arm64",
         "8680458278": "devtools/ymake/bin/ymake for darwin-arm64",
+        "8736411948": "devtools/ymake/bin/ymake for darwin-arm64",
         "5766173070": "devtools/ymake/bin/ymake for linux",
         "5805432830": "devtools/ymake/bin/ymake for linux",
         "5829031598": "devtools/ymake/bin/ymake for linux",
@@ -2344,6 +2351,7 @@
         "8542907827": "devtools/ymake/bin/ymake for linux",
         "8601994579": "devtools/ymake/bin/ymake for linux",
         "8680459548": "devtools/ymake/bin/ymake for linux",
+        "8736414621": "devtools/ymake/bin/ymake for linux",
         "5766171341": "devtools/ymake/bin/ymake for linux-aarch64",
         "5805430188": "devtools/ymake/bin/ymake for linux-aarch64",
         "5829023352": "devtools/ymake/bin/ymake for linux-aarch64",
@@ -2425,6 +2433,7 @@
         "8542903617": "devtools/ymake/bin/ymake for linux-aarch64",
         "8601991137": "devtools/ymake/bin/ymake for linux-aarch64",
         "8680457575": "devtools/ymake/bin/ymake for linux-aarch64",
+        "8736411209": "devtools/ymake/bin/ymake for linux-aarch64",
         "8270821739": "devtools/ymake/bin/ymake for win32",
         "8295446553": "devtools/ymake/bin/ymake for win32",
         "8326170338": "devtools/ymake/bin/ymake for win32",
@@ -2436,6 +2445,7 @@
         "8542906865": "devtools/ymake/bin/ymake for win32",
         "8601993868": "devtools/ymake/bin/ymake for win32",
         "8680458980": "devtools/ymake/bin/ymake for win32",
+        "8736413688": "devtools/ymake/bin/ymake for win32",
         "5766172695": "devtools/ymake/bin/ymake for win32-clang-cl",
         "5805432230": "devtools/ymake/bin/ymake for win32-clang-cl",
         "5829029743": "devtools/ymake/bin/ymake for win32-clang-cl",
diff --git a/build/plugins/lib/nots/package_manager/base/ya.make b/build/plugins/lib/nots/package_manager/base/ya.make
index f35706c5994..a4badf21a4f 100644
--- a/build/plugins/lib/nots/package_manager/base/ya.make
+++ b/build/plugins/lib/nots/package_manager/base/ya.make
@@ -16,7 +16,6 @@ PY_SRCS(
 )
 
 PEERDIR(
-    contrib/python/six
     library/python/archive
     devtools/frontend_build_platform/libraries/logging
 )
diff --git a/build/plugins/lib/nots/package_manager/npm/npm_lockfile.py b/build/plugins/lib/nots/package_manager/npm/npm_lockfile.py
index 74bedda88a4..ba11e77103a 100644
--- a/build/plugins/lib/nots/package_manager/npm/npm_lockfile.py
+++ b/build/plugins/lib/nots/package_manager/npm/npm_lockfile.py
@@ -3,7 +3,7 @@ import json
 import os
 import io
 
-from six.moves.urllib import parse as urlparse
+import urllib.parse as urlparse
 
 from ..base import BaseLockfile, LockfilePackageMeta, LockfilePackageMetaInvalidError
 
diff --git a/build/plugins/lib/nots/package_manager/pnpm/lockfile.py b/build/plugins/lib/nots/package_manager/pnpm/lockfile.py
index b1e8fc07069..d092152840a 100644
--- a/build/plugins/lib/nots/package_manager/pnpm/lockfile.py
+++ b/build/plugins/lib/nots/package_manager/pnpm/lockfile.py
@@ -269,12 +269,15 @@ class PnpmLockfile(BaseLockfile):
         return {".": importer} if importer else {}
 
     def validate_importers(self):
+        validate_keys = ("dependencies", "devDependencies", "peerDependencies", "optionalDependencies")
         importers = self.get_importers()
         pkg = importers.get(".")
         peers = set(["."])
         problem_importers = []
 
-        for _, deps in pkg.items():
+        for deps_key, deps in pkg.items():
+            if deps_key not in validate_keys:
+                continue
             for _, dep in deps.items():
                 specifier = dep.get("specifier")
                 if specifier and specifier.startswith(WS_PREFIX):
diff --git a/build/plugins/pybuild.py b/build/plugins/pybuild.py
index 964beebb196..5d5f768ced6 100644
--- a/build/plugins/pybuild.py
+++ b/build/plugins/pybuild.py
@@ -144,15 +144,6 @@ def get_srcdir(path, unit):
     return rootrel_arc_src(path, unit)[: -len(path)].rstrip('/')
 
 
-@lazy
-def get_ruff_configs(unit):
-    rel_config_path = rootrel_arc_src(unit.get('RUFF_CONFIG_PATHS_FILE'), unit)
-    arc_config_path = unit.resolve_arc_path(rel_config_path)
-    abs_config_path = unit.resolve(arc_config_path)
-    with open(abs_config_path, 'r') as fd:
-        return list(json.load(fd).values())
-
-
 def add_python_lint_checks(unit, py_ver, files):
     @lazy
     def get_resolved_files():
@@ -223,7 +214,7 @@ def py_program(unit, py3):
     unit.onpeerdir(peers)
 
     # DEVTOOLSSUPPORT-53161
-    if os.name == 'nt':
+    if unit.get('OS_WINDOWS') == 'yes':
         unit.onwindows_long_path_manifest()
 
     if unit.get('MODULE_TYPE') == 'PROGRAM':  # can not check DLL
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 5cdcf1e8e72..9e94e66b827 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -13,7 +13,7 @@ CPP_FAKEID=2024-01-23
 GO_FAKEID=11100371
 ANDROID_FAKEID=2023-05-17
 CLANG_TIDY_FAKEID=2023-06-06
-CYTHON_FAKEID=10784829
+CYTHON_FAKEID=16584065
 JAVA_FAKEID=14386852
 PROTO_FAKEID=0
 FBS_FAKEID=2024-03-13
@@ -2315,6 +2315,27 @@ macro PACK(Ext) {
     SET(PACKED_PACKAGE_EXT $Ext)
 }
 
+module _PACKAGE_FINAL: _BASE_UNIT {
+    .CMD=TOUCH_PACKAGE_MF
+    .ALIASES=SRCS=FILES
+    .ALLOWED=PACK
+    .USE_PEERS_LATE_OUTS=yes
+    .PEERDIR_POLICY=as_build_from
+    .FINAL_TARGET=yes
+
+    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)
+
+    SET(MODULE_SUFFIX .final.pkg.fake)
+    SET(DONT_RESOLVE_INCLUDES yes)
+    NO_PLATFORM()
+    when ($PACKED_PACKAGE_EXT) {
+        PACKED_PACKAGE_ARGS+=--dest-arch ${output;pre=$MODULE_PREFIX;suf=.$PACKED_PACKAGE_EXT:REALPRJNAME}
+    }
+    SET(NEED_PLATFORM_PEERDIRS no)
+    SET(_COPY_FILE_CONTEXT TEXT)
+    DISABLE(_NEED_SBOM_INFO)
+}
+
 ### @usage: PACKAGE(name)
 ###
 ### Module collects what is described directly inside it, builds and collects all its transitively available PEERDIRs.
@@ -2327,27 +2348,10 @@ macro PACK(Ext) {
 ###
 ### @see: [PACK()](#macro_PACK)
 multimodule PACKAGE {
-    module PACKAGE_FINAL: _BASE_UNIT {
-        .CMD=TOUCH_PACKAGE_MF
-        .ALIASES=SRCS=FILES
-        .ALLOWED=PACK
+    module PACKAGE_FINAL: _PACKAGE_FINAL {
         .PEERDIRSELF=PACKAGE_UNION
-        .USE_PEERS_LATE_OUTS=yes
-        .PEERDIR_POLICY=as_build_from
-        .FINAL_TARGET=yes
-
-        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)
-
-        SET(MODULE_SUFFIX .final.pkg.fake)
-        SET(DONT_RESOLVE_INCLUDES yes)
-        NO_PLATFORM()
-        when ($PACKED_PACKAGE_EXT) {
-            PACKED_PACKAGE_ARGS+=--dest-arch ${output;pre=$MODULE_PREFIX;suf=.$PACKED_PACKAGE_EXT:REALPRJNAME}
-        }
-        SET(NEED_PLATFORM_PEERDIRS no)
-        SET(_COPY_FILE_CONTEXT TEXT)
-        DISABLE(_NEED_SBOM_INFO)
     }
+
     module PACKAGE_UNION: UNION {
         .CMD=UNION_CMD
         .FINAL_TARGET=no
@@ -3112,9 +3116,12 @@ otherwise {
     # but Numpy's variant should be preferred
     # https://github.com/cython/cython/issues/6249#issuecomment-2176633822
     _CYTHON_SYS_INCLUDES=\
-        FOR cython contrib/python/numpy/include/numpy/core/include \
-        FOR cython contrib/python/numpy/include/numpy/core/include/numpy \
-        FOR cython contrib/tools/cython/Cython/Includes
+        FOR cython contrib/tools/cython/Cython/Includes \
+        contrib/python/numpy/include/numpy/core/include \
+        contrib/python/numpy/include/numpy/core/include/numpy \
+        contrib/python/numpy/include/numpy/core/src/common \
+        contrib/python/numpy/include/numpy/core/src/npymath \
+        contrib/python/numpy/include/numpy/distutils/include
 }
 
 
@@ -5677,7 +5684,7 @@ when ($CUDA11) {
 
 when ($CUDA12) {
     CUDA_VERSION=12.6
-    CUDNN_VERSION=8.6.0
+    CUDNN_VERSION=9.0.0
     TENSORRT_VERSION=10
     CUDA_ARCHITECTURES=
     NVCC_STD_VER=20