diff --git a/.vpython b/.vpython deleted file mode 100644 index c9df48062..000000000 --- a/.vpython +++ /dev/null @@ -1,76 +0,0 @@ -python_version: "2.7" - -# The default set of platforms vpython checks for does not yet include mac-arm64. -# Setting `verify_pep425_tag` to the list of platforms we explicitly must support -# allows us to ensure that vpython specs stay mac-arm64-friendly -verify_pep425_tag: [ - {python: "cp27", abi: "cp27mu", platform: "manylinux1_x86_64"}, - {python: "cp27", abi: "cp27mu", platform: "linux_arm64"}, - {python: "cp27", abi: "cp27mu", platform: "linux_armv6l"}, - - {python: "cp27", abi: "cp27m", platform: "macosx_10_10_intel"}, - {python: "cp27", abi: "cp27m", platform: "macosx_11_0_arm64"}, - - {python: "cp27", abi: "cp27m", platform: "win32"}, - {python: "cp27", abi: "cp27m", platform: "win_amd64"} -] - -# Used by: -# auth.py -# gerrit_util.py -# git_cl.py -# my_activity.py -# TODO(crbug.com/1002153): Add ninjalog_uploader.py -wheel: < - name: "infra/python/wheels/httplib2-py2_py3" - version: "version:0.10.3" -> - -# Used by: -# presubmit_support.py -wheel: < - name: "infra/python/wheels/requests-py2_py3" - version: "version:2.13.0" -> - -# Used by: -# my_activity.py -wheel: < - name: "infra/python/wheels/python-dateutil-py2_py3" - version: "version:2.7.3" -> -wheel: < - name: "infra/python/wheels/six-py2_py3" - version: "version:1.10.0" -> - -# Used by: -# tests/auth_test.py -# tests/detect_host_arch_test.py -# tests/gclient_scm_test.py -# tests/gclient_test.py -# tests/gclient_utils_test.py -# tests/gerrit_util_test.py -# tests/git_cl_test.py -# tests/git_footers_test.py -# tests/metrics_test.py -# tests/presubmit_unittest.py -# tests/scm_unittest.py -# tests/subprocess2_test.py -# tests/watchlists_unittest.py -wheel: < - name: "infra/python/wheels/mock-py2_py3" - version: "version:2.0.0" -> -wheel < - name: "infra/python/wheels/funcsigs-py2_py3" - version: "version:1.0.2" -> -wheel: < - name: "infra/python/wheels/pbr-py2_py3" - version: "version:3.0.0" -> -wheel: < - name: "infra/python/wheels/six-py2_py3" - version: "version:1.10.0" -> diff --git a/cipd_manifest.txt b/cipd_manifest.txt index 7ce6b19fa..90407d23c 100644 --- a/cipd_manifest.txt +++ b/cipd_manifest.txt @@ -36,7 +36,7 @@ $VerifiedPlatform linux-armv6l linux-mips64 linux-mips64le linux-mipsle $VerifiedPlatform windows-arm64 # vpython. -infra/tools/luci/vpython/${platform} git_revision:0c1a41fa62950eedcaaee58ba7268d3813871e3f +infra/tools/luci/vpython3/${platform} git_revision:0c1a41fa62950eedcaaee58ba7268d3813871e3f # LUCI editor infra/tools/luci/led/${platform} git_revision:2d4970c1db4df5cf1cc11355326729c3f8e37407 diff --git a/cipd_manifest.versions b/cipd_manifest.versions index 243757f42..5d752261a 100644 --- a/cipd_manifest.versions +++ b/cipd_manifest.versions @@ -385,65 +385,65 @@ infra/tools/luci/lucicfg/windows-arm64 git_revision:9827af897b3078e2dd69c9c058c2e76ec8c26dc9 OUmTepSE2mTonD-dNRs2MaXa1ZGxtCWbzzdk3zvFSk0C -infra/tools/luci/vpython/linux-386 +infra/tools/luci/vpython3/linux-386 git_revision:0c1a41fa62950eedcaaee58ba7268d3813871e3f - 5XCEuCpKo96l0GAWvnWB4Uog0AeIrrLBOdf020hgygQC + LSv2jnsr-7v4iNnqY-2lMmBB6ZiXyNYY8lURAhZUH0AC -infra/tools/luci/vpython/linux-amd64 +infra/tools/luci/vpython3/linux-amd64 git_revision:0c1a41fa62950eedcaaee58ba7268d3813871e3f - gFBKqINUZLiOlRuph3Mo60hBjCxH7b2bX_k1YNMsnzMC + ovQwRDoJhNqOV-iyKA8FjywcIA-Gd6vaxMKIKovJ2mAC -infra/tools/luci/vpython/linux-arm64 +infra/tools/luci/vpython3/linux-arm64 git_revision:0c1a41fa62950eedcaaee58ba7268d3813871e3f - KHuy2LO9GIrcL0Ke1cV_esAKwRjN4C5OyQ6nudgGphwC + WsoR8xIDVlJzgQHaamyGOPpb22YlX3sbyij2DvjOBQoC -infra/tools/luci/vpython/linux-armv6l +infra/tools/luci/vpython3/linux-armv6l git_revision:0c1a41fa62950eedcaaee58ba7268d3813871e3f - mQ8bSGK04iiCYuHiMT2s1OUSosLqm1CRWaH9u9VczFQC + 99in3dAtvzqeHwIwF02MAEfiB-G9iWO53v342Lq4oFYC -infra/tools/luci/vpython/linux-mips64 +infra/tools/luci/vpython3/linux-mips64 git_revision:0c1a41fa62950eedcaaee58ba7268d3813871e3f - w6cB-w0SMWla2sYWa3SnjymPJevF43BJ1Rluaec3HXMC + HpevxOS1AcbxWanSSLHQzhZ-sSPUSqnirLmpdeSwsooC -infra/tools/luci/vpython/linux-mips64le +infra/tools/luci/vpython3/linux-mips64le git_revision:0c1a41fa62950eedcaaee58ba7268d3813871e3f - RazW56TFJk8EZAzTau1qppjABIoaryE16gjkTo8ljUMC + exAC5qVd221Hlr3pcBqiERuVLMZ0vA1etWI1isTJVNsC -infra/tools/luci/vpython/linux-mipsle +infra/tools/luci/vpython3/linux-mipsle git_revision:0c1a41fa62950eedcaaee58ba7268d3813871e3f - QMZQG8XxzdH11d8YFP2TRPzRBOCV9we5FaM63oI3ZDoC + 63XWHf_tz8JZXTP-XZkz5FejfvsIHJeN1C4wmUzyu4AC -infra/tools/luci/vpython/linux-ppc64 +infra/tools/luci/vpython3/linux-ppc64 git_revision:0c1a41fa62950eedcaaee58ba7268d3813871e3f - c7cyFyzoPItwI86hvB7ACZ16jtBV-v1Pq5gQk_teq5cC + 4TDNfR1iO2d8Mpebe-ionhGhttE8ynOLQXtYQ20yoSMC -infra/tools/luci/vpython/linux-ppc64le +infra/tools/luci/vpython3/linux-ppc64le git_revision:0c1a41fa62950eedcaaee58ba7268d3813871e3f - HWdIhJ0mDYFzpyIZqYGM9NgBtV7dTzoCUMaPEA9gvy4C + Pk7m7LyigjgNX0iBqflIUan5eDdRRqr_3imS2i94tmsC -infra/tools/luci/vpython/linux-riscv64 +infra/tools/luci/vpython3/linux-riscv64 git_revision:0c1a41fa62950eedcaaee58ba7268d3813871e3f - e9qGcT3OxmsubATYdd-fxaxc3sEmdc-GKgYWS_twFnMC + dLLb1rYCVIWgsPoyfT5REVspsSqySTBTX5ZK2vFrc_0C -infra/tools/luci/vpython/linux-s390x +infra/tools/luci/vpython3/linux-s390x git_revision:0c1a41fa62950eedcaaee58ba7268d3813871e3f - q3latzYdJnhbPnze0sij4bLShocNICeNGYJ7FR1272kC + VDNw9r3hA4B2PCki0MtNvIzLfgr0WkT2O8G3g7zXelgC -infra/tools/luci/vpython/mac-amd64 +infra/tools/luci/vpython3/mac-amd64 git_revision:0c1a41fa62950eedcaaee58ba7268d3813871e3f - mlSOx-jy8Ntrh98cOZTcgQN6RrWXm5tBxKWDxhxrNVwC + qUCWlve2bacyVNcoN-S21GKpkdPRxP2kZP4ygP6gMLoC -infra/tools/luci/vpython/mac-arm64 +infra/tools/luci/vpython3/mac-arm64 git_revision:0c1a41fa62950eedcaaee58ba7268d3813871e3f - DgWwOCjBqH9Nc2LRLFbTZ9JTwHlwcwT7esanwSCbBAAC + YPPISxeZPIZRSLolAuJo8SqomP4bWT2yw-jWdcy8Y_wC -infra/tools/luci/vpython/windows-amd64 +infra/tools/luci/vpython3/windows-amd64 git_revision:0c1a41fa62950eedcaaee58ba7268d3813871e3f - oluqkEWDxYtHzDCkIUl9840g6Ix8qBncMVmtu8yOplkC + jUkfILL7JKj_4n84BaPvMBOkok-Iu9_hgMFLkEif50QC -infra/tools/luci/vpython/windows-arm64 +infra/tools/luci/vpython3/windows-arm64 git_revision:0c1a41fa62950eedcaaee58ba7268d3813871e3f - yTXSPAek0nBC9yzj06d7DtQZIbNV9EKCEakVxSmHAIYC + EZ2JiY1_lNSKS-Lb_z9Iev_mKkJFekhQC0h2-DY8DwEC infra/tools/mac_toolchain/mac-amd64 git_revision:05fe195bf77656743f3daa99d463a794260b429b diff --git a/gn.py b/gn.py index 296042ed4..a56bc97b4 100755 --- a/gn.py +++ b/gn.py @@ -55,7 +55,7 @@ def main(args): # Invocations of `python` from GN should never inherit the gn.py's own # VirtualEnv. This also helps to ensure that generated ninja files do not # reference python.exe from the VirtualEnv generated from depot_tools' own - # .vpython file (or lack thereof), but instead reference the default python + # .vpython3 file (or lack thereof), but instead reference the default python # from the PATH. PruneVirtualEnv() diff --git a/presubmit_canned_checks.py b/presubmit_canned_checks.py index f3cc6f6ab..e321a108a 100644 --- a/presubmit_canned_checks.py +++ b/presubmit_canned_checks.py @@ -1355,8 +1355,8 @@ def GetPylint(input_api, kwargs = {'env': env} if input_api.platform == 'win32': # On Windows, scripts on the current directory take precedence over - # PATH. When `pylint.bat` calls `vpython`, it will execute the - # `vpython` of the depot_tools under test instead of the one in the + # PATH. When `pylint.bat` calls `vpython3`, it will execute the + # `vpython3` of the depot_tools under test instead of the one in the # bot. As a workaround, we run the tests from the parent directory # instead. cwd = input_api.change.RepositoryRoot() @@ -2079,8 +2079,8 @@ def CheckVPythonSpec(input_api, output_api, file_filter=None): output_api: Bag of output related interfaces. file_filter: Custom function that takes a path (relative to client root) and returns boolean, which is used to filter files for which to apply the - verification to. Defaults to any path ending with .vpython, which captures - both global .vpython and