Merge branch 'master' into mlkit-automl

hiranya911 · web-flow · commit e100ea109d60 · 2020-09-10T13:26:05.000-07:00
diff --git a/firebase_admin/auth.py b/firebase_admin/auth.py
@@ -450,7 +450,7 @@ def update_user(uid, **kwargs): # pylint: disable=differing-param-doc
             ``auth.DELETE_ATTRIBUTE``.
         password: The user's raw, unhashed password. (optional).
         disabled: A boolean indicating whether or not the user account is disabled (optional).
-        custom_claims: A dictionary or a JSON string contining the custom claims to be set on the
+        custom_claims: A dictionary or a JSON string containing the custom claims to be set on the
             user account (optional). To remove all custom claims, pass ``auth.DELETE_ATTRIBUTE``.
         valid_since: An integer signifying the seconds since the epoch (optional). This field is
             set by ``revoke_refresh_tokens`` and it is discouraged to set this field directly.
diff --git a/firebase_admin/db.py b/firebase_admin/db.py
@@ -979,7 +979,9 @@ def _extract_error_message(cls, response):
 
         return message
 
-
+# Temporarily disable the lint rule. For more information see:
+# https://github.com/googleapis/google-auth-library-python/pull/561
+# pylint: disable=abstract-method
 class _EmulatorAdminCredentials(google.auth.credentials.Credentials):
     def __init__(self):
         google.auth.credentials.Credentials.__init__(self)
diff --git a/tests/testutils.py b/tests/testutils.py
@@ -105,6 +105,9 @@ def __call__(self, *args, **kwargs): # pylint: disable=arguments-differ
         raise self.error
 
 
+# Temporarily disable the lint rule. For more information see:
+# https://github.com/googleapis/google-auth-library-python/pull/561
+# pylint: disable=abstract-method
 class MockGoogleCredential(credentials.Credentials):
     """A mock Google authentication credential."""
     def refresh(self, request):
