Răsfoiți Sursa

[vpython] Roll to 98a268c6432f18aedd55d62b9621765316dc2a16

Newer builds of vpython contain vpython3 as well.

Bug: 898348
Change-Id: I63b197690e2ae47bd4c6cd50894c4769e1a18334
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1727581
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: smut <smut@google.com>
smut 6 ani în urmă
părinte
comite
447b45d423
5 a modificat fișierele cu 77 adăugiri și 27 ștergeri
  1. 1 0
      .vpython3
  2. 1 1
      cipd_manifest.txt
  3. 26 26
      cipd_manifest.versions
  4. 42 0
      vpython3
  5. 7 0
      vpython3.bat

+ 1 - 0
.vpython3

@@ -0,0 +1 @@
+python_version: "3.8"

+ 1 - 1
cipd_manifest.txt

@@ -25,7 +25,7 @@ $VerifiedPlatform linux-arm64 linux-armv6l
 $VerifiedPlatform linux-mips64 linux-mips64le linux-mipsle
 
 # vpython.
-infra/tools/luci/vpython/${platform} git_revision:7c436dff846e5ad40ead55e392ce03b701727b29
+infra/tools/luci/vpython/${platform} git_revision:98a268c6432f18aedd55d62b9621765316dc2a16
 
 # LUCI editor
 infra/tools/luci/led/${platform} git_revision:6d8f5e1d5857481abe0ce48f972ab5421fe244be

+ 26 - 26
cipd_manifest.versions

@@ -210,56 +210,56 @@ infra/tools/luci/lucicfg/windows-amd64
 	Za1gF4WHWBO-9H22lhkAo404iFHKDUj7r73fOnfNODwC
 
 infra/tools/luci/vpython/linux-386
-	git_revision:7c436dff846e5ad40ead55e392ce03b701727b29
-	wMuAVc7aZN1H6AeNJir5sHnQedTnYSxNC0xSZ7bhsAUC
+	git_revision:98a268c6432f18aedd55d62b9621765316dc2a16
+	S940kfLWmQmIxMAXzH4NPCz9OquawSD9exdbr48yOlcC
 
 infra/tools/luci/vpython/linux-amd64
-	git_revision:7c436dff846e5ad40ead55e392ce03b701727b29
-	d4cRoeyLHZhmoLnTQsjMhXfbN227X8cqTAZxORdIbesC
+	git_revision:98a268c6432f18aedd55d62b9621765316dc2a16
+	Yi8NZ4wVh7Qg3Htt4RI7miZmRAVoplTx51ET2ltNewsC
 
 infra/tools/luci/vpython/linux-arm64
-	git_revision:7c436dff846e5ad40ead55e392ce03b701727b29
-	Tu1dUIKzjard2qn2Uf4lM_xcKpuXcsHVZpmU6VofV50C
+	git_revision:98a268c6432f18aedd55d62b9621765316dc2a16
+	JlSe25RN2uH6GQHz1dOdELwg-1SDKjmNN9pZCCl-upcC
 
 infra/tools/luci/vpython/linux-armv6l
-	git_revision:7c436dff846e5ad40ead55e392ce03b701727b29
-	wXrus3zFcrTr2s4j6RYtRyY_3b_UCr8ZR9_HHanvJnIC
+	git_revision:98a268c6432f18aedd55d62b9621765316dc2a16
+	lQx1se34S_FZQdGxv5Vt24N1-10aUrUROOvPCZMlxK4C
 
 infra/tools/luci/vpython/linux-mips64
-	git_revision:7c436dff846e5ad40ead55e392ce03b701727b29
-	GITDTSLRm99lunYavGlofnYq-QO-AYtbxbl24k-Q44oC
+	git_revision:98a268c6432f18aedd55d62b9621765316dc2a16
+	9iH4KvAGZWADLI9oyplDJVk-EgKO_bcMTIOkGu46q9sC
 
 infra/tools/luci/vpython/linux-mips64le
