Merge pull request #18043 from ydb-platform/merge-libs-250506-0050

Author: alexv-smirnov

build/conf/java.conf

@@ -1034,6 +1034,7 @@ _BUILD_PROTO_JAR_SEM= \
     && consumer-classpath $EXPORT_GRADLE_CLASSPATH \
     && consumer-jar ${MODDIR}/${REALPRJNAME}.jar \
     && consumer-type library \
+    ${pre=&& consumer-proto_namespace :PROTO_NAMESPACE} \
     $_JAVAC_SEM \
     $_KOTLINC_SEM \
     $_ANN_PROCESSORS_SEM \

build/conf/ts/ts.conf

@@ -1,5 +1,6 @@
 NODEJS_ROOT=
 NODEJS_BIN=$NODEJS_ROOT/node
+NODEJS_COPY_CMD=$COPY_CMD $NODEJS_BIN ${output:"node"}
 
 _TS_REQUIRED_MISSING=~~required~~
 TS_TRACE=no

build/conf/ts/ts_test.conf

@@ -6,10 +6,13 @@ TS_TEST_NM=
 
 _TS_TEST_DEPENDS_ON_BUILD=
 
+_TS_TEST_COPY_NODEJS_CMD=
+
 # We have to rename node_modules.tar to workspace_node_modules.tar,
 # so TS_TEST_JEST module has it's own unique output.
 # TS_TEST_JEST_FOR module has to output all files required for test run.
 TS_TEST_JEST_CMD=$TOUCH_UNIT \
+    && $_TS_TEST_COPY_NODEJS_CMD \
     && $NOTS_TOOL $NOTS_TOOL_BASE_ARGS --nm-bundle yes create-node-modules \
     --moddir $TS_TEST_FOR_PATH \
     $_NODE_MODULES_INOUTS ${hide:PEERS} \
@@ -253,6 +256,13 @@ macro TS_TEST_DEPENDS_ON_BUILD() {
     ENABLE(_TS_TEST_DEPENDS_ON_BUILD)
 }
 
+### @usage: TS_TEST_INCLUDE_NODEJS()
+###
+### Macro adds NodeJS binary to the test module build output.
+macro TS_TEST_INCLUDE_NODEJS() {
+    SET(_TS_TEST_COPY_NODEJS_CMD \$NODEJS_COPY_CMD)
+}
+
 # TS_TYPECHECK
 
 _TS_TYPECHECK_VALUE=none

build/export_generators/gradle/generator.toml

@@ -102,4 +102,5 @@ kotlinc-flags="list"
 consumer-classpath="str"
 consumer-jar="str"
 consumer-type="str"
+consumer-proto_namespace="str"
 consumer-prebuilt="flag"

build/export_generators/ide-gradle/generator.toml

@@ -112,4 +112,5 @@ target_commands-flags="list"
 consumer-classpath="str"
 consumer-jar="str"
 consumer-type="str"
+consumer-proto_namespace="str"
 consumer-prebuilt="flag"

build/export_generators/ide-gradle/proto_prepare.jinja

