diff options
| author | snermolaev <snermolaev@yandex-team.com> | 2025-06-06 06:24:40 +0300 |
|---|---|---|
| committer | snermolaev <snermolaev@yandex-team.com> | 2025-06-06 06:44:35 +0300 |
| commit | d6dd63d63a91bd76b9e81d0758a2f045547aeb14 (patch) | |
| tree | 94ece4d19bb24135572c80d751232fc97746eb70 | |
| parent | f27c79a69f6c2be73b36d87010e160d72f297f61 (diff) | |
| download | ydb-d6dd63d63a91bd76b9e81d0758a2f045547aeb14.tar.gz | |
switch ymake nots plugins to ymakeyaml
commit_hash:7efc8ab40184186a1c5d597aa5ea2c0dc1fbe85a
| -rw-r--r-- | build/conf/ts/ts.conf | 2 | ||||
| -rw-r--r-- | build/plugins/lib/nots/package_manager/pnpm/lockfile.py | 6 | ||||
| -rw-r--r-- | build/plugins/lib/nots/package_manager/pnpm/workspace.py | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/build/conf/ts/ts.conf b/build/conf/ts/ts.conf index 3aff7bf80a2..650d6ef5fee 100644 --- a/build/conf/ts/ts.conf +++ b/build/conf/ts/ts.conf @@ -10,7 +10,7 @@ TS_YNDEXING=no # Use outdir defined in tsconfig (actual not for bundlers, they use own way to define output directory) TS_CONFIG_USE_OUTDIR= TS_USE_PREBUILT_NOTS_TOOL=yes -TS_FAKEID=${FAKEID}.2025-06-04 +TS_FAKEID=${FAKEID}.2025-06-05 NOTS_TOOL=${tool:"devtools/frontend_build_platform/nots/builder"} ${hide:TS_FAKEID} # Additional commands that module can add (with `&&` as delimiter), if set those will be executed diff --git a/build/plugins/lib/nots/package_manager/pnpm/lockfile.py b/build/plugins/lib/nots/package_manager/pnpm/lockfile.py index d092152840a..10fc529c717 100644 --- a/build/plugins/lib/nots/package_manager/pnpm/lockfile.py +++ b/build/plugins/lib/nots/package_manager/pnpm/lockfile.py @@ -1,5 +1,4 @@ import base64 -import yaml import os import io import re @@ -8,6 +7,11 @@ from urllib import parse as urlparse from ..base import PackageJson, BaseLockfile, LockfilePackageMeta, LockfilePackageMetaInvalidError +try: + import ymakeyaml as yaml +except Exception: + import yaml + LOCKFILE_VERSION = "lockfileVersion" IMPORTER_KEYS = PackageJson.DEP_KEYS + ("specifiers",) WS_PREFIX = "workspace:" diff --git a/build/plugins/lib/nots/package_manager/pnpm/workspace.py b/build/plugins/lib/nots/package_manager/pnpm/workspace.py index 5639ae1c205..4e85a023b84 100644 --- a/build/plugins/lib/nots/package_manager/pnpm/workspace.py +++ b/build/plugins/lib/nots/package_manager/pnpm/workspace.py @@ -1,5 +1,9 @@ import os -import yaml + +try: + import ymakeyaml as yaml +except Exception: + import yaml class PnpmWorkspace(object): |