aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobot-brewer <robot-brewer@yandex-team.com>2024-10-22 08:39:26 +0300
committerrobot-brewer <robot-brewer@yandex-team.com>2024-10-22 08:51:14 +0300
commit54a66b6ba4d7d5b11ad688e8072df4c2f107b3c9 (patch)
treee89b524f85c2b0a501fbfd5809aa52d322c0f110
parentab5c8d6f28e47c9330ecc18cd748cf513fd243af (diff)
downloadydb-54a66b6ba4d7d5b11ad688e8072df4c2f107b3c9.tar.gz
Release python3-frozen #8
https://github.com/yandex/toolchain-registry/releases/tag/python3-frozen-v8 commit_hash:db14a768da738da2ea13bd7cb7af738d83793500
-rw-r--r--build/conf/python.conf2
-rw-r--r--build/mapping.conf.json10
-rw-r--r--build/platform/python/ymake_python3/resources.json16
-rw-r--r--build/scripts/Readme.md9
-rw-r--r--build/scripts/compile_java.py3
-rw-r--r--build/scripts/copy_clang_profile_rt.py5
-rw-r--r--build/scripts/copy_docs_files.py6
-rw-r--r--build/scripts/copy_docs_files_to_dir.py6
-rw-r--r--build/scripts/copy_files_to_dir.py6
-rw-r--r--build/scripts/extract_docs.py6
-rwxr-xr-xbuild/scripts/fetch_from.py3
-rw-r--r--build/scripts/fetch_from_archive.py3
-rw-r--r--build/scripts/fetch_from_mds.py4
-rwxr-xr-xbuild/scripts/fetch_from_sandbox.py4
-rw-r--r--build/scripts/fix_msvc_output.py5
-rw-r--r--build/scripts/fix_py2_protobuf.py5
-rw-r--r--build/scripts/fs_tools.py3
-rw-r--r--build/scripts/gen_join_srcs.py5
-rw-r--r--build/scripts/generate_mf.py3
-rw-r--r--build/scripts/go_tool.py3
-rw-r--r--build/scripts/link_dyn_lib.py3
-rw-r--r--build/scripts/link_exe.py3
-rw-r--r--build/scripts/link_fat_obj.py5
-rw-r--r--build/scripts/make_container.py3
-rw-r--r--build/scripts/make_java_classpath_file.py3
-rw-r--r--build/scripts/make_java_srclists.py3
-rw-r--r--build/scripts/move.py3
-rw-r--r--build/scripts/process_whole_archive_option.py5
-rw-r--r--build/scripts/run_javac.py3
-rw-r--r--build/scripts/run_msvc_wine.py3
-rw-r--r--build/scripts/sky.py5
-rw-r--r--build/scripts/writer.py5
32 files changed, 129 insertions, 22 deletions
diff --git a/build/conf/python.conf b/build/conf/python.conf
index 756d986315..5f043ccc59 100644
--- a/build/conf/python.conf
+++ b/build/conf/python.conf
@@ -142,7 +142,7 @@ when ($BUILD_PYTHON3_BIN) {
YMAKE_PYTHON3_PEERDIR=
}
otherwise {
- YMAKE_PYTHON3=${YMAKE_PYTHON3_RESOURCE_GLOBAL}/python3
+ YMAKE_PYTHON3=${YMAKE_PYTHON3_RESOURCE_GLOBAL}/bin/python3
}
# tag:python-specific
diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index 8e5c674506..886e0e147b 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -936,6 +936,11 @@
"5647712429": "https://devtools-registry.s3.yandex.net/5647712429",
"5690801745": "https://devtools-registry.s3.yandex.net/5690801745",
"5731299437": "https://devtools-registry.s3.yandex.net/5731299437",
+ "7305344928": "https://devtools-registry.s3.yandex.net/7305344928",
+ "7305350444": "https://devtools-registry.s3.yandex.net/7305350444",
+ "7305345577": "https://devtools-registry.s3.yandex.net/7305345577",
+ "7305300819": "https://devtools-registry.s3.yandex.net/7305300819",
+ "7305304147": "https://devtools-registry.s3.yandex.net/7305304147",
"6048579718": "https://devtools-registry.s3.yandex.net/6048579718",
"2980468199": "https://devtools-registry.s3.yandex.net/2980468199",
"5562224408": "https://devtools-registry.s3.yandex.net/5562224408"
@@ -1876,6 +1881,11 @@
"5647712429": "ymake.exe for win32-clang-cl",
"5690801745": "ymake.exe for win32-clang-cl",
"5731299437": "ymake.exe for win32-clang-cl",
+ "7305344928": "ynd-bin-frozen-python3-darwin-arm64-ab0a502817597e3d47908a57acddc152998e979e",
+ "7305350444": "ynd-bin-frozen-python3-darwin-x86_64-ab0a502817597e3d47908a57acddc152998e979e",
+ "7305345577": "ynd-bin-frozen-python3-linux-aarch64-ab0a502817597e3d47908a57acddc152998e979e",
+ "7305300819": "ynd-bin-frozen-python3-linux-x86_64-ab0a502817597e3d47908a57acddc152998e979e",
+ "7305304147": "ynd-bin-frozen-python3-mingw-w64-x86_64-ab0a502817597e3d47908a57acddc152998e979e",
"6048579718": "yt/go/ytrecipe/cmd/ytexec for linux",
"2980468199": "ytexec for linux",
"5562224408": "ytexec for linux"
diff --git a/build/platform/python/ymake_python3/resources.json b/build/platform/python/ymake_python3/resources.json
index 53c4a82d5b..b73192b5c6 100644
--- a/build/platform/python/ymake_python3/resources.json
+++ b/build/platform/python/ymake_python3/resources.json
@@ -1,19 +1,19 @@
{
"by_platform": {
- "darwin-x86_64": {
- "uri": "sbr:7203671634"
- },
"darwin-arm64": {
- "uri": "sbr:7203671142"
+ "uri": "sbr:7305344928"
},
- "linux-x86_64": {
- "uri": "sbr:7203672677"
+ "darwin-x86_64": {
+ "uri": "sbr:7305350444"
},
"linux-aarch64": {
- "uri": "sbr:7203672172"
+ "uri": "sbr:7305345577"
+ },
+ "linux-x86_64": {
+ "uri": "sbr:7305300819"
},
"win32-x86_64": {
- "uri": "sbr:7203670792"
+ "uri": "sbr:7305304147"
}
}
}
diff --git a/build/scripts/Readme.md b/build/scripts/Readme.md
new file mode 100644
index 0000000000..bed6615ba0
--- /dev/null
+++ b/build/scripts/Readme.md
@@ -0,0 +1,9 @@
+# Note
+При добавлении новых скриптов в данную директорию не забывайте указывать две вещи:
+
+1. Явное разрешать импорт модулей из текущей директории, если это вам необходимо, с помощью строк:
+```python3
+import os.path, sys
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+```
+2. В командах вызова скриптов прописывать все их зависимые модули через `${input:"build/scripts/module_1.py"}`, `${input:"build/scripts/module_2.py"}` ...
diff --git a/build/scripts/compile_java.py b/build/scripts/compile_java.py
index 654543f976..a28d737195 100644
--- a/build/scripts/compile_java.py
+++ b/build/scripts/compile_java.py
@@ -8,6 +8,9 @@ import tarfile
import zipfile
import sys
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import process_command_files as pcf
import java_command_file as jcf
diff --git a/build/scripts/copy_clang_profile_rt.py b/build/scripts/copy_clang_profile_rt.py
index f8058e9e64..84444b9dbf 100644
--- a/build/scripts/copy_clang_profile_rt.py
+++ b/build/scripts/copy_clang_profile_rt.py
@@ -1,7 +1,10 @@
import optparse
-import os
+import sys, os
import shutil
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import process_command_files as pcf
# List is a temporary thing to ensure that nothing breaks before and after switching to newer clang
diff --git a/build/scripts/copy_docs_files.py b/build/scripts/copy_docs_files.py
index 4ad70997c1..2428b5fddf 100644
--- a/build/scripts/copy_docs_files.py
+++ b/build/scripts/copy_docs_files.py
@@ -2,9 +2,13 @@ import argparse
import codecs
import errno
import os
+import sys
+
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import process_command_files as pcf
import shutil
-import sys
def parse_args():
diff --git a/build/scripts/copy_docs_files_to_dir.py b/build/scripts/copy_docs_files_to_dir.py
index 8ac23b0700..ea9fd7fccb 100644
--- a/build/scripts/copy_docs_files_to_dir.py
+++ b/build/scripts/copy_docs_files_to_dir.py
@@ -2,9 +2,13 @@ import argparse
import codecs
import errno
import os
+import sys
+
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import process_command_files as pcf
import shutil
-import sys
def parse_args():
diff --git a/build/scripts/copy_files_to_dir.py b/build/scripts/copy_files_to_dir.py
index 2403f0a683..a597eb987d 100644
--- a/build/scripts/copy_files_to_dir.py
+++ b/build/scripts/copy_files_to_dir.py
@@ -1,9 +1,13 @@
import argparse
import errno
import os
+import sys
+
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import process_command_files as pcf
import shutil
-import sys
def parse_args():
diff --git a/build/scripts/extract_docs.py b/build/scripts/extract_docs.py
index 5bf19f8866..8ab835b720 100644
--- a/build/scripts/extract_docs.py
+++ b/build/scripts/extract_docs.py
@@ -1,9 +1,13 @@
import argparse
import os
-import process_command_files as pcf
import tarfile
import sys
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+import process_command_files as pcf
+
def parse_args():
parser = argparse.ArgumentParser()
diff --git a/build/scripts/fetch_from.py b/build/scripts/fetch_from.py
index bd27d75d8e..0e543c810a 100755
--- a/build/scripts/fetch_from.py
+++ b/build/scripts/fetch_from.py
@@ -22,6 +22,9 @@ except (ImportError, ModuleNotFoundError):
# Python 3
import urllib.request as urllib_request
from urllib.error import HTTPError, URLError
+ # Explicitly enable local imports
+ # Don't forget to add imported scripts to inputs of the calling command!
+ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import retry
diff --git a/build/scripts/fetch_from_archive.py b/build/scripts/fetch_from_archive.py
index 3214b78dc8..c5513c48d1 100644
--- a/build/scripts/fetch_from_archive.py
+++ b/build/scripts/fetch_from_archive.py
@@ -4,6 +4,9 @@ import sys
import logging
import argparse
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import fetch_from
diff --git a/build/scripts/fetch_from_mds.py b/build/scripts/fetch_from_mds.py
index 559cf8350d..b7126d0b4b 100644
--- a/build/scripts/fetch_from_mds.py
+++ b/build/scripts/fetch_from_mds.py
@@ -1,11 +1,13 @@
from __future__ import print_function
-from __future__ import print_function
import os
import sys
import logging
import argparse
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import fetch_from
diff --git a/build/scripts/fetch_from_sandbox.py b/build/scripts/fetch_from_sandbox.py
index a8f0fc5997..2995d4df71 100755
--- a/build/scripts/fetch_from_sandbox.py
+++ b/build/scripts/fetch_from_sandbox.py
@@ -11,6 +11,10 @@ import time
import urllib2
import uuid
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+
import fetch_from
diff --git a/build/scripts/fix_msvc_output.py b/build/scripts/fix_msvc_output.py
index c9694afbc8..49df9aee3b 100644
--- a/build/scripts/fix_msvc_output.py
+++ b/build/scripts/fix_msvc_output.py
@@ -1,6 +1,9 @@
import subprocess
-import sys
+import os, sys
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import process_command_files as pcf
import process_whole_archive_option as pwa
diff --git a/build/scripts/fix_py2_protobuf.py b/build/scripts/fix_py2_protobuf.py
index 06e81ed648..b2e9ed028b 100644
--- a/build/scripts/fix_py2_protobuf.py
+++ b/build/scripts/fix_py2_protobuf.py
@@ -1,6 +1,9 @@
import subprocess
-import os
+import os, sys
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import process_command_files as pcf
diff --git a/build/scripts/fs_tools.py b/build/scripts/fs_tools.py
index 63ca00932e..74ca8fef29 100644
--- a/build/scripts/fs_tools.py
+++ b/build/scripts/fs_tools.py
@@ -6,6 +6,9 @@ import sys
import shutil
import errno
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import process_command_files as pcf
diff --git a/build/scripts/gen_join_srcs.py b/build/scripts/gen_join_srcs.py
index e0c2df161a..dfb12e7733 100644
--- a/build/scripts/gen_join_srcs.py
+++ b/build/scripts/gen_join_srcs.py
@@ -1,5 +1,8 @@
-import sys
+import os, sys
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import process_command_files as pcf
diff --git a/build/scripts/generate_mf.py b/build/scripts/generate_mf.py
index 447215c723..14db77c7b6 100644
--- a/build/scripts/generate_mf.py
+++ b/build/scripts/generate_mf.py
@@ -6,6 +6,9 @@ import io
import six
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import process_command_files as pcf
diff --git a/build/scripts/go_tool.py b/build/scripts/go_tool.py
index f1dbc9731e..e73fa7e7f9 100644
--- a/build/scripts/go_tool.py
+++ b/build/scripts/go_tool.py
@@ -13,6 +13,9 @@ import traceback
from contextlib import contextmanager
from functools import reduce
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import process_command_files as pcf
import process_whole_archive_option as pwa
diff --git a/build/scripts/link_dyn_lib.py b/build/scripts/link_dyn_lib.py
index 3e62f4c407..53757a7c75 100644
--- a/build/scripts/link_dyn_lib.py
+++ b/build/scripts/link_dyn_lib.py
@@ -7,6 +7,9 @@ import collections
import optparse
import pipes
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import thinlto_cache
import link_exe
diff --git a/build/scripts/link_exe.py b/build/scripts/link_exe.py
index 6ea2f91c3d..634840cf90 100644
--- a/build/scripts/link_exe.py
+++ b/build/scripts/link_exe.py
@@ -6,6 +6,9 @@ import subprocess
import optparse
import textwrap
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import process_command_files as pcf
import thinlto_cache
diff --git a/build/scripts/link_fat_obj.py b/build/scripts/link_fat_obj.py
index aeafea58c4..1b6f59777d 100644
--- a/build/scripts/link_fat_obj.py
+++ b/build/scripts/link_fat_obj.py
@@ -1,7 +1,10 @@
import argparse
import subprocess
-import sys
+import sys, os
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import process_command_files as pcf
from process_whole_archive_option import ProcessWholeArchiveOption
diff --git a/build/scripts/make_container.py b/build/scripts/make_container.py
index 2c07177fdb..05a310a5fc 100644
--- a/build/scripts/make_container.py
+++ b/build/scripts/make_container.py
@@ -5,6 +5,9 @@ import struct
import subprocess
import sys
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import container # 1
diff --git a/build/scripts/make_java_classpath_file.py b/build/scripts/make_java_classpath_file.py
index fbd9eb1358..0219a386f1 100644
--- a/build/scripts/make_java_classpath_file.py
+++ b/build/scripts/make_java_classpath_file.py
@@ -1,6 +1,9 @@
import os
import sys
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import process_command_files as pcf
diff --git a/build/scripts/make_java_srclists.py b/build/scripts/make_java_srclists.py
index ccf4027b0d..02a9da78e0 100644
--- a/build/scripts/make_java_srclists.py
+++ b/build/scripts/make_java_srclists.py
@@ -2,6 +2,9 @@ import os
import sys
import argparse
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import process_command_files as pcf
import java_pack_to_file as jcov
diff --git a/build/scripts/move.py b/build/scripts/move.py
index f38e88a406..0154294505 100644
--- a/build/scripts/move.py
+++ b/build/scripts/move.py
@@ -1,6 +1,9 @@
import os
import sys
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import process_command_files as pcf
# /script/move.py <src-1> <tgt-1> <src-2> <tgt-2> ... <src-n> <tgt-n>
diff --git a/build/scripts/process_whole_archive_option.py b/build/scripts/process_whole_archive_option.py
index 3e4458a8c7..0f5c3bf4c4 100644
--- a/build/scripts/process_whole_archive_option.py
+++ b/build/scripts/process_whole_archive_option.py
@@ -1,5 +1,8 @@
-import os
+import os, sys
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import process_command_files as pcf
diff --git a/build/scripts/run_javac.py b/build/scripts/run_javac.py
index a7c2296197..a3c91da13c 100644
--- a/build/scripts/run_javac.py
+++ b/build/scripts/run_javac.py
@@ -4,6 +4,9 @@ import optparse
import os
import re
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import build_java_with_error_prone2 as java_error_prone
import setup_java_tmpdir as java_tmpdir
diff --git a/build/scripts/run_msvc_wine.py b/build/scripts/run_msvc_wine.py
index 3a498d7388..d7ede556d2 100644
--- a/build/scripts/run_msvc_wine.py
+++ b/build/scripts/run_msvc_wine.py
@@ -9,6 +9,9 @@ import json
import argparse
import errno
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import process_command_files as pcf
import process_whole_archive_option as pwa
diff --git a/build/scripts/sky.py b/build/scripts/sky.py
index b703af7ed1..89ee2e8d36 100644
--- a/build/scripts/sky.py
+++ b/build/scripts/sky.py
@@ -1,7 +1,10 @@
import logging
-import os
+import os, sys
import subprocess
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import fetch_from
diff --git a/build/scripts/writer.py b/build/scripts/writer.py
index ce88e35693..08c47c9f5c 100644
--- a/build/scripts/writer.py
+++ b/build/scripts/writer.py
@@ -1,6 +1,9 @@
-import sys
+import sys, os
import argparse
+# Explicitly enable local imports
+# Don't forget to add imported scripts to inputs of the calling command!
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
import process_command_files as pcf