@@ -33,15 +33,26 @@ val prepareMainProtos = tasks.register<Copy>("prepareMainProtos") {
 {%- if extractLibrariesProtosTask %}
 
 val extractMainLibrariesProtos = tasks.register<Copy>("extractMainLibrariesProtos") {
-{%- if libraries|length %}
+{%- set root_libraries = libraries|rejectattr('proto_namespace') -%}
+{%- set ns_libraries = libraries|selectattr('proto_namespace') -%}
+{%- if root_libraries|length %}
     from("$arcadia_root") {
-{#- list of all library directories -#}
-{%-     for library in libraries -%}
+{%-     for library in root_libraries -%}
 {%-         set path_and_jar = rsplit(library.jar, '/', 2) %}
         include("{{ path_and_jar[0] }}/**/*.proto")
 {%-     endfor %}
     }
-{%  endif -%}
+{%- endif -%}
+{%- if ns_libraries|length -%}
+{%-     for library in ns_libraries -%}
+{%-         set path_and_jar = rsplit(library.jar, '/', 2) -%}
+{%-         set path = "#R/" + path_and_jar[0] -%}
+{%-         set path = path|replace("#R/" + library.proto_namespace + "/", "")|replace("#R/", "") %}
+    from("$arcadia_root/{{ library.proto_namespace }}") {
+        include("{{ path }}/**/*.proto")
+    }
+{%-     endfor -%}
+{%- endif %}
     into(mainExtractedIncludeProtosDir)
 }
 {%- endif %}

build/platform/clang/arch.cmake

@@ -4,6 +4,8 @@ IF (ARCH_I386 OR ARCH_I686)
     SET(CLANG_ARCH i386)
 ELSEIF (ARCH_X86_64)
     SET(CLANG_ARCH x86_64)
+ELSEIF (ARCH_ARM6)
+    SET(CLANG_ARCH armv6)
 ELSEIF (ARCH_ARM7 OR ARCH_ARM7_NEON)
     SET(CLANG_ARCH armv7)
 ELSEIF (ARCH_ARM64 OR ARCH_AARCH64)

build/platform/linux_sdk/ya.make

@@ -44,6 +44,12 @@ ELSEIF (ARCH_PPC64LE)
     ELSE()
         MESSAGE(FATAL_ERROR "There is no ${OS_SDK} SDK for PPC64LE")
     ENDIF()
+ELSEIF (ARCH_ARM6)
+    IF (ARM6_FLOAT_ABI == "hard" AND OS_SDK == "ubuntu-16")
+        DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:1323200692)
+    ELSE()
+        MESSAGE(FATAL_ERROR "There is no ${OS_SDK} SDK for ARMv6 32 bit (float ABI: ${ARM6_FLOAT_ABI})")
+    ENDIF()
 ELSEIF (ARCH_ARM7)
     IF (ARM7_FLOAT_ABI == "hard" AND OS_SDK == "ubuntu-16")
         DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:1323200692)

build/plugins/nots.py

@@ -893,8 +893,13 @@ def on_ts_test_for_configure(
 
     for_mod_path = df.TsTestForPath.value(unit, (), {})[df.TsTestForPath.KEY]
     unit.onpeerdir([for_mod_path])
+
+    # user-defined recipes should be in the end
+    user_recipes = unit.get("TEST_RECIPES_VALUE").replace("$TEST_RECIPES_VALUE", "").strip()
+    unit.set(["TEST_RECIPES_VALUE", ""])
     unit.on_setup_extract_node_modules_recipe([for_mod_path])
     unit.on_setup_extract_output_tars_recipe([for_mod_path])
+    __set_append(unit, "TEST_RECIPES_VALUE", user_recipes)
 
     build_root = "$B" if test_runner in [TsTestType.HERMIONE, TsTestType.PLAYWRIGHT_LARGE] else "$(BUILD_ROOT)"
     unit.set(["TS_TEST_NM", os.path.join(build_root, for_mod_path, node_modules_filename)])

build/ya.conf.json

@@ -1612,6 +1612,16 @@
                         "os": "IOSSIM"
                     }
                 },
