From 076dcfe66e6d7b67244c330a0ca554290d4d6957 Mon Sep 17 00:00:00 2001 From: ohmayr Date: Tue, 7 Jul 2026 15:22:10 +0000 Subject: [PATCH 1/3] chore(google-auth): add gRPC extra and clean up obsolete TODOs --- packages/google-auth/setup.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/google-auth/setup.py b/packages/google-auth/setup.py index c9976a301cb5..1f7bddcf35d0 100644 --- a/packages/google-auth/setup.py +++ b/packages/google-auth/setup.py @@ -37,15 +37,15 @@ enterprise_cert_extra_require = cryptography_base_require -# TODO(https://github.com/googleapis/google-auth-library-python/issues/1739): Add bounds for urllib3 and packaging dependencies. urllib3_extra_require = ["urllib3", "packaging"] rsa_extra_require = ["rsa>=3.1.4,<5"] +grpc_extra_require = ["grpcio"] + # Unit test requirements. testing_extra_require = [ - # TODO(https://github.com/googleapis/google-auth-library-python/issues/1735): Remove `grpcio` from testing requirements once an extra is added for `grpcio` dependency. - "grpcio", + *grpc_extra_require, "flask", "freezegun", *pyjwt_extra_require, @@ -77,8 +77,7 @@ "testing": testing_extra_require, "urllib3": urllib3_extra_require, "rsa": rsa_extra_require, - # TODO(https://github.com/googleapis/google-auth-library-python/issues/1735): Add an extra for `grpcio` dependency. - # TODO(https://github.com/googleapis/google-auth-library-python/issues/1736): Add an extra for `oauth2client` dependency. + "grpc": grpc_extra_require, } with io.open("README.rst", "r") as fh: From 03a51905d91506044bae246c275173d9c9c62ded Mon Sep 17 00:00:00 2001 From: ohmayr Date: Tue, 7 Jul 2026 16:36:03 +0000 Subject: [PATCH 2/3] address feedback --- packages/google-auth/setup.py | 5 ++++- packages/google-auth/testing/constraints-3.10.txt | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/google-auth/setup.py b/packages/google-auth/setup.py index 1f7bddcf35d0..f0afbb86a867 100644 --- a/packages/google-auth/setup.py +++ b/packages/google-auth/setup.py @@ -41,7 +41,10 @@ rsa_extra_require = ["rsa>=3.1.4,<5"] -grpc_extra_require = ["grpcio"] +grpc_extra_require = [ + "grpcio >= 1.59.0, < 2.0.0; python_version < '3.14'", + "grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'", +] # Unit test requirements. testing_extra_require = [ diff --git a/packages/google-auth/testing/constraints-3.10.txt b/packages/google-auth/testing/constraints-3.10.txt index 31094f0391cb..a01df7144a17 100644 --- a/packages/google-auth/testing/constraints-3.10.txt +++ b/packages/google-auth/testing/constraints-3.10.txt @@ -10,4 +10,5 @@ setuptools==40.3.0 cryptography==38.0.3 aiohttp==3.8.0 requests==2.20.0 -pyjwt==2.0 \ No newline at end of file +pyjwt==2.0 +grpcio==1.59.0 \ No newline at end of file From 8416dcbcb630745de0f48f7f3cdde56c61a9aa89 Mon Sep 17 00:00:00 2001 From: ohmayr Date: Tue, 7 Jul 2026 16:49:59 +0000 Subject: [PATCH 3/3] address feedback --- packages/google-auth/setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/google-auth/setup.py b/packages/google-auth/setup.py index f0afbb86a867..3e5b010febd5 100644 --- a/packages/google-auth/setup.py +++ b/packages/google-auth/setup.py @@ -37,6 +37,7 @@ enterprise_cert_extra_require = cryptography_base_require +# TODO(https://github.com/googleapis/google-auth-library-python/issues/1739): Add bounds for urllib3 and packaging dependencies. urllib3_extra_require = ["urllib3", "packaging"] rsa_extra_require = ["rsa>=3.1.4,<5"]