From da9c06780f378840f86e6a0af17636822111d392 Mon Sep 17 00:00:00 2001 From: Roman Lavrov Date: Fri, 17 Jun 2022 19:04:32 +0000 Subject: [PATCH] Revert "Spawn via vpython when old module detected." This reverts commit 28dfa45d60395d977d1ff96d04ee2ed78c1c22d2. Reason for revert: No longer needed: https://crbug.com/1326517#c18 Original change's description: > Spawn via vpython when old module detected. > > Not sure of a better way to detect this case as it seems to be running > with the same python version as our vpython but modules are old. > > Bug: angleproject:7326 > Change-Id: I1750f65afdfdfc289af71bc7f426d5ba50dfd4a4 > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3642804 > Commit-Queue: Roman Lavrov > Reviewed-by: Jamie Madill Bug: angleproject:7326 Bug: chromium:1326517 Change-Id: I1940dafa54859b8b1c9f1c4f702381c4346c7e5b Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3708994 Reviewed-by: Cody Northrop Commit-Queue: Roman Lavrov --- scripts/process_angle_perf_results.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/scripts/process_angle_perf_results.py b/scripts/process_angle_perf_results.py index 6ed4295d4..b49c8bb2e 100755 --- a/scripts/process_angle_perf_results.py +++ b/scripts/process_angle_perf_results.py @@ -10,21 +10,14 @@ from __future__ import print_function -import os -import six -import sys -# Swarming runs merge scripts with its python and some really old modules. -if __name__ == '__main__' and 'ensure_binary' not in dir(six): - print('spawning via vpython due to an old six version (%s)' % six.__version__) - import subprocess - sys.exit(subprocess.call(['vpython', os.path.realpath(__file__)] + sys.argv[1:])) - import argparse import collections import json import logging import multiprocessing +import os import shutil +import sys import tempfile import time import uuid