make doc/recipes.py supported version 1 and 2

doc/recipes.py

 #!/usr/bin/env python
 
 # Copyright 2016 The LUCI Authors. All rights reserved.
 # Use of this source code is governed under the Apache License, Version 2.0
 # that can be found in the LICENSE file.
 
 """Bootstrap script to clone and forward to the recipe engine tool.
 
 ***********************************************************************
 ** DO NOT MODIFY EXCEPT IN THE PER-REPO CONFIGURATION SECTION BELOW. **
@@ skipping 49 matching lines @@
       essentially always be empty. It would be used if the recipes-py repo was
       merged as a subdirectory of some other repo and you depended on that
       subdirectory.
     recipes_path (str) - native path to where the recipes live inside of the
       current repo (i.e. the folder containing `recipes/` and/or
       `recipe_modules`)
   """
   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:

[iannucci, 2017/03/29 22:15:08]

This section will go away when we only support version 2

[dnj, 2017/03/29 22:16:15]

Add a TODO then?

[iannucci, 2017/03/29 22:17:20]

Done

+    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', '')
   recipes_path = pb.get('recipes_path', '')
 
   recipes_path = os.path.join(repo_root, recipes_path.replace('/', os.path.sep))
   return engine_url, engine_revision, engine_subpath, recipes_path
 
 
 def _subprocess_call(argv, **kwargs):
@@ skipping 77 matching lines @@
       time.sleep(random.uniform(2,5))
       ensure_engine()
 
   args = ['--package', recipes_cfg_path] + sys.argv[1:]
   return _subprocess_call([
       sys.executable, '-u',
       os.path.join(engine_path, 'recipes.py')] + args)
 
 if __name__ == '__main__':
   sys.exit(main())