Skip to content

Commit b2a5d3a

Browse files
authored
Merge pull request #12156 from ydb-platform/mergelibs-241130-1815
Library import 241130-1815
2 parents 7466d62 + b4cba28 commit b2a5d3a

File tree

197 files changed

+9310
-11226
lines changed

Some content is hidden

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

197 files changed

+9310
-11226
lines changed
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
2+
"black": "build/config/tests/py_style/config.toml",
3+
"dummy_linter": "build/config/tests/py_style/dummy_linter_config.json",
24
"flake8": "build/config/tests/flake8/flake8.conf",
35
"py2_flake8": "build/config/tests/flake8/flake8.conf",
4-
"black": "build/config/tests/py_style/config.toml",
5-
"dummy_linter": "build/config/tests/py_style/dummy_linter_config.json"
6+
"ruff": "build/config/tests/ruff/ruff.toml"
67
}

build/plugins/lib/test_const/__init__.py

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -438,19 +438,32 @@ class ServiceTags(Enum):
438438

439439

440440
class PythonLinterName(Enum):
441-
Flake8 = "flake8"
442-
Py2Flake8 = "py2_flake8"
443441
Black = "black"
444442
DummyLinter = "dummy_linter"
443+
Flake8 = "flake8"
444+
Py2Flake8 = "py2_flake8"
445+
Ruff = "ruff"
445446

446447

447448
class CppLinterName(Enum):
448449
ClangFormat = "clang_format"
449450

450451

451452
class DefaultLinterConfig(Enum):
452-
Python = "build/config/tests/py_style/default_configs.json"
453453
Cpp = "build/config/tests/cpp_style/default_configs.json"
454+
Python = "build/config/tests/py_style/default_configs.json"
455+
456+
457+
LINTER_CONFIG_TYPES = {
458+
CppLinterName.ClangFormat: (".clang-format",),
459+
PythonLinterName.Black: ("pyproject.toml",),
460+
PythonLinterName.Ruff: ("pyproject.toml", "ruff.toml"),
461+
}
462+
463+
AUTOINCLUDE_PATHS = (
464+
'build/conf/autoincludes.json',
465+
'build/internal/conf/autoincludes.json',
466+
)
454467

455468

456469
class Status(object):

contrib/libs/mimalloc/.yandex_meta/devtools.copyrights.report

Lines changed: 46 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,6 @@
2929
# FILE_INCLUDE - include all file data into licenses text file
3030
# =======================
3131

32-
KEEP COPYRIGHT_SERVICE_LABEL 21dec668d9ab2431f46cc70979134ba7
33-
BELONGS ya.make
34-
Note: matched license text is too long. Read it in the source files.
35-
Scancode info:
36-
Original SPDX id: COPYRIGHT_SERVICE_LABEL
37-
Score : 100.00
38-
Match type : COPYRIGHT
39-
Files with this license:
40-
src/bitmap.c [2:4]
41-
4232
KEEP COPYRIGHT_SERVICE_LABEL 25dcefb85a8e188fc5c56da58857f739
4333
BELONGS ya.make
4434
License text:
@@ -58,81 +48,106 @@ BELONGS ya.make
5848
Score : 100.00
5949
Match type : COPYRIGHT
6050
Files with this license:
61-
include/mimalloc-internal.h [2:4]
62-
include/mimalloc-types.h [2:4]
63-
include/mimalloc.h [2:4]
6451
src/alloc-aligned.c [2:4]
6552
src/alloc-override.c [2:4]
6653
src/alloc-posix.c [2:4]
67-
src/alloc.c [2:4]
6854
src/heap.c [2:4]
69-
src/init.c [2:4]
7055
src/options.c [2:4]
71-
src/os.c [2:4]
7256
src/stats.c [2:4]
7357

74-
KEEP COPYRIGHT_SERVICE_LABEL 28da6750f9f70938a34a2683265c5f37
58+
KEEP COPYRIGHT_SERVICE_LABEL 5b7d847fe742e0704b8071bd0042a721
7559
BELONGS ya.make
7660
Note: matched license text is too long. Read it in the source files.
7761
Scancode info:
7862
Original SPDX id: COPYRIGHT_SERVICE_LABEL
7963
Score : 100.00
8064
Match type : COPYRIGHT
8165
Files with this license:
82-
include/mimalloc-atomic.h [2:4]
66+
include/mimalloc-new-delete.h [2:4]
67+
include/mimalloc-override.h [2:4]
8368

