From d0f45e9c4b94ad8ff77eb64aff480217f1a6026c Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Thu, 2 Sep 2021 13:13:10 -0400
Subject: [PATCH] chore: unbundle renovate reports (#575)

We need to be able to close those for the Python 2.7 requirements,
while allowing through the normal Python 3 reports.

Closes #578.

Use an '@google.com' principal for system test w/ UBLA.

Closes #577.
---
 owlbot.py                   | 8 ++++----
 renovate.json               | 1 -
 tests/system/test_bucket.py | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/owlbot.py b/owlbot.py
index 95351cb69..2b5e9246b 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -14,8 +14,6 @@
 
 """This script is used to synthesize generated parts of this library."""
 
-import re
-
 import synthtool as s
 from synthtool import gcp
 from synthtool.languages import python
@@ -34,15 +32,17 @@
         # See: https://github.com/googleapis/python-storage/issues/226
         "google-cloud-kms < 2.0dev",
     ],
-    intersphinx_dependencies = {
+    intersphinx_dependencies={
         "requests": "https://docs.python-requests.org/en/master/"
     },
 )
 
 s.move(
-    templated_files, excludes=[
+    templated_files,
+    excludes=[
         "docs/multiprocessing.rst",
         "noxfile.py",
+        "renovate.json",  # do not bundle reports
         "CONTRIBUTING.rst",
     ],
 )
diff --git a/renovate.json b/renovate.json
index c21036d38..9fa8816fe 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,7 +1,6 @@
 {
   "extends": [
     "config:base",
-    "group:all",
     ":preserveSemverRanges",
     ":disableDependencyDashboard"
   ],
diff --git a/tests/system/test_bucket.py b/tests/system/test_bucket.py
index 7c81863bd..55ea09057 100644
--- a/tests/system/test_bucket.py
+++ b/tests/system/test_bucket.py
@@ -706,7 +706,7 @@ def test_new_bucket_w_ubla(
         bucket_acl.reload()
 
     bucket_acl.loaded = True  # Fake that we somehow loaded the ACL
-    bucket_acl.all().grant_read()
+    bucket_acl.group("cloud-developer-relations@google.com").grant_read()
     with pytest.raises(exceptions.BadRequest):
         bucket_acl.save()
 
@@ -724,7 +724,7 @@ def test_new_bucket_w_ubla(
         blob_acl.reload()
 
     blob_acl.loaded = True  # Fake that we somehow loaded the ACL
-    blob_acl.all().grant_read()
+    blob_acl.group("cloud-developer-relations@google.com").grant_read()
     with pytest.raises(exceptions.BadRequest):
         blob_acl.save()