aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-02-07 23:28:05 +0300
committerarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-02-07 23:28:05 +0300
commitd73ce838d4e61c3380c3fc74a00d5f4fbc02ed8a (patch)
tree994aea8a8b556d2d0a927a69c59a06e6779a9f9c
parentafc81da8077f65e7552c18c45b7f3ee5a9fe6396 (diff)
downloadydb-d73ce838d4e61c3380c3fc74a00d5f4fbc02ed8a.tar.gz
intermediate changes
ref:88f4332eb6eb0e33f19fefe8117e67f8dde5014e
-rw-r--r--build/conf/license.conf9
-rw-r--r--build/rules/flake8/migrations.yaml5
-rw-r--r--build/ya.conf.json4
-rw-r--r--library/cpp/codecs/codecs_registry.cpp4
4 files changed, 10 insertions, 12 deletions
diff --git a/build/conf/license.conf b/build/conf/license.conf
index 0c43ed4c1d..f2fb576b0d 100644
--- a/build/conf/license.conf
+++ b/build/conf/license.conf
@@ -121,7 +121,6 @@ LICENSES_UNATTRIBUTED= \
MirOS \
Mit-Xfig \
Mozilla-GC \
- Musl-Exception \
NAIST-2003 \
Nvidia-Gov \
Oracle \
@@ -129,14 +128,12 @@ LICENSES_UNATTRIBUTED= \
PSF-3.7.2 \
Qhull \
Quicklz \
- Red-Hat-Attribution \
Ruby \
SSPL-1.0 \
SZIP \
Sendmail \
Softsurfer \
Stlport-4.5 \
- Sunpro \
TCL \
TU-Berlin-1.0 \
Unicode-TOU \
@@ -159,6 +156,7 @@ LICENSES_FORBIDDEN= \
AGPL-3.0-only \
AGPL-3.0-or-later \
Artistic-1.0 \
+ Musl-Exception \
${LICENSES_UNATTRIBUTED}
# Group for proprietary code licenses
@@ -295,6 +293,7 @@ LICENSES_PERMISSIVE= \
PSF-2.0 \
Python-2.0 \
Qhull \
+ Red-Hat-Attribution \
Repoze-public \
RSA-MD \
RSA-MD4 \
@@ -305,6 +304,7 @@ LICENSES_PERMISSIVE= \
SMLNJ \
SSH-short \
SSLeay \
+ Sunpro \
Unicode-DFS-2016 \
Unicode-Icu-58 \
Unicode-Mappings \
@@ -320,6 +320,7 @@ LICENSES_PERMISSIVE= \
Zlib \
zlib-acknowledgement \
ZPL-2.1 \
+ ${CUSTOM_LICENSE_MUSL_EXCEPTION} \
${LICENSES_PATCHES_FORBIDDEN}
LICENSES_PERMISSIVE_DYNAMIC= \
@@ -333,6 +334,8 @@ LICENSES_PERMISSIVE_DYNAMIC= \
# https://st.yandex-team.ru/ARCADIAWGSUP-34
CUSTOM_LICENSE_LIBSSH2_AGENT_WIN=Libssh2-Agent-Win
+# Permissive only in musllib
+CUSTOM_LICENSE_MUSL_EXCEPTION=Musl-Exception-in-Musllib
# TODO: this list is almost empty. needed for DEVRULES-151
LICENSES_REQUIRE_CITATION= \
diff --git a/build/rules/flake8/migrations.yaml b/build/rules/flake8/migrations.yaml
index 8fefe17e2f..eac9bbcf7a 100644
--- a/build/rules/flake8/migrations.yaml
+++ b/build/rules/flake8/migrations.yaml
@@ -890,7 +890,6 @@ migrations:
- ads/libs/py_mapreduce/yabs-mapreduce-modules/py-modules/yabs/tabtools
- ads/ml_engine/learn/result/local_extended_fstr/lib
- ads/pytorch/lib/online_learning/production/processors/tsar_processor/lib
- - ads/quality/adv_machine/tsar/cm_robot/cmpy/page
- ads/quality/apc_check_py
- ads/quality/embedding/tsar_tensor/ft_pool/lib
- ads/quality/ltp/libs/build_pool
@@ -1335,7 +1334,6 @@ migrations:
- market/dynamic_pricing/tools/offline_modeling
- market/mobile_validator/mt
- market/seo/tools/postgres_local/recipe
- - market/sre/tools/kraken/src/kraken_monrun
- market/yamarec/yamarec/yamarec1
- mds/nscfg/server
- metrika/admin/python/cms/agent/lib
@@ -2148,7 +2146,6 @@ migrations:
- modadvert/oneshot/MODDEV-2565
- modadvert/oneshot/SUPERMODRELEASE-57/migration
- mssngr/botplatform/src/bots/core/migrations
- - mssngr/botplatform/src/vins_core
- mssngr/geobot/clients
- mssngr/geobot/postgresql
- mssngr/geobot/server
@@ -3044,7 +3041,6 @@ migrations:
- ads/nirvana/online_learning/run_flowkeeper/workflow_tests
- ads/pytorch/deploy/bindings/ut
- ads/quality/adv_machine/tsar/cm_robot/cmpy/adv_machine_models
- - ads/quality/adv_machine/tsar/cm_robot/cmpy/transfer_manager
- ads/quality/adv_machine/tsar/cm_robot/cmpy/turbo
- ads/quality/bid_correction/lib/ut
- ads/quality/metric_eval/tests/ut
@@ -3673,5 +3669,4 @@ migrations:
- ads/libs/py_autobudget/mt/test_attribution_preprocessor
- ads/bigkv/tensor_transport/tests
- scarab/api/python3
- - mssngr/botplatform/src/vins_core
- mssngr/botplatform/src/bots/core/migrations
diff --git a/build/ya.conf.json b/build/ya.conf.json
index 6d49413094..334ff2ac9c 100644
--- a/build/ya.conf.json
+++ b/build/ya.conf.json
@@ -7741,8 +7741,8 @@
"devtools_license_analyzer_bundle": {
"formula": {
"sandbox_id": [
- 1188584819,
- 1188585190
+ 1207941042,
+ 1207941794
],
"match": "license_analyzer"
},
diff --git a/library/cpp/codecs/codecs_registry.cpp b/library/cpp/codecs/codecs_registry.cpp
index 6fd7ff67b0..17d07062ab 100644
--- a/library/cpp/codecs/codecs_registry.cpp
+++ b/library/cpp/codecs/codecs_registry.cpp
@@ -13,11 +13,11 @@
namespace NCodecs {
TCodecPtr ICodec::GetInstance(TStringBuf name) {
- return Default<NPrivate::TCodecRegistry>().GetCodec(name);
+ return Singleton<NPrivate::TCodecRegistry>()->GetCodec(name);
}
TVector<TString> ICodec::GetCodecsList() {
- return Default<NPrivate::TCodecRegistry>().GetCodecsList();
+ return Singleton<NPrivate::TCodecRegistry>()->GetCodecsList();
}
namespace NPrivate {