From c0d442364aaaf3e6ad4d1b93a9fce32f23675f43 Mon Sep 17 00:00:00 2001 From: Jeremy Rose Date: Tue, 12 Apr 2022 04:21:55 -0700 Subject: [PATCH] build: explicitly run scripts with python3 (#33720) * build: explicitly run scripts with python3 * chore: update patches Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> --- build/js2c.py | 2 +- build/npm-run.py | 2 +- build/strip_framework.py | 2 +- build/zip.py | 2 +- build/zip_libcxx.py | 2 +- patches/node/build_add_gn_build_files.patch | 8 ++++---- patches/squirrel.mac/build_add_gn_config.patch | 4 ++-- script/add-debug-link.py | 2 +- script/apply_all_patches.py | 2 +- script/check-relative-doc-links.py | 2 +- script/copy-debug-symbols.py | 2 +- script/dbus_mock.py | 2 +- script/export_all_patches.py | 2 +- script/generate-config-gypi.py | 2 +- script/generate-zip-manifest.py | 2 +- script/git-export-patches | 2 +- script/git-import-patches | 2 +- script/lib/config.py | 2 +- script/lib/git.py | 2 +- script/lib/patches.py | 2 +- script/lib/util.py | 2 +- script/native-tests.py | 2 +- script/patches-mtime-cache.py | 2 +- script/release/uploaders/upload-index-json.py | 2 +- script/release/uploaders/upload-node-checksums.py | 2 +- script/release/uploaders/upload-node-headers.py | 2 +- script/release/uploaders/upload-symbols.py | 2 +- script/release/uploaders/upload.py | 2 +- script/run-clang-format.py | 2 +- script/strip-binaries.py | 2 +- script/verify-chromedriver.py | 2 +- script/verify-ffmpeg.py | 2 +- script/verify-mksnapshot.py | 2 +- script/zip-symbols.py | 2 +- script/zip_manifests/check-zip-manifest.py | 2 +- 35 files changed, 39 insertions(+), 39 deletions(-) diff --git a/build/js2c.py b/build/js2c.py index 0f7178baf0..7024e7391d 100755 --- a/build/js2c.py +++ b/build/js2c.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import subprocess diff --git a/build/npm-run.py b/build/npm-run.py index bd0c9097bf..49a6abac65 100644 --- a/build/npm-run.py +++ b/build/npm-run.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import os import subprocess diff --git a/build/strip_framework.py b/build/strip_framework.py index 1ba173dfc1..73cf424dde 100755 --- a/build/strip_framework.py +++ b/build/strip_framework.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import subprocess import sys diff --git a/build/zip.py b/build/zip.py index 19fe514cd9..bfaf27c08b 100644 --- a/build/zip.py +++ b/build/zip.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import os import subprocess diff --git a/build/zip_libcxx.py b/build/zip_libcxx.py index 5eec83d226..daa94fc8fb 100644 --- a/build/zip_libcxx.py +++ b/build/zip_libcxx.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import os import subprocess diff --git a/patches/node/build_add_gn_build_files.patch b/patches/node/build_add_gn_build_files.patch index fbf050490c..de7fc0acfc 100644 --- a/patches/node/build_add_gn_build_files.patch +++ b/patches/node/build_add_gn_build_files.patch @@ -1811,11 +1811,11 @@ index 41081f82714169f3bf388c3a8c2d9aa78e21a3f4..48c0d2655789a0528dfea0a60f756aac // which the Node binary being built supports. diff --git a/tools/generate_gn_filenames_json.py b/tools/generate_gn_filenames_json.py new file mode 100755 -index 0000000000000000000000000000000000000000..8f884a41f57630ac432eb85ebfc9b8bc82cddaca +index 0000000000000000000000000000000000000000..87621ba1d7f1c80aadb81461824b0c2edab1de22 --- /dev/null +++ b/tools/generate_gn_filenames_json.py @@ -0,0 +1,75 @@ -+#!/usr/bin/env python ++#!/usr/bin/env python3 +import json +import os +import sys @@ -1892,11 +1892,11 @@ index 0000000000000000000000000000000000000000..8f884a41f57630ac432eb85ebfc9b8bc + f.write('\n') diff --git a/tools/generate_node_version_header.py b/tools/generate_node_version_header.py new file mode 100755 -index 0000000000000000000000000000000000000000..3088ae4bdf814ae255c9805ebd393b2eee17e941 +index 0000000000000000000000000000000000000000..2a92eccfa582df361f2a889c0d9b32c1059baa7d --- /dev/null +++ b/tools/generate_node_version_header.py @@ -0,0 +1,25 @@ -+#!/usr/bin/env python ++#!/usr/bin/env python3 +import re +import sys + diff --git a/patches/squirrel.mac/build_add_gn_config.patch b/patches/squirrel.mac/build_add_gn_config.patch index 1df38e3aaa..4f6e3a0db3 100644 --- a/patches/squirrel.mac/build_add_gn_config.patch +++ b/patches/squirrel.mac/build_add_gn_config.patch @@ -511,11 +511,11 @@ index 0000000000000000000000000000000000000000..bdfaf95f3eca65b3e0831db1b66f651d +} diff --git a/build/xcrun.py b/build/xcrun.py new file mode 100644 -index 0000000000000000000000000000000000000000..18ac587f80441106405d00fafd9ee1f25b147772 +index 0000000000000000000000000000000000000000..a7aeeb7d3e187bd91ef12ed860d1e37eaea31fc1 --- /dev/null +++ b/build/xcrun.py @@ -0,0 +1,14 @@ -+#!/usr/bin/env python ++#!/usr/bin/env python3 +from __future__ import print_function +import os +import subprocess diff --git a/script/add-debug-link.py b/script/add-debug-link.py index 201d726d82..167c9e2d93 100755 --- a/script/add-debug-link.py +++ b/script/add-debug-link.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import argparse import os diff --git a/script/apply_all_patches.py b/script/apply_all_patches.py index d3e21bd2e8..c2e83bea77 100755 --- a/script/apply_all_patches.py +++ b/script/apply_all_patches.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import argparse import json diff --git a/script/check-relative-doc-links.py b/script/check-relative-doc-links.py index 7779a1c24e..f297253b6d 100755 --- a/script/check-relative-doc-links.py +++ b/script/check-relative-doc-links.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import os diff --git a/script/copy-debug-symbols.py b/script/copy-debug-symbols.py index 159387fadb..0ceff1a0e2 100755 --- a/script/copy-debug-symbols.py +++ b/script/copy-debug-symbols.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import argparse import os diff --git a/script/dbus_mock.py b/script/dbus_mock.py index f7246452a8..c3b4932a74 100644 --- a/script/dbus_mock.py +++ b/script/dbus_mock.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import subprocess diff --git a/script/export_all_patches.py b/script/export_all_patches.py index f62c3b1028..49d56d856b 100644 --- a/script/export_all_patches.py +++ b/script/export_all_patches.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import argparse import json diff --git a/script/generate-config-gypi.py b/script/generate-config-gypi.py index fee183951d..b7885da41c 100755 --- a/script/generate-config-gypi.py +++ b/script/generate-config-gypi.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import ast diff --git a/script/generate-zip-manifest.py b/script/generate-zip-manifest.py index c82e239d3d..c7b6558f01 100755 --- a/script/generate-zip-manifest.py +++ b/script/generate-zip-manifest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import zipfile import sys diff --git a/script/git-export-patches b/script/git-export-patches index bb76b29513..b8d9943be4 100755 --- a/script/git-export-patches +++ b/script/git-export-patches @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import argparse import sys diff --git a/script/git-import-patches b/script/git-import-patches index 053682f982..d1bdb4ef1b 100755 --- a/script/git-import-patches +++ b/script/git-import-patches @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import argparse import sys diff --git a/script/lib/config.py b/script/lib/config.py index 43f076f735..b523475cf8 100644 --- a/script/lib/config.py +++ b/script/lib/config.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import os diff --git a/script/lib/git.py b/script/lib/git.py index 3ea4808f8a..aa3adb1615 100644 --- a/script/lib/git.py +++ b/script/lib/git.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Git helper functions. diff --git a/script/lib/patches.py b/script/lib/patches.py index 8910dd4126..99fd12df5e 100644 --- a/script/lib/patches.py +++ b/script/lib/patches.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import codecs import os diff --git a/script/lib/util.py b/script/lib/util.py index c7f448331a..2dc6c45777 100644 --- a/script/lib/util.py +++ b/script/lib/util.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import contextlib diff --git a/script/native-tests.py b/script/native-tests.py index f6dea2a8d2..7a577bc75f 100755 --- a/script/native-tests.py +++ b/script/native-tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function diff --git a/script/patches-mtime-cache.py b/script/patches-mtime-cache.py index 800d3b03cb..b173b0bc7f 100644 --- a/script/patches-mtime-cache.py +++ b/script/patches-mtime-cache.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function diff --git a/script/release/uploaders/upload-index-json.py b/script/release/uploaders/upload-index-json.py index 41880d5667..2b09e55b88 100755 --- a/script/release/uploaders/upload-index-json.py +++ b/script/release/uploaders/upload-index-json.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import json diff --git a/script/release/uploaders/upload-node-checksums.py b/script/release/uploaders/upload-node-checksums.py index dfa8ef3595..7df8bc1468 100755 --- a/script/release/uploaders/upload-node-checksums.py +++ b/script/release/uploaders/upload-node-checksums.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import argparse import hashlib diff --git a/script/release/uploaders/upload-node-headers.py b/script/release/uploaders/upload-node-headers.py index 862eea96e8..77b72ae1d6 100755 --- a/script/release/uploaders/upload-node-headers.py +++ b/script/release/uploaders/upload-node-headers.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import argparse import glob diff --git a/script/release/uploaders/upload-symbols.py b/script/release/uploaders/upload-symbols.py index 3e877e6477..402cb4b2d3 100755 --- a/script/release/uploaders/upload-symbols.py +++ b/script/release/uploaders/upload-symbols.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import glob import os diff --git a/script/release/uploaders/upload.py b/script/release/uploaders/upload.py index f255ad50ac..25078bbcc6 100755 --- a/script/release/uploaders/upload.py +++ b/script/release/uploaders/upload.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import argparse diff --git a/script/run-clang-format.py b/script/run-clang-format.py index a8d43e08ba..4d2e4b0641 100644 --- a/script/run-clang-format.py +++ b/script/run-clang-format.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """A wrapper script around clang-format, suitable for linting multiple files and to use for continuous integration. This is an alternative API for the clang-format command line. diff --git a/script/strip-binaries.py b/script/strip-binaries.py index 73fbc7ffad..625218c5b6 100755 --- a/script/strip-binaries.py +++ b/script/strip-binaries.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import argparse import os diff --git a/script/verify-chromedriver.py b/script/verify-chromedriver.py index b754641dda..5244bb5c57 100644 --- a/script/verify-chromedriver.py +++ b/script/verify-chromedriver.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function diff --git a/script/verify-ffmpeg.py b/script/verify-ffmpeg.py index ee7de30fbc..0ee4ffe309 100755 --- a/script/verify-ffmpeg.py +++ b/script/verify-ffmpeg.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import argparse import os diff --git a/script/verify-mksnapshot.py b/script/verify-mksnapshot.py index 8e9d632c8e..47d0a4fa32 100755 --- a/script/verify-mksnapshot.py +++ b/script/verify-mksnapshot.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import argparse import glob diff --git a/script/zip-symbols.py b/script/zip-symbols.py index 23521e8230..c87c8a1e6b 100755 --- a/script/zip-symbols.py +++ b/script/zip-symbols.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import print_function import argparse diff --git a/script/zip_manifests/check-zip-manifest.py b/script/zip_manifests/check-zip-manifest.py index 39a6e94e16..4f5594b2c9 100755 --- a/script/zip_manifests/check-zip-manifest.py +++ b/script/zip_manifests/check-zip-manifest.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import zipfile import sys