Roll recipe dependencies (trivial).

This is an automated CL created by the recipe roller. This CL rolls recipe
changes from upstream projects (e.g. depot_tools) into downstream projects
(e.g. tools/build).


More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug
(or complain)

recipe_engine:
  https://crrev.com/e77477ba61ef082e2e34d58fd1251a1cb707f698 make doc/recipes.py supported version 1 and 2 (iannucci@chromium.org)

TBR=iannucci@chromium.org

Change-Id: I0dce7abdcf831c81aa8144b9bef9ceb14a65b425
Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Reviewed-on: https://chromium-review.googlesource.com/462655
Reviewed-by: <recipe-roller@chromium.org>
Commit-Queue: <recipe-roller@chromium.org>

infra/config/recipes.cfg

@@ -4,7 +4,7 @@
     {
       "branch": "master",
       "project_id": "recipe_engine",
-      "revision": "855168108b3dab668c36b56a99ca5a73f6d98932",
+      "revision": "e77477ba61ef082e2e34d58fd1251a1cb707f698",
       "url": "https://chromium.googlesource.com/external/github.com/luci/recipes-py.git"
     }
   ],

recipes/recipes.py

@@ -67,11 +67,15 @@ def parse(repo_root, recipes_cfg_path):
   with open(recipes_cfg_path, 'rU') as fh:
     pb = json.load(fh)
 
-  engine = next(
-    (d for d in pb['deps'] if d['project_id'] == 'recipe_engine'), None)
-  if engine is None:
-    raise ValueError('could not find recipe_engine dep in %r'
-                     % recipes_cfg_path)
+  if pb['api_version'] == 1:
+    # TODO(iannucci): remove when we only support version 2
+    engine = next(
+      (d for d in pb['deps'] if d['project_id'] == 'recipe_engine'), None)
+    if engine is None:
+      raise ValueError('could not find recipe_engine dep in %r'
+                       % recipes_cfg_path)
+  else:
+    engine = pb['deps']['recipe_engine']
   engine_url = engine['url']
   engine_revision = engine.get('revision', '')
   engine_subpath = engine.get('path_override', '')