From 0958ca3e3174de46567d4fe82707f09cefb72099 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Fri, 20 Nov 2020 08:49:45 +0100 Subject: [PATCH] Reland "Add protobuf-py2_py3 3.13.0 to .vpython." This is a reland of 9b53c2983260a210ba4f04510759bc56d5a2285e It looks like the idea was correct (see [1]), changes with respect to the original at [2]. [1] - https://chromium-review.googlesource.com/c/chromium/src/+/2545204/7/tools/privacy_budget/blink_apis/generate_blink_api_db.py [2] - https://webrtc-review.googlesource.com/c/src/+/194261/1..2 Original change's description: > Add protobuf-py2_py3 3.13.0 to .vpython. > > Starting from https://webrtc-review.googlesource.com/c/src/+/194081, > WebRTC's protobuf are using version 3.13.0.1+ but when running on > bots, we see errors that are probably caused by a version mismatch, see > https://ci.chromium.org/p/webrtc/builders/perf/Perf%20Linux%20Trusty/4597. > > This CL updates WebRTC's .vpython to use protobuf 3.13.0. > > TBR=kwiberg@webrtc.org > > No-Try: True > Bug: None > Change-Id: I6bc5e71bacc67dbd9299a9588ddf826778451949 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/194143 > Commit-Queue: Mirko Bonadei > Reviewed-by: Andrey Logvin > Cr-Commit-Position: refs/heads/master@{#32642} TBR=kwiberg@webrtc.org No-Try: True No-Presubmit: True Bug: None Change-Id: Ic61d477b7ad104d15edf4afbbfb9c51f261bc435 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/194261 Reviewed-by: Mirko Bonadei Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#32649} --- .vpython | 4 ++++ tools_webrtc/perf/webrtc_dashboard_upload.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.vpython b/.vpython index e8dc8e26a1..92c9c51346 100644 --- a/.vpython +++ b/.vpython @@ -66,6 +66,10 @@ wheel: < name: "infra/python/wheels/mock-py2_py3" version: "version:2.0.0" > +wheel: < + name: "infra/python/wheels/protobuf-py2_py3" + version: "version:3.13.0" +> wheel: < name: "infra/python/wheels/requests-py2_py3" version: "version:2.13.0" diff --git a/tools_webrtc/perf/webrtc_dashboard_upload.py b/tools_webrtc/perf/webrtc_dashboard_upload.py index 0d42e9ccf7..df5b9bb2c8 100644 --- a/tools_webrtc/perf/webrtc_dashboard_upload.py +++ b/tools_webrtc/perf/webrtc_dashboard_upload.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env vpython # Copyright (c) 2019 The WebRTC project authors. All Rights Reserved. # # Use of this source code is governed by a BSD-style license