84-
KEEP COPYRIGHT_SERVICE_LABEL 4d891fec2fadb396208278a6d4280c2c
69+
KEEP COPYRIGHT_SERVICE_LABEL 5f21aa30041415548b09b1e8e25da7fb
8570
BELONGS ya.make
8671
Note: matched license text is too long. Read it in the source files.
8772
Scancode info:
8873
Original SPDX id: COPYRIGHT_SERVICE_LABEL
8974
Score : 100.00
9075
Match type : COPYRIGHT
9176
Files with this license:
92-
src/bitmap.h [2:4]
77+
src/arena.c [2:4]
78+
src/segment-map.c [2:4]
9379

94-
KEEP COPYRIGHT_SERVICE_LABEL 5b7d847fe742e0704b8071bd0042a721
80+
KEEP COPYRIGHT_SERVICE_LABEL 5fc5246a7da6971940f2a93100292b4d
9581
BELONGS ya.make
9682
Note: matched license text is too long. Read it in the source files.
9783
Scancode info:
9884
Original SPDX id: COPYRIGHT_SERVICE_LABEL
9985
Score : 100.00
10086
Match type : COPYRIGHT
10187
Files with this license:
102-
include/mimalloc-new-delete.h [2:4]
103-
include/mimalloc-override.h [2:4]
88+
src/random.c [2:4]
10489

105-
KEEP COPYRIGHT_SERVICE_LABEL 5fc5246a7da6971940f2a93100292b4d
90+
KEEP COPYRIGHT_SERVICE_LABEL 8417b808fabacd093257b7972e1b7c8f
10691
BELONGS ya.make
10792
Note: matched license text is too long. Read it in the source files.
10893
Scancode info:
10994
Original SPDX id: COPYRIGHT_SERVICE_LABEL
11095
Score : 100.00
11196
Match type : COPYRIGHT
11297
Files with this license:
113-
src/arena.c [2:4]
114-
src/random.c [2:4]
98+
include/mimalloc/atomic.h [2:4]
99+
100+
KEEP COPYRIGHT_SERVICE_LABEL bb2ecc7d3573627ff5673fd4981120f7
101+
BELONGS ya.make
102+
Note: matched license text is too long. Read it in the source files.
103+
Scancode info:
104+
Original SPDX id: COPYRIGHT_SERVICE_LABEL
105+
Score : 100.00
106+
Match type : COPYRIGHT
107+
Files with this license:
108+
src/bitmap.c [2:4]
109+
src/bitmap.h [2:4]
115110

116-
KEEP COPYRIGHT_SERVICE_LABEL fe43a4aab9cf694378c07b2f43474c64
111+
KEEP COPYRIGHT_SERVICE_LABEL e7f053f38ca4d796d9d56538f0ce1ac7
117112
BELONGS ya.make
118113
Note: matched license text is too long. Read it in the source files.
119114
Scancode info:
120115
Original SPDX id: COPYRIGHT_SERVICE_LABEL
121116
Score : 100.00
122117
Match type : COPYRIGHT
123118
Files with this license:
124-
src/region.c [2:4]
119+
include/mimalloc.h [2:4]
120+
include/mimalloc/internal.h [2:4]
121+
include/mimalloc/prim.h [2:4]
122+
include/mimalloc/track.h [2:4]
123+
src/libc.c [2:4]
124+
src/os.c [2:4]
125+
src/prim/osx/prim.c [2:4]
126+
src/prim/prim.c [2:4]
127+
src/prim/unix/prim.c [2:4]
125128

126-
KEEP COPYRIGHT_SERVICE_LABEL feb05913c2d79921f57fa41bec01920f
129+
KEEP COPYRIGHT_SERVICE_LABEL fc7c1095a8a64f3166ead9be4cfabb96
127130
BELONGS ya.make
128131
Note: matched license text is too long. Read it in the source files.
129132
Scancode info:
130133
Original SPDX id: COPYRIGHT_SERVICE_LABEL
131134
Score : 100.00
132135
Match type : COPYRIGHT
133136
Files with this license:
134-
src/alloc-override-osx.c [2:4]
137+
include/mimalloc/types.h [2:4]
138+
src/alloc.c [2:4]
139+
src/free.c [2:4]
135140
src/page-queue.c [2:4]
136141
src/page.c [2:4]
137142
src/segment.c [2:4]
138-
src/static.c [2:4]
143+
144+
KEEP COPYRIGHT_SERVICE_LABEL fe63ec86a6a35162f9131f69ba4bc3e6
145+
BELONGS ya.make
146+
Note: matched license text is too long. Read it in the source files.
147+
Scancode info:
148+
Original SPDX id: COPYRIGHT_SERVICE_LABEL
149+
Score : 100.00
150+
Match type : COPYRIGHT
151+
Files with this license:
152+
src/init.c [2:4]
153+
src/prim/osx/alloc-override-zone.c [2:4]

