Merge branch 'main' into add_cryptography_dependency

Author: daniel-sanche

.github/workflows/unittest.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python: ['3.8']
+        python: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
     steps:
     - name: Checkout
       uses: actions/checkout@v4

google/auth/__init__.py

@@ -42,12 +42,12 @@ class Python37DeprecationWarning(DeprecationWarning):  # pragma: NO COVER
 
 
 # Raise warnings for deprecated versions
-eol_message = """
-    You are using a Python version {} past its end of life. Google will update
-    google-auth with critical bug fixes on a best-effort basis, but not
-    with any other fixes or features. Please upgrade your Python version,
-    and then update google-auth.
-    """
+eol_message = (
+    "You are using a Python version {} past its end of life. Google will update "
+    "google-auth with critical bug fixes on a best-effort basis, but not "
+    "with any other fixes or features. Please upgrade your Python version, "
+    "and then update google-auth."
+)
 if sys.version_info.major == 3 and sys.version_info.minor == 8:  # pragma: NO COVER
     warnings.warn(eol_message.format("3.8"), FutureWarning)
 elif sys.version_info.major == 3 and sys.version_info.minor == 9:  # pragma: NO COVER

google/oauth2/__init__.py

@@ -28,12 +28,12 @@ class Python37DeprecationWarning(DeprecationWarning):  # pragma: NO COVER
 
 
 # Raise warnings for deprecated versions
-eol_message = """
-    You are using a Python version {} past its end of life. Google will update
-    google-auth with critical bug fixes on a best-effort basis, but not
-    with any other fixes or features. Please upgrade your Python version,
-    and then update google-auth.
-    """
+eol_message = (
+    "You are using a Python version {} past its end of life. Google will update "
+    "google-auth with critical bug fixes on a best-effort basis, but not "
+    "with any other fixes or features. Please upgrade your Python version, "
+    "and then update google-auth."
+)
 if sys.version_info.major == 3 and sys.version_info.minor == 8:  # pragma: NO COVER
     warnings.warn(eol_message.format("3.8"), FutureWarning)
 elif sys.version_info.major == 3 and sys.version_info.minor == 9:  # pragma: NO COVER

noxfile.py

@@ -51,14 +51,7 @@
     "lint",
     "blacken",
     "mypy",
-    "unit-3.9",
-    "unit-3.10",
-    "unit-3.11",
-    "unit-3.12",
-    "unit-3.13",
-    "unit-3.14",
     # cover must be last to avoid error `No data to report`
-    "cover",
     "docs",
 ]
 

samples/cloud-client/snippets/requirements.txt

@@ -1,4 +1,4 @@
-google-cloud-compute==1.41.0
+google-cloud-compute==1.42.0
 google-cloud-storage==3.8.0
 google-auth==2.47.0
 pytest===8.4.2; python_version == '3.9'

system_tests/system_tests_async/test_default.py

@@ -17,6 +17,7 @@
 
 from google.auth import _default_async
 from google.auth.exceptions import RefreshError
+import google.oauth2.credentials
 
 EXPECT_PROJECT_ID = os.getenv("EXPECT_PROJECT_ID")
 CREDENTIALS = os.getenv("GOOGLE_APPLICATION_CREDENTIALS", "")
@@ -34,12 +35,16 @@ async def test_application_default_credentials(verify_refresh):
     except RefreshError as e:
         # allow expired credentials for explicit_authorized_user tests
         # TODO: https://github.com/googleapis/google-auth-library-python/issues/1882
-        if not CREDENTIALS.endswith("authorized_user.json"):
+        is_user_credentials = isinstance(
+            credentials, google.oauth2.credentials.Credentials
+        )
+        if not is_user_credentials and not CREDENTIALS.endswith("authorized_user.json"):
             raise
 
         error_message = str(e)
         if (
             "Token has been expired or revoked" not in error_message
             and "invalid_grant" not in error_message
+            and "invalid_client" not in error_message
         ):
             raise

system_tests/system_tests_sync/test_default.py

@@ -16,6 +16,7 @@
 
 import google.auth
 from google.auth.exceptions import RefreshError
+import google.oauth2.credentials
 
 EXPECT_PROJECT_ID = os.getenv("EXPECT_PROJECT_ID")
 CREDENTIALS = os.getenv("GOOGLE_APPLICATION_CREDENTIALS", "")
@@ -32,12 +33,16 @@ def test_application_default_credentials(verify_refresh):
     except RefreshError as e:
         # allow expired credentials for explicit_authorized_user tests
         # TODO: https://github.com/googleapis/google-auth-library-python/issues/1882
-        if not CREDENTIALS.endswith("authorized_user.json"):
+        is_user_credentials = isinstance(
+            credentials, google.oauth2.credentials.Credentials
+        )
+        if not is_user_credentials and not CREDENTIALS.endswith("authorized_user.json"):
             raise
 
         error_message = str(e)
         if (
             "Token has been expired or revoked" not in error_message
             and "invalid_grant" not in error_message
+            and "invalid_client" not in error_message
         ):
             raise