chore(types): fix mypy checks

gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/transports/base.py.j2

@@ -98,8 +98,6 @@ class {{ service.name }}Transport(abc.ABC):
             host += ':443'
         self._host = host
 
-        scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
-
         # Save the scopes.
         self._scopes = scopes
 
@@ -114,11 +112,12 @@ class {{ service.name }}Transport(abc.ABC):
         if credentials_file is not None:
             credentials, _ = google.auth.load_credentials_from_file(
                                 credentials_file,
-                                **scopes_kwargs,
-                                quota_project_id=quota_project_id
+                                scopes=scopes,
+                                quota_project_id=quota_project_id,
+                                default_scopes=self.AUTH_SCOPES,
                             )
         elif credentials is None and not self._ignore_credentials:
-            credentials, _ = google.auth.default(**scopes_kwargs, quota_project_id=quota_project_id)
+            credentials, _ = google.auth.default(scopes=scopes, quota_project_id=quota_project_id, default_scopes=self.AUTH_SCOPES)
 
         # If the credentials are service account credentials, then always try to use self signed JWT.
         if always_use_jwt_access and isinstance(credentials, service_account.Credentials) and hasattr(service_account.Credentials, "with_always_use_jwt_access"):

gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/base.py.j2

@@ -108,8 +108,6 @@ class {{ service.name }}Transport(abc.ABC):
         self._extended_operations_services: Dict[str, Any] = {}
         {% endif %}
 
-        scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
-
         # Save the scopes.
         self._scopes = scopes
         if not hasattr(self, "_ignore_credentials"):
@@ -123,11 +121,12 @@ class {{ service.name }}Transport(abc.ABC):
         if credentials_file is not None:
             credentials, _ = google.auth.load_credentials_from_file(
                                 credentials_file,
-                                **scopes_kwargs,
-                                quota_project_id=quota_project_id
+                                scopes=scopes,
+                                quota_project_id=quota_project_id,
+                                default_scopes=self.AUTH_SCOPES,
                             )
         elif credentials is None and not self._ignore_credentials:
-            credentials, _ = google.auth.default(**scopes_kwargs, quota_project_id=quota_project_id)
+            credentials, _ = google.auth.default(scopes=scopes, quota_project_id=quota_project_id, default_scopes=self.AUTH_SCOPES)
             # Don't apply audience if the credentials file passed from user.
             if hasattr(credentials, "with_gdch_audience"):
                 credentials = credentials.with_gdch_audience(api_audience if api_audience else host)

gapic/templates/mypy.ini.j2

@@ -1,3 +1,3 @@
 [mypy]
-python_version = 3.7
+python_version = 3.14
 namespace_packages = True

tests/integration/goldens/asset/google/cloud/asset_v1/services/asset_service/transports/base.py