contrib/libs/mimalloc/.yandex_meta/devtools.licenses.report

Lines changed: 33 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131

3232
SKIP LicenseRef-scancode-generic-cla 0539c29f2b403f650800fcba3b1c53a6
3333
BELONGS ya.make
34-
# Contributor License Agreement
3534
License text:
3635
Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
3736
Scancode info:
@@ -40,11 +39,11 @@ BELONGS ya.make
4039
Match type : NOTICE
4140
Links : https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/generic-cla.LICENSE
4241
Files with this license:
43-
readme.md [680:680]
42+
readme.md [816:816]
4443

4544
KEEP MIT AND MIT 2d229fcf116e5a7facba2d4dcccf15ba
4645
BELONGS ya.make
47-
FILE_INCLUDE LICENSE found in files: include/mimalloc-internal.h at line 5, include/mimalloc-types.h at line 5, include/mimalloc.h at line 5, src/alloc-aligned.c at line 5, src/alloc.c at line 5, src/options.c at line 5
46+
FILE_INCLUDE LICENSE found in files: include/mimalloc.h at line 5, include/mimalloc/atomic.h at line 5, include/mimalloc/internal.h at line 5, include/mimalloc/track.h at line 5, src/init.c at line 5, src/os.c at line 5
4847
License text:
4948
This is free software; you can redistribute it and/or modify it under the
5049
terms of the MIT license. A copy of the license can be found in the file
@@ -55,37 +54,43 @@ FILE_INCLUDE LICENSE found in files: include/mimalloc-internal.h at line 5, incl
5554
Match type : NOTICE
5655
Links : http://opensource.org/licenses/mit-license.php, https://spdx.org/licenses/MIT
5756
Files with this license:
58-
include/mimalloc-atomic.h [3:5]
5957
include/mimalloc-new-delete.h [3:5]
6058
include/mimalloc-override.h [3:5]
61-
src/alloc-override-osx.c [3:5]
59+
include/mimalloc/prim.h [3:5]
60+
include/mimalloc/types.h [3:5]
61+
src/alloc-aligned.c [3:5]
6262
src/alloc-override.c [3:5]
6363
src/alloc-posix.c [3:5]
64+
src/alloc.c [3:5]
6465
src/arena.c [3:5]
6566
src/bitmap.c [3:5]
6667
src/bitmap.h [3:5]
68+
src/free.c [3:5]
6769
src/heap.c [3:5]
68-
src/init.c [3:5]
69-
src/os.c [3:5]
70+
src/libc.c [3:5]
71+
src/options.c [3:5]
7072
src/page-queue.c [3:5]
7173
src/page.c [3:5]
74+
src/prim/osx/alloc-override-zone.c [3:5]
75+
src/prim/osx/prim.c [3:5]
76+
src/prim/prim.c [3:5]
77+
src/prim/unix/prim.c [3:5]
7278
src/random.c [3:5]
73-
src/region.c [3:5]
79+
src/segment-map.c [3:5]
7480
src/segment.c [3:5]
75-
src/static.c [3:5]
7681
src/stats.c [3:5]
7782
Scancode info:
7883
Original SPDX id: MIT
7984
Score : 61.76
8085
Match type : NOTICE
8186
Links : http://opensource.org/licenses/mit-license.php, https://spdx.org/licenses/MIT
8287
Files with this license:
83-
include/mimalloc-internal.h [3:5]
84-
include/mimalloc-types.h [3:5]
8588
include/mimalloc.h [3:5]
86-
src/alloc-aligned.c [3:5]
87-
src/alloc.c [3:5]
88-
src/options.c [3:5]
89+
include/mimalloc/atomic.h [3:5]
90+
include/mimalloc/internal.h [3:5]
91+
include/mimalloc/track.h [3:5]
92+
src/init.c [3:5]
93+
src/os.c [3:5]
8994

9095
KEEP MIT 399584035c417b91040964779555dfac
9196
BELONGS ya.make
@@ -99,6 +104,20 @@ BELONGS ya.make
99104
Files with this license:
100105
LICENSE [1:1]
101106

107+
KEEP MIT 46d3a844e933821ebdb401dff1a34bc0
108+
BELONGS ya.make
109+
License text:
110+
This is free software; you can redistribute it and/or modify it under the
111+
terms of the MIT license. A copy of the license can be found in the file
112+
Scancode info:
113+
Original SPDX id: BSD-3-Clause
114+
Score : 52.38
115+
Match type : NOTICE
116+
Links : http://www.opensource.org/licenses/BSD-3-Clause, https://spdx.org/licenses/BSD-3-Clause
117+
Files with this license:
118+
include/mimalloc/atomic.h [3:4]
119+
include/mimalloc/track.h [3:4]
120+
102121
KEEP MIT 54575e81a786e9aa7d98337ec2e1ebb0
103122
BELONGS ya.make
104123
Note: matched license text is too long. Read it in the source files.

contrib/libs/mimalloc/.yandex_meta/licenses.list.txt

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,47 +5,53 @@ terms of the MIT license. A copy of the license can be found in the file
55

66

77
====================COPYRIGHT====================
8-
Copyright (c) 2018-2020, Microsoft Research, Daan Leijen
8+
Copyright (c) 2018-2021 Microsoft Corporation, Daan Leijen
9+
10+
11+
====================COPYRIGHT====================
12+
Copyright (c) 2018-2021, Microsoft Research, Daan Leijen
913
This is free software; you can redistribute it and/or modify it under the
1014
terms of the MIT license. A copy of the license can be found in the file
1115

1216

1317
====================COPYRIGHT====================
14-
Copyright (c) 2018-2021 Microsoft Corporation, Daan Leijen
18+
Copyright (c) 2018-2022, Microsoft Research, Daan Leijen
19+
This is free software; you can redistribute it and/or modify it under the
20+
terms of the MIT license. A copy of the license can be found in the file
1521

1622

1723
====================COPYRIGHT====================
18-
Copyright (c) 2018-2021 Microsoft Research, Daan Leijen
24+
Copyright (c) 2018-2023 Microsoft Research, Daan Leijen
1925
This is free software; you can redistribute it and/or modify it under the
2026
terms of the MIT license. A copy of the license can be found in the file
2127

2228

2329
====================COPYRIGHT====================
24-
Copyright (c) 2018-2021, Microsoft Research, Daan Leijen
30+
Copyright (c) 2018-2023, Microsoft Research, Daan Leijen
2531
This is free software; you can redistribute it and/or modify it under the
2632
terms of the MIT license. A copy of the license can be found in the file
2733

2834

2935
====================COPYRIGHT====================
30-
Copyright (c) 2019-2020 Microsoft Research, Daan Leijen
36+
Copyright (c) 2018-2024, Microsoft Research, Daan Leijen
3137
This is free software; you can redistribute it and/or modify it under the
3238
terms of the MIT license. A copy of the license can be found in the file
3339

3440

3541
====================COPYRIGHT====================
36-
Copyright (c) 2019-2020, Microsoft Research, Daan Leijen
42+
Copyright (c) 2019-2021, Microsoft Research, Daan Leijen
3743
This is free software; you can redistribute it and/or modify it under the
3844
terms of the MIT license. A copy of the license can be found in the file
3945

4046

4147
====================COPYRIGHT====================
42-
Copyright (c) 2019-2021 Microsoft Research, Daan Leijen
48+
Copyright (c) 2019-2023 Microsoft Research, Daan Leijen
4349
This is free software; you can redistribute it and/or modify it under the
4450
terms of the MIT license. A copy of the license can be found in the file
4551

4652

4753
====================COPYRIGHT====================
48-
Copyright (c) 2019-2021, Microsoft Research, Daan Leijen
54+
Copyright (c) 2019-2023, Microsoft Research, Daan Leijen
4955
This is free software; you can redistribute it and/or modify it under the
5056
terms of the MIT license. A copy of the license can be found in the file
5157

@@ -97,6 +103,11 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
97103
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
98104
SOFTWARE.
99105

106+
====================MIT====================
107+
This is free software; you can redistribute it and/or modify it under the
108+
terms of the MIT license. A copy of the license can be found in the file
109+
110+
100111
====================MIT AND MIT====================
101112
This is free software; you can redistribute it and/or modify it under the
102113
terms of the MIT license. A copy of the license can be found in the file

0 commit comments

Comments
 (0)