+                {
+                    "default": true,
+                    "host": {
+                        "os": "LINUX"
+                    },
+                    "target": {
+                        "arch": "armv6hf",
+                        "os": "LINUX"
+                    }
+                },
                 {
                     "default": true,
                     "host": {

build/ymake_conf.py

@@ -102,13 +102,15 @@ def __init__(self, name, os, arch):
         self.is_x86_64 = self.arch in ('x86_64', 'amd64')
         self.is_intel = self.is_x86 or self.is_x86_64
 
+        self.is_armv6 = self.arch in ('armv6hf',)
         self.is_armv7 = self.arch in ('armv7', 'armv7a', 'armv7ahf', 'armv7a_neon', 'arm', 'armv7a_cortex_a9', 'armv7ahf_cortex_a35', 'armv7ahf_cortex_a53')
         self.is_armv8 = self.arch in ('armv8', 'armv8a', 'arm64', 'aarch64', 'armv8a_cortex_a35', 'armv8a_cortex_a53')
         self.is_armv8m = self.arch in ('armv8m_cortex_m33', 'armv8m_cortex_m23')
         self.is_armv7em = self.arch in ('armv7em_cortex_m4', 'armv7em_cortex_m7')
         self.is_arm64 = self.arch in ('arm64',)
-        self.is_arm = self.is_armv7 or self.is_armv8 or self.is_armv8m or self.is_armv7em
+        self.is_arm = self.is_armv6 or self.is_armv7 or self.is_armv8 or self.is_armv8m or self.is_armv7em
         self.is_armv7_neon = self.arch in ('armv7a_neon', 'armv7ahf', 'armv7a_cortex_a9', 'armv7ahf_cortex_a35', 'armv7ahf_cortex_a53')
+        self.is_armv6hf = self.arch in ('armv6hf',)
         self.is_armv7hf = self.arch in ('armv7ahf', 'armv7ahf_cortex_a35', 'armv7ahf_cortex_a53')
         self.is_armv5te = self.arch in ('armv5te_arm968e_s',)
 
@@ -124,6 +126,8 @@ def __init__(self, name, os, arch):
         self.is_xtensa_hifi5 = self.arch == 'xtensa_hifi5'
         self.is_xtensa = self.is_xtensa_hifi4 or self.is_xtensa_hifi5
 
+        self.armv6_float_abi = 'hard'
+
         self.armv7_float_abi = None
         if self.is_armv7:
             if self.is_armv7hf:
@@ -148,7 +152,11 @@ def __init__(self, name, os, arch):
         self.is_wasm64 = self.arch == 'wasm64'
         self.is_wasm = self.is_wasm32 or self.is_wasm64
 
-        self.is_32_bit = self.is_x86 or self.is_armv5te or self.is_armv7 or self.is_armv8m or self.is_riscv32 or self.is_nds32 or self.is_armv7em or self.is_xtensa or self.is_tc32 or self.is_wasm32
+        self.is_32_bit = (
+            self.is_x86 or
+            self.is_armv5te or self.is_armv6 or self.is_armv7 or self.is_armv7em or self.is_armv8m or
+            self.is_riscv32 or self.is_nds32 or self.is_xtensa or self.is_tc32 or self.is_wasm32
+        )
         self.is_64_bit = self.is_x86_64 or self.is_armv8 or self.is_powerpc or self.is_wasm64
 
         assert self.is_32_bit or self.is_64_bit
@@ -216,6 +224,7 @@ def arch_variables(self):
             (self.is_i386 or self.is_i686, 'ARCH_I386'),
             (self.is_i686, 'ARCH_I686'),
             (self.is_x86_64, 'ARCH_X86_64'),
+            (self.is_armv6, 'ARCH_ARM6'),
             (self.is_armv7, 'ARCH_ARM7'),
             (self.is_armv7_neon, 'ARCH_ARM7_NEON'),
             (self.is_armv8, 'ARCH_ARM64'),
@@ -827,6 +836,9 @@ def print_target_settings(self):
         for variable in self.platform.os_variables:
             emit(variable, 'yes')
 
+        if self.platform.is_armv6:
+            emit('ARM6_FLOAT_ABI', self.platform.armv6_float_abi)
+
         if self.platform.is_armv7:
             emit('ARM7_FLOAT_ABI', self.platform.armv7_float_abi)
 
@@ -1195,6 +1207,7 @@ def get_os_sdk(target):
                 target_triple = select(default=None, selectors=[
                     (target.is_linux and target.is_x86_64, 'x86_64-linux-gnu'),
                     (target.is_linux and target.is_armv8, 'aarch64-linux-gnu'),
+                    (target.is_linux and target.is_armv6 and target.armv6_float_abi == 'hard', 'armv6-linux-gnueabihf'),
                     (target.is_linux and target.is_armv7 and target.armv7_float_abi == 'hard', 'armv7-linux-gnueabihf'),
                     (target.is_linux and target.is_armv7 and target.armv7_float_abi == 'softfp', 'armv7-linux-gnueabi'),
                     (target.is_linux and target.is_powerpc, 'powerpc64le-linux-gnu'),
@@ -1258,13 +1271,16 @@ def get_os_sdk(target):
         elif target.is_cortex_m33:
             self.c_flags_platform.append('-mcpu=cortex-m33 -mfpu=fpv5-sp-d16')
 
+        elif target.is_armv6hf:
+            self.c_flags_platform.append('-march=armv6 -mfpu=vfp')
+
         elif target.is_armv7_neon:
             self.c_flags_platform.append('-mfpu=neon')
 
         elif target.is_arm968e_s:
             self.c_flags_platform.append('-march=armv5te -mcpu=arm968e-s -mthumb-interwork -mlittle-endian')
 
-        if (target.is_armv7 or target.is_armv8m or target.is_armv7em or target.is_armv5te) and build.is_size_optimized:
+        if (target.is_armv6 or target.is_armv7 or target.is_armv8m or target.is_armv7em or target.is_armv5te) and build.is_size_optimized:
             # Enable ARM Thumb2 variable-length instruction encoding
             # to reduce code size
             self.c_flags_platform.append('-mthumb')

contrib/libs/cxxsupp/builtins/.yandex_meta/build.ym

@@ -151,7 +151,7 @@ IF (ARCH_ARM64 OR ARCH_X86_64)
 ENDIF()
 EOF
 
-echo 'IF (ARCH_ARM7)'
+echo 'IF (ARCH_ARM6 OR ARCH_ARM7)'
 echo 'SRCS('
 ls arm/*.S arm/*.c > special
 python3 join.py common special arm

contrib/libs/cxxsupp/builtins/ya.make

@@ -86,7 +86,7 @@ IF (ARCH_ARM64 OR ARCH_X86_64)
     ENDIF()
 ENDIF()
 
-IF (ARCH_ARM7)
+IF (ARCH_ARM6 OR ARCH_ARM7)
     SRCS(
         absvdi2.c
         absvsi2.c

contrib/libs/cxxsupp/libcxx/.yandex_meta/build.ym

@@ -112,7 +112,7 @@ ELSEIF (OS_IOS)
         contrib/libs/cxxsupp/builtins
     )
 ELSEIF (OS_LINUX OR OS_DARWIN)
-    IF (ARCH_ARM7)
+    IF (ARCH_ARM6 OR ARCH_ARM7)
         # libcxxrt support for ARM is currently broken, use libcxxabi instead
         SET(CXX_RT "libcxxabi")
     ELSE()

contrib/libs/cxxsupp/libcxx/include/__memory/array_cookie.h

@@ -34,7 +34,7 @@ ELSEIF (OS_IOS)
         contrib/libs/cxxsupp/builtins
     )
 ELSEIF (OS_LINUX OR OS_DARWIN)
-    IF (ARCH_ARM7)
+    IF (ARCH_ARM6 OR ARCH_ARM7)
         # libcxxrt support for ARM is currently broken, use libcxxabi instead
         SET(CXX_RT "libcxxabi")
     ELSE()

contrib/libs/cxxsupp/libcxx/ya.make

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytest
-Version: 7.4.4
+Version: 8.0.2
 Summary: pytest: simple powerful testing with Python
 Home-page: https://docs.pytest.org/en/latest/
 Author: Holger Krekel, Bruno Oliveira, Ronny Pfannschmidt, Floris Bruynooghe, Brianna Laugher, Florian Bruhin and others
@@ -23,7 +23,6 @@ Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
@@ -32,15 +31,14 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Software Development :: Testing
 Classifier: Topic :: Utilities
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: iniconfig
 Requires-Dist: packaging
-Requires-Dist: pluggy <2.0,>=0.12
+Requires-Dist: pluggy <2.0,>=1.3.0
 Requires-Dist: exceptiongroup >=1.0.0rc8 ; python_version < "3.11"
 Requires-Dist: tomli >=1.0.0 ; python_version < "3.11"
-Requires-Dist: importlib-metadata >=0.12 ; python_version < "3.8"
 Requires-Dist: colorama ; sys_platform == "win32"
 Provides-Extra: testing
 Requires-Dist: argcomplete ; extra == 'testing'
@@ -75,16 +73,13 @@ Requires-Dist: xmlschema ; extra == 'testing'
     :target: https://codecov.io/gh/pytest-dev/pytest
     :alt: Code coverage Status
 
-.. image:: https://github.com/pytest-dev/pytest/workflows/test/badge.svg
+.. image:: https://github.com/pytest-dev/pytest/actions/workflows/test.yml/badge.svg
     :target: https://github.com/pytest-dev/pytest/actions?query=workflow%3Atest
 
 .. image:: https://results.pre-commit.ci/badge/github/pytest-dev/pytest/main.svg
    :target: https://results.pre-commit.ci/latest/github/pytest-dev/pytest/main
    :alt: pre-commit.ci status
 
-.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
-    :target: https://github.com/psf/black
-
 .. image:: https://www.codetriage.com/pytest-dev/pytest/badges/users.svg
     :target: https://www.codetriage.com/pytest-dev/pytest
 
@@ -155,7 +150,7 @@ Features
 - Can run `unittest <https://docs.pytest.org/en/stable/how-to/unittest.html>`_ (or trial),
   `nose <https://docs.pytest.org/en/stable/how-to/nose.html>`_ test suites out of the box
 
-- Python 3.7+ or PyPy3
+- Python 3.8+ or PyPy3
 
 - Rich plugin architecture, with over 850+ `external plugins <https://docs.pytest.org/en/latest/reference/plugin_list.html>`_ and thriving community