Merge branch 'master' into remove-talent

busunkim96 · web-flow · commit 4564857dad89 · 2020-10-06T08:48:51.000-06:00
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -38,7 +38,7 @@
 /firestore/**/*.py                     @GoogleCloudPlatform/firestore-dpe @GoogleCloudPlatform/python-samples-owners
 /functions/**/*.py                     @ace-n @grant @GoogleCloudPlatform/python-samples-owners
 /healthcare/**/*.py                    @noerog @GoogleCloudPlatform/python-samples-owners
-/iam/**/*.py                           @melaniedejong @GoogleCloudPlatform/python-samples-owners
+/iam/**/*.py                           @GoogleCloudPlatform/python-samples-owners
 /iap/**/*.py                           @GoogleCloudPlatform/python-samples-owners
 /iot/**/*.py                           @gguuss @GoogleCloudPlatform/python-samples-owners
 /jobs/**/*.py                          @GoogleCloudPlatform/python-samples-owners
diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
@@ -69,10 +69,6 @@ assign_issues_by:
   - 'api: healthcare'
   to:
   - noerog
-- labels:
-  - 'api: iam'
-  to:
-  - melaniedejong
 - labels:
   - 'api: logging'
   to:
diff --git a/bigquery/pandas-gbq-migration/requirements.txt b/bigquery/pandas-gbq-migration/requirements.txt
@@ -2,6 +2,6 @@ google-cloud-bigquery==1.28.0
 google-cloud-bigquery-storage==1.1.0
 pandas==0.25.3; python_version > '3.0'
 pandas==0.24.2; python_version < '3.0'
-pandas-gbq==0.13.3
+pandas-gbq==0.14.0
 pyarrow==1.0.1
 grpcio==1.32.0
diff --git a/iam/api-client/custom_roles_test.py b/iam/api-client/custom_roles_test.py
@@ -71,7 +71,8 @@ def test_query_testable_permissions(capsys):
         "//cloudresourcemanager.googleapis.com/projects/" + GCLOUD_PROJECT
     )
     out, _ = capsys.readouterr()
-    assert "apigee" in out
+    # Just make sure the sample printed out multiple permissions.
+    assert "\n" in out
 
 
 def test_get_role(capsys):
diff --git a/iam/api-client/service_accounts.py b/iam/api-client/service_accounts.py
@@ -196,12 +196,12 @@ def main():
     # Disable
     rename_parser = subparsers.add_parser(
         'disable', help=disable_service_account.__doc__)
-    list_parser.addargument('email')
+    list_parser.add_argument('email')
 
     # Enable
     rename_parser = subparsers.add_parser(
         'enable', help=enable_service_account.__doc__)
-    list_parser.addargument('email')
+    list_parser.add_argument('email')
 
     # Delete
     delete_parser = subparsers.add_parser(

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,8 @@ def test_query_testable_permissions(capsys):`
`71`	`71`	`"//cloudresourcemanager.googleapis.com/projects/" + GCLOUD_PROJECT`
`72`	`72`	`)`
`73`	`73`	`out, _ = capsys.readouterr()`
`74`		`- assert "apigee" in out`
	`74`	`+ # Just make sure the sample printed out multiple permissions.`
	`75`	`+ assert "\n" in out`
`75`	`76`
`76`	`77`
`77`	`78`	`def test_get_role(capsys):`