roll common DEPS, now using recursedeps

BUG=skia:2618
R=borenet@google.com, cmp@chromium.org

Author: epoger@google.com

Review URL: https://codereview.chromium.org/392353003

diff --git a/DEPS b/DEPS
index 920eb32..176b8cc 100644 (file)
--- a/DEPS
+++ b/DEPS
@@ -3,20 +3,7 @@ use_relative_paths = True
 # Dependencies on outside packages.
 #
 deps = {
-  "common": "https://skia.googlesource.com/common.git@0ad95c13aaab3bbb89a97952b83c915d470681df",
-  # TODO(epoger): Whenever you update the hash of the "common" repo above,
-  # update the following transitive dependencies as well...
-  # (I tried to use From() to import the revision numbers from
-  # common's DEPS file, but that caused "gclient sync" to block forever.)
-  #
-  # Once we fix http://crbug.com/393000 ('Gclient recursedeps feature
-  # doesn't seem to respect use_relative_paths'), we can import them
-  # recursively, like so:
-  #   recursedeps = {"common"}
-  "common/third_party/externals/google-api-python-client" : "https://github.com/google/google-api-python-client.git@ecc64a0a2baa4a77f35dec83ad05c6c9ba2d2841",
-  "common/third_party/externals/httplib2" : "https://github.com/jcgregorio/httplib2.git@7d1b88a3cf34774242bf4c0578c09c0092bb05d8",
-  "common/third_party/externals/oauth2client" : "https://github.com/google/oauth2client.git@d02b317af0313dcf66755844f5421651af5eb356",
-  "common/third_party/externals/uritemplate-py" : "https://github.com/uri-templates/uritemplate-py.git@1e780a49412cdbb273e9421974cb91845c124f3f",
+  "common": "https://skia.googlesource.com/common.git@ac762a93094a8a45e2793820ababd280766eef2a",
 
   # DEPS using https://chromium.googlesource.com are pulled from chromium @ r205199
   # (see https://chromium.googlesource.com/chromium/chromium/+/c59bfa8ef877f45bfa859669053859857af1d279)
@@ -32,6 +19,10 @@ deps = {
   "third_party/externals/nanomsg": "git://github.com/nanomsg/nanomsg.git@0.4-beta",
 }
 
+recursedeps = [
+  "common",
+]
+
 deps_os = {
   "android": {
     "platform_tools/android/third_party/externals/expat" : "https://android.googlesource.com/platform/external/expat.git@android-4.2.2_r1.2",

diff --git a/gm/rebaseline_server/download_actuals.py b/gm/rebaseline_server/download_actuals.py
index a619f71..c17befe 100755 (executable)
--- a/gm/rebaseline_server/download_actuals.py
+++ b/gm/rebaseline_server/download_actuals.py
@@ -93,7 +93,7 @@ def get_builders_list(summaries_bucket=GM_SUMMARIES_BUCKET):
     summaries_bucket: Google Cloud Storage bucket containing the summary
         JSON files
   """
-  dirs, _ = gs_utils.list_bucket_contents(bucket=GM_SUMMARIES_BUCKET)
+  dirs, _ = gs_utils.GSUtils().list_bucket_contents(bucket=GM_SUMMARIES_BUCKET)
   return dirs
 
 

diff --git a/gm/rebaseline_server/server.py b/gm/rebaseline_server/server.py
index 418f5dd..50367f6 100755 (executable)
--- a/gm/rebaseline_server/server.py
+++ b/gm/rebaseline_server/server.py
@@ -222,6 +222,7 @@ class Server(object):
     self._reload_seconds = reload_seconds
     self._config_pairs = config_pairs or []
     self._builder_regex_list = builder_regex_list
+    self._gs = gs_utils.GSUtils()
     _create_index(
         file_path=os.path.join(
             PARENT_DIRECTORY, STATIC_CONTENTS_SUBDIR, GENERATED_HTML_SUBDIR,
@@ -304,7 +305,7 @@ class Server(object):
         # TODO(epoger): When this is a large number of builders, we would be
         # better off downloading them in parallel!
         for builder in matching_builders:
-          gs_utils.download_file(
+          self._gs.download_file(
               source_bucket=self._gm_summaries_bucket,
               source_path=posixpath.join(builder, self._json_filename),
               dest_path=os.path.join(self._actuals_dir, builder,