Upgrade depot_tools to 23247b9

depot_tools/.gitattributes

@@ -10,6 +10,7 @@
 /*.sh recipes
 
 # vpython specs
+/.vpython* recipes
 /gsutil.vpython recipes
 
 # Extensionless tools we want and support scripts.

depot_tools/.gitignore

@@ -33,6 +33,7 @@
 /.subversion
 
 # Ignore locations where third-party tools are placed during bootstrapping.
+/bootstrap*_bin
 /python*_bin
 /python_bin_reldir.txt
 /python3_bin_reldir.txt

depot_tools/.vpython

@@ -0,0 +1,23 @@
+python_version: "2.7"
+
+# 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:
+# 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"
+>

depot_tools/.vpython3

@@ -1 +1,23 @@
 python_version: "3.8"
+
+# 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-py3"
+ version: "version:0.13.1"
+>
+
+# 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"
+>

depot_tools/OWNERS

@@ -24,3 +24,5 @@ per-file chrome_set_ver=file:https://CROS_OWNERS
 per-file cros=file:https://CROS_OWNERS
 per-file cros_sdk=file:https://CROS_OWNERS
 per-file repo=file:https://CROS_OWNERS
+
+# COMPONENT: Infra>SDK

depot_tools/PRESUBMIT.py

@@ -68,7 +68,20 @@ def CommonChecks(input_api, output_api, tests_to_black_list, run_on_python3):
  tests_to_white_list = [r'.*test\.py$']
  if input_api.platform.startswith(('cygwin', 'win32')):
  print('Warning: skipping most unit tests on Windows')
- tests_to_white_list = [r'.*cipd_bootstrap_test\.py$']
+ tests_to_black_list = [
+ r'.*auth_test\.py$',
+ r'.*gclient_smoketest\.py$',
+ r'.*git_cl_test\.py$',
+ r'.*git_common_test\.py$',
+ r'.*git_hyper_blame_test\.py$',
+ r'.*git_number_test\.py$',
+ r'.*git_rebase_update_test\.py$',
+ r'.*ninjalog_uploader_test\.py$',
+ r'.*recipes_test\.py$',
+ r'.*roll_dep_test\.py$',
+ r'.*scm_unittest\.py$',
+ r'.*subprocess2_test\.py$',
+ ]
 
  # TODO(maruel): Make sure at least one file is modified first.
  # TODO(maruel): If only tests are modified, only run them.

depot_tools/annotated_gclient.py

@@ -41,7 +41,7 @@ def parse_got_revision(filename, revision_mapping):
  with open(filename) as f:
  data = json.load(f)
 
- for path, info in data['solutions'].iteritems():
+ for path, info in data['solutions'].items():
  # gclient json paths always end with a slash
  path = path.rstrip('/')
  if path in revision_mapping:
@@ -52,7 +52,7 @@ def parse_got_revision(filename, revision_mapping):
 
 
 def emit_buildprops(got_revisions):
- for prop, revision in got_revisions.iteritems():
+ for prop, revision in got_revisions.items():
  print('@@@SET_BUILD_PROPERTY@%s@%s@@@' % (prop, json.dumps(revision)))