Roll recipe deps
Manual roll because we need a Python 3 update to the roller:
http://crrev.com/c/3791963
Change-Id: Ib597a781f968ba2d043ed8f739d9570b82e585a2
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/32241
Commit-Queue: Rob Mohr <mohrr@google.com>
Reviewed-by: Godofredo Contreras <godofredoc@google.com>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index ef00efc..c6eae7e 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -25,22 +25,23 @@
"deps": {
"depot_tools": {
"branch": "refs/heads/main",
- "revision": "5a99ae53126f4cdc37a140716916774d021aa037",
+ "revision": "08cd5fec1f8a58961bd3eaaf7d64e891795b26ed",
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
},
"fuchsia": {
"branch": "refs/heads/main",
- "revision": "eceae6c29a5dcb6ee9e1937bd3204bc4315a32cc",
+ "revision": "667b1f9f7f13ab6f1cf2a2597c50565ef99aadd6",
"url": "https://fuchsia.googlesource.com/infra/recipes.git"
},
"recipe_engine": {
"branch": "refs/heads/main",
- "revision": "4b7ba01b8ce8d4052feff1408188ef7932351b91",
+ "revision": "0cfa0e6e5b06a87c5b9de3f392158f721154b10a",
"url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
}
},
"no_docs": true,
"project_id": "flutter",
"py3_only": true,
- "repo_name": "flutter"
+ "repo_name": "flutter",
+ "require_py3_compatibility": true
}
diff --git a/recipe_modules/vdl/api.py b/recipe_modules/vdl/api.py
index cb8dbab..a9c002e 100644
--- a/recipe_modules/vdl/api.py
+++ b/recipe_modules/vdl/api.py
@@ -2,9 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-from recipe_engine import recipe_api
+import functools
-from RECIPE_MODULES.fuchsia.utils import cached_property
+from recipe_engine import recipe_api
VDL_CIPD_PREFIX = 'fuchsia/vdl/${platform}'
DEFAULT_VDL_VERSION_TAG = 'latest'
@@ -35,7 +35,7 @@
self._vdl_version_tag = DEFAULT_VDL_VERSION_TAG
self._device_proto_path = None
- @cached_property
+ @functools.cached_property
def vdl_path(self):
"""Fetches and installs VDL from CIPD."""
with self.m.step.nest('ensure vdl'):
@@ -46,7 +46,7 @@
self.m.cipd.ensure(root=cache_path, ensure_file=ensure_file)
return cache_path.join('device_launcher')
- @cached_property
+ @functools.cached_property
def aemu_dir(self):
"""Fetches and installs AEMU from CIPD."""
with self.m.step.nest('ensure aemu'):