Skip to content

Commit bbb4500

Browse files
authored
Merge pull request #9817 from ydb-platform/mergelibs-240926-1443
Library import 240926-1443
2 parents 1ca8874 + 3026c00 commit bbb4500

File tree

265 files changed

+2930
-1552
lines changed

Some content is hidden

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

265 files changed

+2930
-1552
lines changed

build/conf/a.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ arcanum:
77
requirements:
88
- system: arcanum
99
type: merge_time_fits
10-
alias: Merge time intervals (YMAKE-1194)
10+
alias: Merge is forbidden from 11:00 to 20:00 MSK (YMAKE-1194)
1111
data:
1212
merge_intervals_utc:
1313
# 20:00..11:00 MSK

build/conf/go.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -816,6 +816,7 @@ module GO_LIBRARY: _GO_BASE_UNIT {
816816
SET(MODULE_TYPE LIBRARY)
817817
SET(PEERDIR_TAGS GO GO_PROTO GO_FBS __EMPTY__ RESOURCE_LIB PACKAGE_UNION)
818818

819+
_MAKEFILE_INCLUDE_LIKE_DEPS+=.yo.snapshot.json
819820
MODULE_SUFFIX=.a
820821
}
821822

build/conf/java.conf

Lines changed: 59 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ when($JDK_VERSION == "8") {
472472
}
473473

474474
# tag:java-specific
475-
JDK_LATEST_VERSION=22
475+
JDK_LATEST_VERSION=23
476476
JDK_LATEST_PEERDIR=build/platform/java/jdk/jdk${JDK_LATEST_VERSION}
477477

478478
# tag:java-specific
@@ -1074,6 +1074,13 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
10741074
when($WITH_KOTLINC_PLUGIN_SERIALIZATION) {
10751075
KOTLINC_OPTS_VALUE+=-Xplugin=${KOTLIN_COMPILER_RESOURCE_GLOBAL}/plugins/kotlin-serialization-plugin.jar
10761076
}
1077+
when($WITH_KOTLINC_PLUGIN_DETEKT) {
1078+
KOTLINC_OPTS_VALUE+=-Xplugin=${tool:"devtools/detekt-compiler-plugin"}
1079+
KOTLINC_OPTS_VALUE+=-P plugin:detekt-compiler-plugin:report=xml:${BINDIR}/misc/detekt-report.xml
1080+
# If there are no kt sources, the report won't be generated, however the file must be always present.
1081+
ALL_KT_COMMANDS+=&& $YMAKE_PYTHON ${input:"build/scripts/touch.py"} ${BINDIR}/misc/detekt-report.xml
1082+
ALL_KT_COMMANDS+=&& $FS_TOOLS copy ${BINDIR}/misc/detekt-report.xml ${output;noauto:"detekt-report.xml"}
1083+
}
10771084
# Must be in sync with KT_CLASSES_DIR!
10781085
# There are problems in JDK13 with abs paths in classpath baked into jar file manifest. Using relative path
10791086
# here assumes that jar file with classpath for javac located in the $ARCADIA_BUILD_ROOT
@@ -1147,6 +1154,11 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
11471154
JAVAC_OPTS+=$ERROR_PRONE_JDK16PLUS_ADD_OPENS
11481155
}
11491156

