From ad0be08317c8479f210daf199b6477f29e6b6469 Mon Sep 17 00:00:00 2001 From: Kaushik Iska Date: Fri, 13 Aug 2021 18:27:08 +0000 Subject: [PATCH] use pyyaml from deps --- DEPS | 2 ++ tools/fuchsia/sdk/find_dart_libraries.py | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index dacf6d69678e8..6cc9a94773191 100644 --- a/DEPS +++ b/DEPS @@ -138,6 +138,8 @@ deps = { 'src/third_party/spirv_cross': Var('github_git') + '/KhronosGroup/SPIRV-Cross.git' + '@' + '418542eaefdb609f548d25a1e3962fb69d80da63', + 'src/third_party/pyyaml': + Var('fuchsia_git') + '/third_party/pyyaml' + '@' + '0d71b7df69ec44d1e8cfd81dc580a9612c0e5e21', # Chromium-style # diff --git a/tools/fuchsia/sdk/find_dart_libraries.py b/tools/fuchsia/sdk/find_dart_libraries.py index 1d3c0b29188ef..62bea0ae510b3 100755 --- a/tools/fuchsia/sdk/find_dart_libraries.py +++ b/tools/fuchsia/sdk/find_dart_libraries.py @@ -13,12 +13,10 @@ import argparse import json -import yaml import os import sys import pkg_resources - def find_package(root, local_paths, package, version): """Return the package target if found with at least this version""" needed_version = pkg_resources.parse_version(version) @@ -69,6 +67,9 @@ def main(): assert len(versioned_dart_packages) % 2 == 0, ( 'Each third_party_dep package must be accompanied by a version') + sys.path += [os.path.join(root, 'third_party', 'pyyaml', 'lib3')] + import yaml + dart_package_paths = [] it = iter(versioned_dart_packages) for item in it: