Revert "Delete vpython, leaving only vpython3."
This reverts commit db0dcbbe7c.
Reason for revert: `gclient sync` no longer works on my local checkout with this change due to the error `No such file or directory: 'vpython'.`.
Original change's description:
> Delete vpython, leaving only vpython3.
>
> Bug: 1376538
> Change-Id: Ia7795f75fd05db63f155c5feffcc43822fb45bb1
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5187892
> Reviewed-by: Mike Frysinger <vapier@chromium.org>
> Commit-Queue: Brian Ryner <bryner@google.com>
> Reviewed-by: George Engelbrecht <engeg@google.com>
> Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
> Reviewed-by: Chenlin Fan <fancl@chromium.org>
Bug: 1376538
Change-Id: I7c32eea1f8ae07644ab81a35213de5c68c64dfb6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5260042
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Andy Perelson <ajp@chromium.org>
Commit-Queue: Brian Ryner <bryner@google.com>
Reviewed-by: Brian Ryner <bryner@google.com>
changes/42/5260042/2
Rupert Wiser
1 year ago
committed by
LUCI CQ
parent
371aa997c0
commit
af6eabff53
@ -0,0 +1,76 @@
|
||||
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"
|
||||
>
|
||||
@ -0,0 +1,56 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright 2018 The Chromium Authors. All rights reserved.
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
|
||||
# See revert instructions in cipd_manifest.txt
|
||||
|
||||
if [[ $VPYTHON_BYPASS == "manually managed python not supported by chrome operations" ]]
|
||||
then
|
||||
NEWARGS=()
|
||||
while [[ $# -gt 0 ]]
|
||||
do
|
||||
case "$1" in
|
||||
-vpython-tool*) # these tools all do something vpython related and quit
|
||||
exit 0
|
||||
;;
|
||||
-vpython*=*) # delete any vpython-specific flag (w/ attached argument)
|
||||
shift
|
||||
;;
|
||||
-vpython*) # delete any vpython-specific flag (w/ separate argument)
|
||||
shift
|
||||
shift
|
||||
;;
|
||||
--) # stop parsing
|
||||
NEWARGS+=( "$@" )
|
||||
break
|
||||
;;
|
||||
*) # regular arg
|
||||
NEWARGS+=( "$1" )
|
||||
shift
|
||||
;;
|
||||
esac
|
||||
done
|
||||
exec "python" "${NEWARGS[@]}"
|
||||
fi
|
||||
|
||||
# Export for other depot_tools scripts to re-use.
|
||||
export DEPOT_TOOLS_DIR="${DEPOT_TOOLS_DIR:-$(dirname "$0")}"
|
||||
export DEPOT_TOOLS_UNAME_S="${DEPOT_TOOLS_UNAME_S:-$(uname -s | tr '[:upper:]' '[:lower:]')}"
|
||||
|
||||
source "${DEPOT_TOOLS_DIR}/cipd_bin_setup.sh"
|
||||
cipd_bin_setup &> /dev/null
|
||||
|
||||
# Don't pass this to the Python script as it might turn around and run commands
|
||||
# in other depot_tools dirs.
|
||||
base_dir="${DEPOT_TOOLS_DIR}"
|
||||
unset DEPOT_TOOLS_DIR
|
||||
case "${DEPOT_TOOLS_UNAME_S}" in
|
||||
mingw*|cygwin*)
|
||||
cmd.exe //c $0.bat "$@"
|
||||
;;
|
||||
*)
|
||||
exec "${base_dir}/.cipd_bin/vpython" "$@"
|
||||
;;
|
||||
esac
|
||||
@ -0,0 +1,9 @@
|
||||
@echo off
|
||||
:: Copyright 2017 The Chromium Authors. All rights reserved.
|
||||
:: Use of this source code is governed by a BSD-style license that can be
|
||||
:: found in the LICENSE file.
|
||||
|
||||
:: See revert instructions in cipd_manifest.txt
|
||||
|
||||
call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
|
||||
"%~dp0\.cipd_bin\vpython.exe" %*
|
||||
Loading…
Reference in New Issue