Revert commit rXXXXXX, Release python3-frozen #8

commit_hash:b0fd54f791bf63cf460b769f1ce4b384bc5f793c

build/conf/python.conf

@@ -142,7 +142,7 @@ when ($BUILD_PYTHON3_BIN) {
     YMAKE_PYTHON3_PEERDIR=
 }
 otherwise {
-    YMAKE_PYTHON3=${YMAKE_PYTHON3_RESOURCE_GLOBAL}/bin/python3
+    YMAKE_PYTHON3=${YMAKE_PYTHON3_RESOURCE_GLOBAL}/python3
 }
 
 # tag:python-specific

build/mapping.conf.json

@@ -936,11 +936,6 @@
         "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"
@@ -1881,11 +1876,6 @@
         "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"

build/platform/python/ymake_python3/resources.json

@@ -1,19 +1,19 @@
 {
     "by_platform": {
-        "darwin-arm64": {
-            "uri": "sbr:7305344928"
-        },
         "darwin-x86_64": {
-            "uri": "sbr:7305350444"
+            "uri": "sbr:7203671634"
         },
-        "linux-aarch64": {
-            "uri": "sbr:7305345577"
+        "darwin-arm64": {
+            "uri": "sbr:7203671142"
         },
         "linux-x86_64": {
-            "uri": "sbr:7305300819"
+            "uri": "sbr:7203672677"
+        },
+        "linux-aarch64": {
+            "uri": "sbr:7203672172"
         },
         "win32-x86_64": {
-            "uri": "sbr:7305304147"
+            "uri": "sbr:7203670792"
         }
     }
 }

build/scripts/compile_java.py

@@ -8,9 +8,6 @@
 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
 

build/scripts/copy_clang_profile_rt.py

@@ -1,10 +1,7 @@
 import optparse
-import sys, os
+import 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

build/scripts/copy_docs_files.py

@@ -2,13 +2,9 @@
 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():

build/scripts/copy_docs_files_to_dir.py

@@ -2,13 +2,9 @@
 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():

build/scripts/copy_files_to_dir.py

@@ -1,13 +1,9 @@
 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():

build/scripts/extract_docs.py

@@ -1,13 +1,9 @@
 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()

build/scripts/fetch_from.py

@@ -22,9 +22,6 @@
     # 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
 

build/scripts/fetch_from_archive.py

@@ -4,9 +4,6 @@
 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
 
 

build/scripts/fetch_from_mds.py

@@ -1,13 +1,11 @@
 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
 
 

build/scripts/fetch_from_sandbox.py

@@ -11,10 +11,6 @@
 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
 
 

build/scripts/fix_msvc_output.py

@@ -1,9 +1,6 @@
 import subprocess
-import os, sys
+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 process_whole_archive_option as pwa
 

build/scripts/fix_py2_protobuf.py

@@ -1,9 +1,6 @@
 import subprocess
-import os, sys
+import 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
 
 

build/scripts/fs_tools.py

@@ -6,9 +6,6 @@
 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
 
 

build/scripts/gen_join_srcs.py

@@ -1,8 +1,5 @@
-import os, sys
+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
 
 

build/scripts/generate_mf.py

@@ -6,9 +6,6 @@
 
 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
 
 

build/scripts/go_tool.py

@@ -13,9 +13,6 @@
 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
 

build/scripts/link_dyn_lib.py

@@ -7,9 +7,6 @@
 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
 

build/scripts/link_exe.py

@@ -6,9 +6,6 @@
 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
 

build/scripts/link_fat_obj.py

@@ -1,10 +1,7 @@
 import argparse
 import subprocess
-import sys, 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
 
 from process_whole_archive_option import ProcessWholeArchiveOption

build/scripts/make_container.py

@@ -5,9 +5,6 @@
 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
 
 

build/scripts/make_java_classpath_file.py

@@ -1,9 +1,6 @@
 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
 
 

build/scripts/make_java_srclists.py

@@ -2,9 +2,6 @@
 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
 

build/scripts/move.py

@@ -1,9 +1,6 @@
 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>

build/scripts/process_whole_archive_option.py

@@ -1,8 +1,5 @@
-import os, sys
+import 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
 
 

build/scripts/run_javac.py

@@ -4,9 +4,6 @@
 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
 

build/scripts/run_msvc_wine.py

@@ -9,9 +9,6 @@
 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
 

build/scripts/sky.py

@@ -1,10 +1,7 @@
 import logging
-import os, sys
+import os
 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
 
 

build/scripts/writer.py

@@ -1,9 +1,6 @@
-import sys, 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