From 68ccac685a759bce7f8a39a2c9cd950c1ccd1518 Mon Sep 17 00:00:00 2001 From: Chenlin Fan Date: Thu, 7 Sep 2023 03:47:13 +0000 Subject: [PATCH] New vpython to depot_tools This is a reland of https://crrev.com/c/4719827 - Fixed the issue for cipd wrapper. Now all environment variables should be perserved when invoking cipd: https://crrev.com/c/4669637 - Isolate python when creating virtualenv: https://crrev.com/c/4780372 1. virtualenv field in the spec is ignored. 2. --vpython-tool removed support for delete and help subcommands. 3. --vpython-tool installed removed support for naming venv. 4. removed support for -vpython-interpreter. 5. removed support for searching interpreters in host PATH. 6. python 2.7 is available only if the binary is invoked as `vpython`. 7. fixed a bug that passes invalid vpython arguments to the script, which may be silently ignored. 8. python_version in the vpython_spec must specify a minor version (python_version: "3" is not valid anymore). 9. vpython now requires the cipd binary to be present in PATH, which is true already when using Swarming or depot_tools. Bug: 1415212 Change-Id: I05fddbb10c7c9bcfa6f5390710fab28fe8d89131 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4844251 Commit-Queue: Chenlin Fan Reviewed-by: Robbie Iannucci --- cipd_manifest.txt | 2 +- cipd_manifest.versions | 56 +++++++++++++++++++++--------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/cipd_manifest.txt b/cipd_manifest.txt index 1fb9358ea..1114b7e60 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:7db81fdd219325d5d11fdaf56357ec28c26fffb3 +infra/tools/luci/vpython/${platform} git_revision:3eb3c0a982ae06e72bdf8af6c1f68f8da5833853 # LUCI editor infra/tools/luci/led/${platform} git_revision:6e9be28a4c4e3a804f400dc6c2ed08b866f0a38b diff --git a/cipd_manifest.versions b/cipd_manifest.versions index 1b12e3c0e..2169c8a43 100644 --- a/cipd_manifest.versions +++ b/cipd_manifest.versions @@ -362,60 +362,60 @@ infra/tools/luci/lucicfg/windows-arm64 Iz0OQSB0iA7-awKIrWZgSEbmgyL-pY7QKckJub9K5iIC infra/tools/luci/vpython/linux-386 - git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 - eGwM15U21ZJfAQUr3fwhBXJjbs0C9R5PhQ2s7ffJ5x4C + git_revision:3eb3c0a982ae06e72bdf8af6c1f68f8da5833853 + pS1p5lVtYrOZ8o9mr7vDcjUB4wPN3q6SY9kwpIYIAYsC infra/tools/luci/vpython/linux-amd64 - git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 - 9yAXv0KsU9JAgagYQxkjWkU_YUDsDJpdQ4Rktg-EJDoC + git_revision:3eb3c0a982ae06e72bdf8af6c1f68f8da5833853 + Hz9uNZz5u8kQl3EeiK9dDXUNuFSGNvUCIKeDFSxkf4QC infra/tools/luci/vpython/linux-arm64 - git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 - caLUJKwXkeJqNbXe8VrUaJapyclM4Pi8UqrVMDYRvqMC + git_revision:3eb3c0a982ae06e72bdf8af6c1f68f8da5833853 + WPy5ma7JevpImbhhCZup9ABXo0_dT7EdSPC8qlL9cx4C infra/tools/luci/vpython/linux-armv6l - git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 - 4DqSKhlfFqV13-5gC0ocY9p6ywv-cJiL2NilLkppLiIC + git_revision:3eb3c0a982ae06e72bdf8af6c1f68f8da5833853 + lQj8w_XLv5KAtI1nhL6fhpXVWc7gUP7_hrskG96wt5oC infra/tools/luci/vpython/linux-mips64 - git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 - N6eu72sj__hX71cv_zxtnmskb1JPT3H5peTA0A4hWQ4C + git_revision:3eb3c0a982ae06e72bdf8af6c1f68f8da5833853 + gAOnpla4g1z_6MoKYeGJpi02IBjUEczRSKq8YXrhVCQC infra/tools/luci/vpython/linux-mips64le - git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 - 2fVbrtfqruPr0fCu6WzUd6F0ZzZOAeSewpvkvK9qvl0C + git_revision:3eb3c0a982ae06e72bdf8af6c1f68f8da5833853 + olpHJ2KlMY0fw_ivbzAKMgmGi9q7SAiKBRawWIkA5qoC infra/tools/luci/vpython/linux-mipsle - git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 - 44Pd9YZvAOGgXkir4GV_3nfWF6DFFOx91y7hrdeKCpgC + git_revision:3eb3c0a982ae06e72bdf8af6c1f68f8da5833853 + XX8jYBuKzHN22I-Y5k7HXJ7KgCX32pNCVuR39wR-9GsC infra/tools/luci/vpython/linux-ppc64 - git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 - 2bF-o3-L4WWbUHR6SvsVUAq6X8ZcQvT0GD762sM2CYEC + git_revision:3eb3c0a982ae06e72bdf8af6c1f68f8da5833853 + nKEJDh35_X4qatteyRabSDw5KZcQl3a4w70tdxnBgf0C infra/tools/luci/vpython/linux-ppc64le - git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 - 5eTfzvKq0RH3XgWLuhKPyVFGwbYi3fWogKENRq2wx9MC + git_revision:3eb3c0a982ae06e72bdf8af6c1f68f8da5833853 + sTe45dsK9yf2T0MN0Y8ttMVZZNf3lm4hLR0RHSXpZ3YC infra/tools/luci/vpython/linux-s390x - git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 - y8M08KKGmPcQtUc9O3ISZAvG0cXSDvevJrk59xhC9j0C + git_revision:3eb3c0a982ae06e72bdf8af6c1f68f8da5833853 + 07EXJgyeeBeJXeSre4wU8NCuHnb4QkINc64lOHa4bgwC infra/tools/luci/vpython/mac-amd64 - git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 - Jdog2fhqcbdX7c8uZTwC0ED0Z6Se8-Qj0IKZzzfkTqcC + git_revision:3eb3c0a982ae06e72bdf8af6c1f68f8da5833853 + Wb6jG4A2f5k7lVEQJ5vIkV5Ss_8F_lqg-57vSdJ1X0YC infra/tools/luci/vpython/mac-arm64 - git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 - 5od2TokCifZKqqmc-6P-rVJHCbq9-3ogCbY8M3SRFooC + git_revision:3eb3c0a982ae06e72bdf8af6c1f68f8da5833853 + XVSfDXxRpyxQv7qebmP_jTFlyccx8b97wAUX-_iYznUC infra/tools/luci/vpython/windows-amd64 - git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 - nRUaJj85Xfp87bEW6FjXOde90sf-KhSbhL0b08ZDXU8C + git_revision:3eb3c0a982ae06e72bdf8af6c1f68f8da5833853 + thwaREQ8oHEPuamJX7U6dX1fYCF5wD-XQUJqMAQ9tJ4C infra/tools/luci/vpython/windows-arm64 - git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 - AHTqVMdkiBvkdKKoeo4Ib8z-ACkfIgRuKFos3WADrlAC + git_revision:3eb3c0a982ae06e72bdf8af6c1f68f8da5833853 + fnvzDGQHDFyyFe7piw2Buy8_gPwnow79IN0-WYl-xWQC infra/tools/mac_toolchain/mac-amd64 git_revision:05fe195bf77656743f3daa99d463a794260b429b