1157+
when($ERROR_PRONE_VALUE && $JDK_REAL_VERSION == "23") {
1158+
JAVAC_FLAGS_VALUE+=$ERROR_PRONE_JDK16PLUS_ADD_OPENS
1159+
JAVAC_OPTS+=$ERROR_PRONE_JDK16PLUS_ADD_OPENS
1160+
}
1161+
11501162
when($ERROR_PRONE_VALUE && $ERROR_PRONE_VERSION == "2.7.1") {
11511163
JAVAC_FLAGS_VALUE+=$ERROR_PRONE_2_7_1_FORCED_OPTS
11521164
JAVAC_OPTS+=$ERROR_PRONE_2_7_1_FORCED_OPTS
@@ -1165,6 +1177,7 @@ module JAR_LIBRARY: _COMPILABLE_JAR_BASE {
11651177
ENABLE(YMAKE_JAVA_TEST)
11661178
_ADD_KOTLIN_STYLE_CHECKS($(BUILD_ROOT)/$MODDIR/all-kt-sources.txt REQUIREMENTS cpu:2)
11671179
_ADD_JAVA_STYLE_CHECKS($(BUILD_ROOT)/$MODDIR/lint-java.srclst::$(SOURCE_ROOT))
1180+
_ADD_DETEKT_REPORT_CHECK($(BUILD_ROOT)/$MODDIR/detekt-report.xml)
11681181
_ADD_CLASSPATH_CLASH_CHECK()
11691182
JAVA_MODULE()
11701183
}
@@ -1284,7 +1297,10 @@ JAVA_SWIG_DELIM=JAVA_SWIG_DELIM
12841297
JDK_REAL_VERSION=
12851298
JDK_VERSION=
12861299

1287-
when ($JDK_VERSION == "22") {
1300+
when ($JDK_VERSION == "23") {
1301+
JDK_REAL_VERSION=23
1302+
}
1303+
elsewhen ($JDK_VERSION == "22") {
12881304
JDK_REAL_VERSION=22
12891305
}
12901306
elsewhen ($JDK_VERSION == "21") {
@@ -1312,6 +1328,9 @@ when ($USE_SYSTEM_JDK) {
13121328
JDK_RESOURCE_PEERDIR=
13131329
}
13141330
otherwise {
1331+
when ($JDK_REAL_VERSION == "23") {
1332+
JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk23 build/platform/java/jdk/jdk17
1333+
}
13151334
when ($JDK_REAL_VERSION == "22") {
13161335
JDK_RESOURCE_PEERDIR=build/platform/java/jdk/jdk22 build/platform/java/jdk/jdk17
13171336
}
@@ -1331,6 +1350,9 @@ otherwise {
13311350
}
13321351

13331352
# tag:java-specific
1353+
when ($JDK_REAL_VERSION == "23") {
1354+
UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar23
1355+
}
13341356
when ($JDK_REAL_VERSION == "22") {
13351357
UBERJAR_RESOURCE_PEERDIR=build/platform/java/uberjar/uberjar22
13361358
}
@@ -1353,6 +1375,9 @@ when ($USE_SYSTEM_JDK) {
13531375
JDK_RESOURCE=$USE_SYSTEM_JDK
13541376
}
13551377
otherwise {
1378+
when ($JDK_REAL_VERSION == "23") {
1379+
JDK_RESOURCE=$JDK23_RESOURCE_GLOBAL
1380+
}
13561381
when ($JDK_REAL_VERSION == "22") {
13571382
JDK_RESOURCE=$JDK22_RESOURCE_GLOBAL
13581383
}
@@ -1398,6 +1423,11 @@ when (!$USE_SYSTEM_ERROR_PRONE) {
13981423
ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.30.0
13991424
ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_30_0_RESOURCE_GLOBAL
14001425
}
1426+
elsewhen ($JDK_REAL_VERSION == "23") {
1427+
ERROR_PRONE_VERSION=2.30.0
1428+
ERROR_PRONE_PEERDIR=build/platform/java/error_prone/2.30.0
1429+
ERROR_PRONE_RESOURCE=$ERROR_PRONE_2_30_0_RESOURCE_GLOBAL
1430+
}
14011431
otherwise {
14021432
ERROR_PRONE_VERSION=2.7.1
14031433
ERROR_PRONE_PEERDIR=build/platform/java/error_prone
@@ -1415,6 +1445,9 @@ when ($USE_SYSTEM_UBERJAR) {
14151445
UBERJAR_RESOURCE=$USE_SYSTEM_UBERJAR
14161446
}
14171447
otherwise {
1448+
when ($JDK_REAL_VERSION == "23") {
1449+
UBERJAR_RESOURCE=$UBERJAR23_RESOURCE_GLOBAL
1450+
}
14181451
when ($JDK_REAL_VERSION == "22") {
14191452
UBERJAR_RESOURCE=$UBERJAR22_RESOURCE_GLOBAL
14201453
}
@@ -1433,6 +1466,9 @@ otherwise {
14331466
}
14341467

14351468
# tag:java-specific
1469+
when ($JDK_REAL_VERSION == "23") {
1470+
WITH_JDK_RESOURCE=$WITH_JDK23_RESOURCE_GLOBAL
1471+
}
14361472
when ($JDK_REAL_VERSION == "22") {
14371473
WITH_JDK_RESOURCE=$WITH_JDK22_RESOURCE_GLOBAL
14381474
}
@@ -1937,20 +1973,35 @@ macro WITH_KOTLINC_SERIALIZATION() {
19371973
SET(_WITH_KOTLINC_PLUGIN_SERIALIZATION_SEM && with_kotlinc_plugin_serialization)
19381974
}
19391975

1976+
# tag:kotlin-specific
1977+
WITH_KOTLINC_PLUGIN_DETEKT=
1978+
_WITH_KOTLINC_PLUGIN_DETEKT_SEM=
1979+
### @usage: WITH_KOTLINC_DETEKT(-flags)
1980+
###
1981+
### Enable detekt kotlin compiler plugin https://detekt.dev/docs/gettingstarted/compilerplugin/
1982+
macro WITH_KOTLINC_DETEKT(Options...) {
1983+
SET_APPEND(KOTLINC_OPTS_VALUE ${pre=-P plugin\:detekt-compiler-plugin\::Options})
1984+
SET(WITH_KOTLINC_PLUGIN_DETEKT yes)
1985+
SET(_WITH_KOTLINC_PLUGIN_DETEKT_SEM && with_kotlinc_plugin_detekt)
1986+
}
1987+
1988+
19401989
# tag:kotlin-specific
19411990
### Also search for _KAPT_OPTS and change version there
19421991
_KOTLIN_VERSION=1.9.24
19431992
KOTLIN_VERSION=1.9.24
19441993
KOTLIN_BOM_FILE=${ARCADIA_ROOT}/contrib/java/org/jetbrains/kotlin/kotlin-bom/1.9.24/ya.dependency_management.inc
19451994
GROOVY_VERSION=3.0.5
1995+
DETEKT_VERSION=1.23.7
19461996

19471997
_KOTLIN_SEM= \
19481998
${_WITH_KOTLIN_SEM} \
19491999
${_KOTLIN_VERSION_SEM} \
19502000
${_WITH_KOTLINC_PLUGIN_ALLOPEN_SEM} \
19512001
${_WITH_KOTLINC_PLUGIN_LOMBOK_SEM} \
19522002
${_WITH_KOTLINC_PLUGIN_NOARG_SEM} \
1953-
${_WITH_KOTLINC_PLUGIN_SERIALIZATION_SEM}
2003+
${_WITH_KOTLINC_PLUGIN_SERIALIZATION_SEM} \
2004+
${_WITH_KOTLINC_PLUGIN_DETEKT_SEM}
19542005

19552006

19562007
_JAVA_PROTO_GRPC_SEM=
@@ -2083,6 +2134,11 @@ elsewhen ($JDK_REAL_VERSION == "22") {
20832134
# see also devtools/ya/jbuild/gen/actions/idea.py
20842135
KOTLIN_JVM_TARGET=21
20852136
}
2137+
elsewhen ($JDK_REAL_VERSION == "23") {
2138+
# remove when kotlin starts supporting jdk21 bytecode
2139+
# see also devtools/ya/jbuild/gen/actions/idea.py
2140+
KOTLIN_JVM_TARGET=21
2141+
}
20862142
otherwise {
20872143
KOTLIN_JVM_TARGET=$JDK_REAL_VERSION
20882144
}

build/conf/linkers/ld.conf

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,8 @@ when ($TIME_TRACE_GRANULARITY && $TIME_TRACE_GRANULARITY != "") {
141141
_LINKER_TIME_TRACE_FLAG=
142142
when (($TIME_TRACE == "yes" || $LINKER_TIME_TRACE == "yes") && $_DEFAULT_LINKER_ID == "lld") {
143143
_LINKER_TIME_TRACE_FLAG=\
144-
-Wl,--time-trace \
145-
-Wl,--time-trace-granularity=$_LINKER_TIME_TRACE_GRANULARITY \
146-
-Wl,--time-trace-file=${rootrel;output;pre=$MODULE_PREFIX;suf=$MODULE_SUFFIX.time_trace.json:REALPRJNAME}
144+
-Wl,--time-trace=${rootrel;output;pre=$MODULE_PREFIX;suf=$MODULE_SUFFIX.time_trace.json:REALPRJNAME} \
145+
-Wl,--time-trace-granularity=$_LINKER_TIME_TRACE_GRANULARITY
147146
}
148147

149148
_EXE_FLAGS=\

build/conf/linkers/msvc_linker.conf

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
LINK_EXE_CMD=${_WINE_LINK_PREFIX} ${_MSVC_LINK_OLD}
2-
LINK_LIB_CMD=${_WINE_LIB_PREFIX} ${_MSVC_LIB_OLD}
1+
LINK_EXE_CMD=${_WINE_LINK_PREFIX} ${_MSVC_LINK}
2+
LINK_LIB_CMD=${_WINE_LIB_PREFIX} ${_MSVC_LIB}
33

44
_MSVC_ARCH=
55
when ($ARCH_I386 == "yes" || $ARCH_I686 == "yes") {
@@ -46,9 +46,9 @@ when (!$NO_DEBUGINFO || $NO_DEBUGINFO == "no" || $NO_DEBUGINFO == "0") {
4646
_FLAGS_COMMON_LIBPATHS=
4747
when ($IDE_MSVS != "yes") {
4848
_FLAGS_COMMON_LIBPATHS=\
49-
/LIBPATH:\"${quo:_MSVC_TC_KIT_LIBS}/um/$_MSVC_ARCH\" \
50-
/LIBPATH:\"${quo:_MSVC_TC_KIT_LIBS}/ucrt/$_MSVC_ARCH\" \
51-
/LIBPATH:\"${quo:_MSVC_TC_VC_ROOT}/lib/$_MSVC_ARCH\"
49+
/LIBPATH:\""${_MSVC_TC_KIT_LIBS}/um/$_MSVC_ARCH"\" \
50+
/LIBPATH:\""${_MSVC_TC_KIT_LIBS}/ucrt/$_MSVC_ARCH"\" \
51+
/LIBPATH:\""${_MSVC_TC_VC_ROOT}/lib/$_MSVC_ARCH"\"
5252
}
5353

5454
_FLAGS_COMMON =/NOLOGO /ERRORREPORT:PROMPT /SUBSYSTEM:CONSOLE /TLBID:1 $MSVC_DYNAMICBASE /NXCOMPAT
@@ -107,7 +107,7 @@ OBJADDE_LIB_GLOBAL=
107107

108108
LINK_EXE_FLAGS=$LINK_EXE_FLAGS_PER_TYPE
109109
LINK_EXE_VFS_FLAGS=
110-
when ($_UNDER_WINE_LINK != "yes") {
110+
when ($_UNDER_WINE_LINK != "yes" && $USE_MSVC_LINKER != "yes") {
111111
LINK_EXE_VFS_FLAGS=/vfsoverlay:${BINDIR}/vfsoverlay.yaml
112112
}
113113
LINK_EXE_FLAGS+=${LINK_EXE_VFS_FLAGS}
@@ -118,7 +118,7 @@ GENERATE_COMMON_LIB_VFS_CMD=\
118118
${_FLAGS_COMMON_LIBPATHS}
119119

120120
GENERATE_COMMON_LIB_VFS=
121-
when ($_UNDER_WINE_LINK != "yes") {
121+
when ($_UNDER_WINE_LINK != "yes" && $USE_MSVC_LINKER != "yes") {
122122
GENERATE_COMMON_LIB_VFS=${GENERATE_COMMON_LIB_VFS_CMD}
123123
}
124124

build/conf/python.conf

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,10 @@ macro NO_YMAKE_PYTHON3() {
179179
SET(YMAKE_PYTHON3_PEERDIR)
180180
}
181181

182+
PYTHON_LINTERS_DEFAULT_CONFIGS=build/config/tests/py_style/default_configs.json
183+
182184
FLAKE_EXTRA_PARAMS=
183185
FLAKE_MIGRATIONS_CONFIG=
184-
FLAKE_CONFIG_FILES=build/config/tests/flake8/flake8.conf $FLAKE_MIGRATIONS_CONFIG
185186
when ($DISABLE_FLAKE8_MIGRATIONS == "yes") {
186187
FLAKE_EXTRA_PARAMS="DISABLE_FLAKE8_MIGRATIONS=yes"
187188
}
@@ -265,40 +266,54 @@ multimodule PY3_PROGRAM {
265266
}
266267
}
267268

269+
# tag:python-specific tag:internal
270+
### @usage: _ADD_PY_LINTER_CHECK(NAME name LINTER linter [DEPENDS deps] CONFIGS configs_file [GLOBAL_RESOURCES gr] [FILE_PROCESSING_TIME fpt] [EXTRA_PARAMS params] [PROJECT_TO_CONFIG_MAP pcm] [FLAKE_MIGRATIONS_CONFIG fmc] [CUSTOM_CONFIG cc])
271+
###
272+
### Triggers respective plugin
273+
macro _ADD_PY_LINTER_CHECK(Args...) {
274+
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS ${ARCADIA_ROOT}/${PYTHON_LINTERS_DEFAULT_CONFIGS})
275+
}
276+
277+
# tag:python-specific tag:internal
278+
### @usage: STYLE_DUMMY()
279+
###
280+
### Not an actual linter, used for dummy linter demonstration
281+
macro STYLE_DUMMY() {
282+
_ADD_PY_LINTER_CHECK(NAME dummy_linter LINTER tools/dummy_linter/dummy_linter CONFIGS $PYTHON_LINTERS_DEFAULT_CONFIGS)
283+
}
284+
268285
# tag:python-specific tag:test
269286
### @usage: STYLE_PYTHON([pyproject])
270287
###
271288
### Check python3 sources for style issues using black.
272-
BLACK_CONFIG_FILES=
273289
macro STYLE_PYTHON(pyproject...) {
274-
BLACK_CONFIG_FILES=$pyproject build/config/tests/py_style/config.toml
275-
_ADD_PY_LINTER_CHECK(NAME black LINTER tools/black_linter/black_linter FILE_PROCESSING_TIME $BLACK_FILE_PROCESSING_TIME CONFIGS $BLACK_CONFIG_FILES)
290+
_ADD_PY_LINTER_CHECK(NAME black LINTER tools/black_linter/black_linter FILE_PROCESSING_TIME $BLACK_FILE_PROCESSING_TIME CONFIGS $PYTHON_LINTERS_DEFAULT_CONFIGS CUSTOM_CONFIG $pyproject)
276291
}
277292

278293
# tag:python-specific tag:test
279294
### @usage: STYLE_RUFF()
280295
###
281296
### Check python3 sources for style issues using ruff.
282-
RUFF_CONFIG_PATHS_FILE=build/config/tests/ruff/ruff_config_paths.json
297+
RUFF_PROJECT_TO_CONFIG_MAP=build/config/tests/ruff/ruff_config_paths.json
283298
macro STYLE_RUFF() {
284-
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS ${ARCADIA_ROOT}/${RUFF_CONFIG_PATHS_FILE})
285-
_ADD_PY_LINTER_CHECK(NAME ruff LINTER tools/ruff_linter/bin/ruff_linter GLOBAL_RESOURCES build/external_resources/ruff CONFIGS $RUFF_CONFIG_PATHS_FILE)
299+
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS ${ARCADIA_ROOT}/${RUFF_PROJECT_TO_CONFIG_MAP})
300+
_ADD_PY_LINTER_CHECK(NAME ruff LINTER tools/ruff_linter/bin/ruff_linter GLOBAL_RESOURCES build/external_resources/ruff CONFIGS $PYTHON_LINTERS_DEFAULT_CONFIGS PROJECT_TO_CONFIG_MAP $RUFF_PROJECT_TO_CONFIG_MAP)
286301
}
287302

288303
# tag:python-specific tag:test
289304
### @usage: STYLE_FLAKE8()
290305
###
291306
### Check python3 sources for style issues using flake8.
292307
macro STYLE_FLAKE8() {
293-
_ADD_PY_LINTER_CHECK(NAME flake8 LINTER tools/flake8_linter/flake8_linter GLOBAL_RESOURCES build/external_resources/flake8_py3 FILE_PROCESSING_TIME $FLAKE8_FILE_PROCESSING_TIME CONFIGS $FLAKE_CONFIG_FILES EXTRA_PARAMS $FLAKE_EXTRA_PARAMS)
308+
_ADD_PY_LINTER_CHECK(NAME flake8 LINTER tools/flake8_linter/flake8_linter GLOBAL_RESOURCES build/external_resources/flake8_py3 FILE_PROCESSING_TIME $FLAKE8_FILE_PROCESSING_TIME CONFIGS $PYTHON_LINTERS_DEFAULT_CONFIGS FLAKE_MIGRATIONS_CONFIG $FLAKE_MIGRATIONS_CONFIG EXTRA_PARAMS $FLAKE_EXTRA_PARAMS)
294309
}
295310

296311
# tag:python-specific tag:test
297312
### @usage: STYLE_PY2_FLAKE8()
298313
###
299314
### Check python3 sources for style issues using flake8.
300315
macro STYLE_PY2_FLAKE8() {
301-
_ADD_PY_LINTER_CHECK(NAME py2_flake8 LINTER tools/flake8_linter/flake8_linter GLOBAL_RESOURCES build/external_resources/flake8_py2 FILE_PROCESSING_TIME $FLAKE8_FILE_PROCESSING_TIME CONFIGS $FLAKE_CONFIG_FILES EXTRA_PARAMS $FLAKE_EXTRA_PARAMS)
316+
_ADD_PY_LINTER_CHECK(NAME py2_flake8 LINTER tools/flake8_linter/flake8_linter GLOBAL_RESOURCES build/external_resources/flake8_py2 FILE_PROCESSING_TIME $FLAKE8_FILE_PROCESSING_TIME CONFIGS $PYTHON_LINTERS_DEFAULT_CONFIGS FLAKE_MIGRATIONS_CONFIG $FLAKE_MIGRATIONS_CONFIG EXTRA_PARAMS $FLAKE_EXTRA_PARAMS)
302317
}
303318

304319
# tag:python-specific tag:test

build/conf/settings.conf

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,11 @@ FORCE_RESOLVE_MACRO_INCLS=yes
1414
ENABLE_RERESOLVE_FOR_GENERATED_FILES=yes
1515
REPORT_ALL_DUPSRC=yes
1616
DEPS_CACHE_CONTROL_UIDS_CACHE=yes
17-
INCLUDE_BLACKLIST_TO_CONF_HASH=no
18-
INCLUDE_ISOLATED_PROJECTS_TO_CONF_HASH=no
19-
USE_GRAND_BYPASS=no
2017
USE_GLOBAL_CMD=yes
2118
YMAKE_USE_NEW_UIDS=yes
22-
USE_GRAPH_CHANGES_PREDICTOR=yes
2319
PIC_NO_PIE=no
2420
FAIL_PY2=no
21+
MAIN_OUTPUT_AS_EXTRA=no
2522

2623
when ($YMAKE_USE_OLD_UIDS == "yes") {
2724
YMAKE_USE_NEW_UIDS=no
@@ -32,7 +29,6 @@ when ($OS_WINDOWS == "yes") {
3229
}
3330

3431
when ($AUTOCHECK == "yes") {
35-
USE_GRAPH_CHANGES_PREDICTOR=no
3632
PIC_NO_PIE=yes
3733
}
3834

build/config/tests/py_style/config_paths.json

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"flake8": "build/config/tests/flake8/flake8.conf",
3+
"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+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

0 commit comments

Comments
 (0)