From ee10c7a515270f04260fdc07c607e63ef46a0863 Mon Sep 17 00:00:00 2001 From: Chris Bracken Date: Fri, 30 Jul 2021 15:16:54 -0700 Subject: [PATCH] Migrate Python script invocations to Python 3 Rolls buildroot to 300678066c63df763a632943fac3eed0512684b3. --- DEPS | 16 ++++++++-------- tools/gn | 2 +- tools/gn.bat | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/DEPS b/DEPS index 59281915856ac..e91c9a04eac46 100644 --- a/DEPS +++ b/DEPS @@ -97,7 +97,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + 'd28c48674b65936cf32063da51ef1445af82ac75', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '300678066c63df763a632943fac3eed0512684b3', # Fuchsia compatibility # @@ -638,7 +638,7 @@ hooks = [ 'name': 'landmines', 'pattern': '.', 'action': [ - 'python', + 'python3', 'src/build/landmines.py', ], }, @@ -647,7 +647,7 @@ hooks = [ 'name': 'win_toolchain', 'condition': 'download_windows_deps', 'pattern': '.', - 'action': ['python', 'src/build/vs_toolchain.py', 'update'], + 'action': ['python3', 'src/build/vs_toolchain.py', 'update'], }, { # Ensure that we don't accidentally reference any .pyc files whose @@ -655,7 +655,7 @@ hooks = [ 'name': 'remove_stale_pyc_files', 'pattern': 'src/tools/.*\\.py', 'action': [ - 'python', + 'python3', 'src/tools/remove_stale_pyc_files.py', 'src/tools', ], @@ -665,7 +665,7 @@ hooks = [ 'pattern': '.', 'condition': 'download_windows_deps', 'action': [ - 'python', + 'python3', 'src/flutter/tools/dia_dll.py', ], }, @@ -674,7 +674,7 @@ hooks = [ 'pattern': '.', 'condition': 'download_linux_deps', 'action': [ - 'python', + 'python3', 'src/build/linux/sysroot_scripts/install-sysroot.py', '--arch=x64'], }, @@ -683,7 +683,7 @@ hooks = [ 'pattern': '.', 'condition': 'download_linux_deps', 'action': [ - 'python', + 'python3', 'src/build/linux/sysroot_scripts/install-sysroot.py', '--arch=arm64'], }, @@ -691,7 +691,7 @@ hooks = [ 'name': 'pub get --offline', 'pattern': '.', 'action': [ - 'python', + 'python3', 'src/flutter/tools/pub_get_offline.py', ] }, diff --git a/tools/gn b/tools/gn index 5f07e7736c1b8..214cc8d02bb6d 100755 --- a/tools/gn +++ b/tools/gn @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2013 The Flutter Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/tools/gn.bat b/tools/gn.bat index 9aa32c472b9da..6fc626ae27c2d 100644 --- a/tools/gn.bat +++ b/tools/gn.bat @@ -1 +1 @@ -@call python "%~dp0gn" %* +@call python3 "%~dp0gn" %*