-	git_revision:7c436dff846e5ad40ead55e392ce03b701727b29
-	b5Urfr_luEPyzrHN_0A-oUS-1KVLNKKX1-f0jxe9LmMC
+	git_revision:98a268c6432f18aedd55d62b9621765316dc2a16
+	DHvCKas2JTcl3kmfcC_bsstic6Ff-f2ZRX4Rp0BfIEAC
 
 infra/tools/luci/vpython/linux-mipsle
-	git_revision:7c436dff846e5ad40ead55e392ce03b701727b29
-	ES1ntb4yrlovrovoSSWwepJhrB9HL-oYBzfoBB7In_UC
+	git_revision:98a268c6432f18aedd55d62b9621765316dc2a16
+	RpGRD9-5CzoRuYLg1RBGIHomUIYiGBmLevrIy1RV8cQC
 
 infra/tools/luci/vpython/linux-ppc64
-	git_revision:7c436dff846e5ad40ead55e392ce03b701727b29
-	JOHcDH4Tgwe5-KmqBYoyg7dbLMV1XT3Y18ocbBfW3i8C
+	git_revision:98a268c6432f18aedd55d62b9621765316dc2a16
+	TzKX9R6HskA7N91A4GB8kZOBNuA1wKkLMR3ZRVGbOQsC
 
 infra/tools/luci/vpython/linux-ppc64le
-	git_revision:7c436dff846e5ad40ead55e392ce03b701727b29
-	CzyLXWHx_mMmh4U6yaeBV4g7X7b5IpliqyRo-gICMbYC
+	git_revision:98a268c6432f18aedd55d62b9621765316dc2a16
+	JGzY9mzxn4la6jGuZ7Gxj22ZEV7bpWXYYk5sY3L7z78C
 
 infra/tools/luci/vpython/linux-s390x
-	git_revision:7c436dff846e5ad40ead55e392ce03b701727b29
-	x0Wc1idq-TXTT7YRcMokr91Dls2SZbJkpYsb1EzGpdIC
+	git_revision:98a268c6432f18aedd55d62b9621765316dc2a16
+	dz80MJNiqFdsDBegKUvOk_1a__vWn7HDSGtl9Ike2-AC
 
 infra/tools/luci/vpython/mac-amd64
-	git_revision:7c436dff846e5ad40ead55e392ce03b701727b29
-	Ua-1HtP3NobgI3GfEeGAGoRy45L6575VQ96M9SCV9mEC
+	git_revision:98a268c6432f18aedd55d62b9621765316dc2a16
+	fLBh0tIUNP8VCEY7Jc-hUJfNYU8P0NOqfhKsDEBJjZ0C
 
 infra/tools/luci/vpython/windows-386
-	git_revision:7c436dff846e5ad40ead55e392ce03b701727b29
-	Y7XBraus3dpohfR_o-YBfRHcjL1BKttkZEHh2MWwKV4C
+	git_revision:98a268c6432f18aedd55d62b9621765316dc2a16
+	6_RHX6_WREHSGzd9Qywxo7d4fkS-2FDiAN-Yrhe_tmUC
 
 infra/tools/luci/vpython/windows-amd64
-	git_revision:7c436dff846e5ad40ead55e392ce03b701727b29
-	URdASxHunCnTpWYCexYLrUvW8ifbWByq9CG1epMe4j4C
+	git_revision:98a268c6432f18aedd55d62b9621765316dc2a16
+	ylBzWn7StjfW7NEzBrXsCjCdUc-ZN7VB5yi4t2WxUkQC
 
 infra/tools/mac_toolchain/mac-amd64
 	git_revision:47354a337f7eb444f2cb1e1b5d30ac3940f1d097

+ 42 - 0
vpython3

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+
+# Copyright 2019 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.
+
+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 "python3" "${NEWARGS[@]}"
+fi
+
+
+MYPATH=$(dirname "${BASH_SOURCE[0]}")
+
+source "$MYPATH/cipd_bin_setup.sh"
+cipd_bin_setup &> /dev/null
+
+exec "$MYPATH/.cipd_bin/vpython3" "$@"

+ 7 - 0
vpython3.bat

@@ -0,0 +1,7 @@
+@echo off
+:: Copyright 2019 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.
+
+call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
+"%~dp0\.cipd_bin\vpython3.exe" %*