@@ -85,8 +85,6 @@ def __init__(
                 be used for service account credentials.
         """
 
-        scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
-
         # Save the scopes.
         self._scopes = scopes
         if not hasattr(self, "_ignore_credentials"):
@@ -100,11 +98,12 @@ def __init__(
         if credentials_file is not None:
             credentials, _ = google.auth.load_credentials_from_file(
                                 credentials_file,
-                                **scopes_kwargs,
-                                quota_project_id=quota_project_id
+                                scopes=scopes,
+                                quota_project_id=quota_project_id,
+                                default_scopes=self.AUTH_SCOPES,
                             )
         elif credentials is None and not self._ignore_credentials:
-            credentials, _ = google.auth.default(**scopes_kwargs, quota_project_id=quota_project_id)
+            credentials, _ = google.auth.default(scopes=scopes, quota_project_id=quota_project_id, default_scopes=self.AUTH_SCOPES)
             # Don't apply audience if the credentials file passed from user.
             if hasattr(credentials, "with_gdch_audience"):
                 credentials = credentials.with_gdch_audience(api_audience if api_audience else host)

tests/integration/goldens/asset/mypy.ini

@@ -1,3 +1,3 @@
 [mypy]
-python_version = 3.7
+python_version = 3.14
 namespace_packages = True

tests/integration/goldens/credentials/google/iam/credentials_v1/services/iam_credentials/transports/base.py

@@ -82,8 +82,6 @@ def __init__(
                 be used for service account credentials.
         """
 
-        scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
-
         # Save the scopes.
         self._scopes = scopes
         if not hasattr(self, "_ignore_credentials"):
@@ -97,11 +95,12 @@ def __init__(
         if credentials_file is not None:
             credentials, _ = google.auth.load_credentials_from_file(
                                 credentials_file,
-                                **scopes_kwargs,
-                                quota_project_id=quota_project_id
+                                scopes=scopes,
+                                quota_project_id=quota_project_id,
+                                default_scopes=self.AUTH_SCOPES,
                             )
         elif credentials is None and not self._ignore_credentials:
-            credentials, _ = google.auth.default(**scopes_kwargs, quota_project_id=quota_project_id)
+            credentials, _ = google.auth.default(scopes=scopes, quota_project_id=quota_project_id, default_scopes=self.AUTH_SCOPES)
             # Don't apply audience if the credentials file passed from user.
             if hasattr(credentials, "with_gdch_audience"):
                 credentials = credentials.with_gdch_audience(api_audience if api_audience else host)

tests/integration/goldens/credentials/mypy.ini

@@ -1,3 +1,3 @@
 [mypy]
-python_version = 3.7
+python_version = 3.14
 namespace_packages = True

tests/integration/goldens/eventarc/google/cloud/eventarc_v1/services/eventarc/transports/base.py

@@ -93,8 +93,6 @@ def __init__(
                 be used for service account credentials.
         """
 
-        scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
-
         # Save the scopes.
         self._scopes = scopes
         if not hasattr(self, "_ignore_credentials"):
@@ -108,11 +106,12 @@ def __init__(
         if credentials_file is not None:
             credentials, _ = google.auth.load_credentials_from_file(
                                 credentials_file,
-                                **scopes_kwargs,
-                                quota_project_id=quota_project_id
+                                scopes=scopes,
+                                quota_project_id=quota_project_id,
+                                default_scopes=self.AUTH_SCOPES,
                             )
         elif credentials is None and not self._ignore_credentials:
-            credentials, _ = google.auth.default(**scopes_kwargs, quota_project_id=quota_project_id)
+            credentials, _ = google.auth.default(scopes=scopes, quota_project_id=quota_project_id, default_scopes=self.AUTH_SCOPES)
             # Don't apply audience if the credentials file passed from user.
             if hasattr(credentials, "with_gdch_audience"):
                 credentials = credentials.with_gdch_audience(api_audience if api_audience else host)

tests/integration/goldens/eventarc/mypy.ini

@@ -1,3 +1,3 @@
 [mypy]
-python_version = 3.7
+python_version = 3.14
 namespace_packages = True

tests/integration/goldens/logging/google/cloud/logging_v2/services/config_service_v2/transports/base.py

@@ -88,8 +88,6 @@ def __init__(
                 be used for service account credentials.
         """
 
-        scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
-
         # Save the scopes.
         self._scopes = scopes
         if not hasattr(self, "_ignore_credentials"):
@@ -103,11 +101,12 @@ def __init__(
         if credentials_file is not None:
             credentials, _ = google.auth.load_credentials_from_file(
                                 credentials_file,
-                                **scopes_kwargs,
-                                quota_project_id=quota_project_id
+                                scopes=scopes,
+                                quota_project_id=quota_project_id,
+                                default_scopes=self.AUTH_SCOPES,
                             )
         elif credentials is None and not self._ignore_credentials:
-            credentials, _ = google.auth.default(**scopes_kwargs, quota_project_id=quota_project_id)
+            credentials, _ = google.auth.default(scopes=scopes, quota_project_id=quota_project_id, default_scopes=self.AUTH_SCOPES)
             # Don't apply audience if the credentials file passed from user.
             if hasattr(credentials, "with_gdch_audience"):
                 credentials = credentials.with_gdch_audience(api_audience if api_audience else host)

tests/integration/goldens/logging/google/cloud/logging_v2/services/logging_service_v2/transports/base.py

@@ -88,8 +88,6 @@ def __init__(
                 be used for service account credentials.
         """
 
-        scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
-
         # Save the scopes.
         self._scopes = scopes
         if not hasattr(self, "_ignore_credentials"):
@@ -103,11 +101,12 @@ def __init__(
         if credentials_file is not None:
             credentials, _ = google.auth.load_credentials_from_file(
                                 credentials_file,
-                                **scopes_kwargs,
-                                quota_project_id=quota_project_id
+                                scopes=scopes,
+                                quota_project_id=quota_project_id,
+                                default_scopes=self.AUTH_SCOPES,
                             )
         elif credentials is None and not self._ignore_credentials:
-            credentials, _ = google.auth.default(**scopes_kwargs, quota_project_id=quota_project_id)
+            credentials, _ = google.auth.default(scopes=scopes, quota_project_id=quota_project_id, default_scopes=self.AUTH_SCOPES)
             # Don't apply audience if the credentials file passed from user.
             if hasattr(credentials, "with_gdch_audience"):
                 credentials = credentials.with_gdch_audience(api_audience if api_audience else host)

tests/integration/goldens/logging/google/cloud/logging_v2/services/metrics_service_v2/transports/base.py

@@ -88,8 +88,6 @@ def __init__(
                 be used for service account credentials.
         """
 
-        scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
-
         # Save the scopes.
         self._scopes = scopes
         if not hasattr(self, "_ignore_credentials"):
@@ -103,11 +101,12 @@ def __init__(
         if credentials_file is not None:
             credentials, _ = google.auth.load_credentials_from_file(
                                 credentials_file,
-                                **scopes_kwargs,
-                                quota_project_id=quota_project_id
+                                scopes=scopes,
+                                quota_project_id=quota_project_id,
+                                default_scopes=self.AUTH_SCOPES,
                             )
         elif credentials is None and not self._ignore_credentials:
-            credentials, _ = google.auth.default(**scopes_kwargs, quota_project_id=quota_project_id)
+            credentials, _ = google.auth.default(scopes=scopes, quota_project_id=quota_project_id, default_scopes=self.AUTH_SCOPES)
             # Don't apply audience if the credentials file passed from user.
             if hasattr(credentials, "with_gdch_audience"):
                 credentials = credentials.with_gdch_audience(api_audience if api_audience else host)

tests/integration/goldens/logging/mypy.ini

@@ -1,3 +1,3 @@
 [mypy]
-python_version = 3.7
+python_version = 3.14
 namespace_packages = True

tests/integration/goldens/logging_internal/google/cloud/logging_v2/services/config_service_v2/transports/base.py

@@ -88,8 +88,6 @@ def __init__(
                 be used for service account credentials.
         """
 
-        scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
-
         # Save the scopes.
         self._scopes = scopes
         if not hasattr(self, "_ignore_credentials"):
@@ -103,11 +101,12 @@ def __init__(
         if credentials_file is not None:
             credentials, _ = google.auth.load_credentials_from_file(
                                 credentials_file,
-                                **scopes_kwargs,
-                                quota_project_id=quota_project_id
+                                scopes=scopes,
+                                quota_project_id=quota_project_id,
+                                default_scopes=self.AUTH_SCOPES,
                             )
         elif credentials is None and not self._ignore_credentials:
-            credentials, _ = google.auth.default(**scopes_kwargs, quota_project_id=quota_project_id)
+            credentials, _ = google.auth.default(scopes=scopes, quota_project_id=quota_project_id, default_scopes=self.AUTH_SCOPES)
             # Don't apply audience if the credentials file passed from user.
             if hasattr(credentials, "with_gdch_audience"):
                 credentials = credentials.with_gdch_audience(api_audience if api_audience else host)

tests/integration/goldens/logging_internal/google/cloud/logging_v2/services/logging_service_v2/transports/base.py

@@ -88,8 +88,6 @@ def __init__(
                 be used for service account credentials.
         """
 
-        scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
-
         # Save the scopes.
         self._scopes = scopes
         if not hasattr(self, "_ignore_credentials"):
@@ -103,11 +101,12 @@ def __init__(
         if credentials_file is not None:
             credentials, _ = google.auth.load_credentials_from_file(
                                 credentials_file,
-                                **scopes_kwargs,
-                                quota_project_id=quota_project_id
+                                scopes=scopes,
+                                quota_project_id=quota_project_id,
+                                default_scopes=self.AUTH_SCOPES,
                             )
         elif credentials is None and not self._ignore_credentials:
-            credentials, _ = google.auth.default(**scopes_kwargs, quota_project_id=quota_project_id)
+            credentials, _ = google.auth.default(scopes=scopes, quota_project_id=quota_project_id, default_scopes=self.AUTH_SCOPES)
             # Don't apply audience if the credentials file passed from user.
             if hasattr(credentials, "with_gdch_audience"):
                 credentials = credentials.with_gdch_audience(api_audience if api_audience else host)

tests/integration/goldens/logging_internal/google/cloud/logging_v2/services/metrics_service_v2/transports/base.py

@@ -88,8 +88,6 @@ def __init__(
                 be used for service account credentials.
         """
 
-        scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
-
         # Save the scopes.
         self._scopes = scopes
         if not hasattr(self, "_ignore_credentials"):
@@ -103,11 +101,12 @@ def __init__(
         if credentials_file is not None:
             credentials, _ = google.auth.load_credentials_from_file(
                                 credentials_file,
-                                **scopes_kwargs,
-                                quota_project_id=quota_project_id
+                                scopes=scopes,
+                                quota_project_id=quota_project_id,
+                                default_scopes=self.AUTH_SCOPES,
                             )
         elif credentials is None and not self._ignore_credentials:
-            credentials, _ = google.auth.default(**scopes_kwargs, quota_project_id=quota_project_id)
+            credentials, _ = google.auth.default(scopes=scopes, quota_project_id=quota_project_id, default_scopes=self.AUTH_SCOPES)
             # Don't apply audience if the credentials file passed from user.
             if hasattr(credentials, "with_gdch_audience"):
                 credentials = credentials.with_gdch_audience(api_audience if api_audience else host)

tests/integration/goldens/logging_internal/mypy.ini

@@ -1,3 +1,3 @@
 [mypy]
-python_version = 3.7
+python_version = 3.14
 namespace_packages = True

tests/integration/goldens/redis/google/cloud/redis_v1/services/cloud_redis/transports/base.py

@@ -85,8 +85,6 @@ def __init__(
                 be used for service account credentials.
         """
 
-        scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
-
         # Save the scopes.
         self._scopes = scopes
         if not hasattr(self, "_ignore_credentials"):
@@ -100,11 +98,12 @@ def __init__(
         if credentials_file is not None:
             credentials, _ = google.auth.load_credentials_from_file(
                                 credentials_file,
-                                **scopes_kwargs,
-                                quota_project_id=quota_project_id
+                                scopes=scopes,
+                                quota_project_id=quota_project_id,
+                                default_scopes=self.AUTH_SCOPES,
                             )
         elif credentials is None and not self._ignore_credentials:
-            credentials, _ = google.auth.default(**scopes_kwargs, quota_project_id=quota_project_id)
+            credentials, _ = google.auth.default(scopes=scopes, quota_project_id=quota_project_id, default_scopes=self.AUTH_SCOPES)
             # Don't apply audience if the credentials file passed from user.
             if hasattr(credentials, "with_gdch_audience"):
                 credentials = credentials.with_gdch_audience(api_audience if api_audience else host)

tests/integration/goldens/redis/mypy.ini

@@ -1,3 +1,3 @@
 [mypy]
-python_version = 3.7
+python_version = 3.14
 namespace_packages = True

tests/integration/goldens/redis_selective/google/cloud/redis_v1/services/cloud_redis/transports/base.py

@@ -85,8 +85,6 @@ def __init__(
                 be used for service account credentials.
         """
 
-        scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
-
         # Save the scopes.
         self._scopes = scopes
         if not hasattr(self, "_ignore_credentials"):
@@ -100,11 +98,12 @@ def __init__(
         if credentials_file is not None:
             credentials, _ = google.auth.load_credentials_from_file(
                                 credentials_file,
-                                **scopes_kwargs,
-                                quota_project_id=quota_project_id
+                                scopes=scopes,
+                                quota_project_id=quota_project_id,
+                                default_scopes=self.AUTH_SCOPES,
                             )
         elif credentials is None and not self._ignore_credentials:
-            credentials, _ = google.auth.default(**scopes_kwargs, quota_project_id=quota_project_id)
+            credentials, _ = google.auth.default(scopes=scopes, quota_project_id=quota_project_id, default_scopes=self.AUTH_SCOPES)
             # Don't apply audience if the credentials file passed from user.
             if hasattr(credentials, "with_gdch_audience"):
                 credentials = credentials.with_gdch_audience(api_audience if api_audience else host)

tests/integration/goldens/redis_selective/mypy.ini

@@ -1,3 +1,3 @@
 [mypy]
-python_version = 3.7
+python_version = 3.14
 namespace_packages = True