From fc36eba70b39615c213325908405db435ef18ce3 Mon Sep 17 00:00:00 2001 From: Chenlin Fan Date: Fri, 4 Aug 2023 04:14:21 +0000 Subject: [PATCH] Revert "New vpython to depot_tools" This reverts commit 43083529de5802a83f53f1d53d7f5f9615999996. Reason for revert: crbug.com/1470122 Original change's description: > New vpython to depot_tools > > This is a reland of https://crrev.com/c/4653897 > Fixed the issue for cipd wrapper. Now all environment variables should > be perserved when invoking cipd: https://crrev.com/c/4669637 > > 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. > > Also updates the LUCI_OWNERS to add peep-software-deploy team. > > Bug:1415212 > Change-Id: Ie541a2a60bef829a976a13db9a6732b406c4d878 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4719827 > Reviewed-by: Vadim Shtayura > Auto-Submit: Chenlin Fan > Commit-Queue: Vadim Shtayura Bug: 1415212 Change-Id: I6ca32066acd977a293f8b8f42697c383cc2a93fc Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4751179 Reviewed-by: Vadim Shtayura Bot-Commit: Rubber Stamper Commit-Queue: Chenlin Fan --- LUCI_OWNERS | 2 -- cipd_manifest.txt | 2 +- cipd_manifest.versions | 56 +++++++++++++++++++++--------------------- 3 files changed, 29 insertions(+), 31 deletions(-) diff --git a/LUCI_OWNERS b/LUCI_OWNERS index 1fbf19586d..33ae0aaa03 100644 --- a/LUCI_OWNERS +++ b/LUCI_OWNERS @@ -6,5 +6,3 @@ jonahhooper@google.com randymaldonado@google.com yuanjunh@google.com yiwzhang@google.com -fancl@chromium.org -bryner@google.com diff --git a/cipd_manifest.txt b/cipd_manifest.txt index dcaa947250..04233cb911 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:f95e19b2c36196fbb42886a2c9813c2f53ec21df +infra/tools/luci/vpython/${platform} git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 # LUCI editor infra/tools/luci/led/${platform} git_revision:6e9be28a4c4e3a804f400dc6c2ed08b866f0a38b diff --git a/cipd_manifest.versions b/cipd_manifest.versions index a1f894f1fc..dfd7ca796e 100644 --- a/cipd_manifest.versions +++ b/cipd_manifest.versions @@ -362,60 +362,60 @@ infra/tools/luci/lucicfg/windows-arm64 O3fjgKqVc2wIcp5HiQBlMXYIhf-mAsqKaEfOTxoshmcC infra/tools/luci/vpython/linux-386 - git_revision:f95e19b2c36196fbb42886a2c9813c2f53ec21df - 5Vv27mdJkX9XloTwGvtttr0XI2d19hXWe8rCOBilgvoC + git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 + eGwM15U21ZJfAQUr3fwhBXJjbs0C9R5PhQ2s7ffJ5x4C infra/tools/luci/vpython/linux-amd64 - git_revision:f95e19b2c36196fbb42886a2c9813c2f53ec21df - ensYZ9vMyoZ6uIU4caz_spcu3phR0Tqvkvq5HhY6_cQC + git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 + 9yAXv0KsU9JAgagYQxkjWkU_YUDsDJpdQ4Rktg-EJDoC infra/tools/luci/vpython/linux-arm64 - git_revision:f95e19b2c36196fbb42886a2c9813c2f53ec21df - IATjTe5FlJewId4HxHn9U_cR5RCwfi7z3mZ5UJo1r6UC + git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 + caLUJKwXkeJqNbXe8VrUaJapyclM4Pi8UqrVMDYRvqMC infra/tools/luci/vpython/linux-armv6l - git_revision:f95e19b2c36196fbb42886a2c9813c2f53ec21df - r1mVPU9cKGh1ttawUmKge6chR-HjLDS6ZIigF07TnWMC + git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 + 4DqSKhlfFqV13-5gC0ocY9p6ywv-cJiL2NilLkppLiIC infra/tools/luci/vpython/linux-mips64 - git_revision:f95e19b2c36196fbb42886a2c9813c2f53ec21df - IWDMxEHPtjgiZWpT_z_jKZN7B238p0gv9J161x3bIOQC + git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 + N6eu72sj__hX71cv_zxtnmskb1JPT3H5peTA0A4hWQ4C infra/tools/luci/vpython/linux-mips64le - git_revision:f95e19b2c36196fbb42886a2c9813c2f53ec21df - _5jvOz7nxPYX8BMQhU5cZH5MOiH-YNcOngTRNWN8GocC + git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 + 2fVbrtfqruPr0fCu6WzUd6F0ZzZOAeSewpvkvK9qvl0C infra/tools/luci/vpython/linux-mipsle - git_revision:f95e19b2c36196fbb42886a2c9813c2f53ec21df - 3mD-hZpnUI4yFu_BJpy0EpSuQ8firTGNMGA1dbLHLuQC + git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 + 44Pd9YZvAOGgXkir4GV_3nfWF6DFFOx91y7hrdeKCpgC infra/tools/luci/vpython/linux-ppc64 - git_revision:f95e19b2c36196fbb42886a2c9813c2f53ec21df - 0D8u2v0tbj5gGReY8q1CJ0ngTctXRvhZOvyAaLeb00YC + git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 + 2bF-o3-L4WWbUHR6SvsVUAq6X8ZcQvT0GD762sM2CYEC infra/tools/luci/vpython/linux-ppc64le - git_revision:f95e19b2c36196fbb42886a2c9813c2f53ec21df - a60TWJSD0ATkCviOoHfy3rsLpQhbWJ_YurWmkf_fnmQC + git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 + 5eTfzvKq0RH3XgWLuhKPyVFGwbYi3fWogKENRq2wx9MC infra/tools/luci/vpython/linux-s390x - git_revision:f95e19b2c36196fbb42886a2c9813c2f53ec21df - eXz9zcypVkxX9yJsf3KLXyxlDkf7XGbkNitMGoUOwyEC + git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 + y8M08KKGmPcQtUc9O3ISZAvG0cXSDvevJrk59xhC9j0C infra/tools/luci/vpython/mac-amd64 - git_revision:f95e19b2c36196fbb42886a2c9813c2f53ec21df - W6XHHgs0VuuM5ObtStI2FfwqLCFMRlAwgjNBDynQUl8C + git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 + Jdog2fhqcbdX7c8uZTwC0ED0Z6Se8-Qj0IKZzzfkTqcC infra/tools/luci/vpython/mac-arm64 - git_revision:f95e19b2c36196fbb42886a2c9813c2f53ec21df - xmxubIGaBsnP8OwndsQBMEjah6xAO3LEtkAGjn6wbrYC + git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 + 5od2TokCifZKqqmc-6P-rVJHCbq9-3ogCbY8M3SRFooC infra/tools/luci/vpython/windows-amd64 - git_revision:f95e19b2c36196fbb42886a2c9813c2f53ec21df - MVC_lVhWxacvOUzgqgB3fAyOxYZUr45wvO4FJbjvA0sC + git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 + nRUaJj85Xfp87bEW6FjXOde90sf-KhSbhL0b08ZDXU8C infra/tools/luci/vpython/windows-arm64 - git_revision:f95e19b2c36196fbb42886a2c9813c2f53ec21df - 2t4txUwanQpS3eD4IXzZTp3TZhkDP4cwQQRlQp8R60YC + git_revision:7db81fdd219325d5d11fdaf56357ec28c26fffb3 + AHTqVMdkiBvkdKKoeo4Ib8z-ACkfIgRuKFos3WADrlAC infra/tools/mac_toolchain/mac-amd64 git_revision:59ddedfe3849abf560cbe0b41bb8e431041cd2bb