link issues

Author: ohmayr

setup.py

@@ -28,19 +28,12 @@
 )
 
 # TODO(https://github.com/googleapis/google-auth-library-python/issues/1440): Unit test fails with
-#  No module named 'cryptography.hazmat.backends.openssl.x509' for Python 3.7.
+#  `No module named 'cryptography.hazmat.backends.openssl.x509' for Python 3.7``.
 cryptography_base_require = [
     "cryptography>=38.0.3",
     "cryptography < 39.0.0; python_version < '3.8'",
 ]
 
-# TODO(https://github.com/googleapis/google-auth-library-python/issues/1665): Remove `pyopenssl_testing_require` once
-# `TestDecryptPrivateKey::test_success` is updated to remove the deprecated `OpenSSL.crypto.sign` and
-# `OpenSSL.crypto.verify` methods. See: https://www.pyopenssl.org/en/latest/changelog.html#id3.
-pyopenssl_testing_require = [
-    "pyopenssl < 24.3.0",
-]
-
 requests_extra_require = ["requests >= 2.20.0, < 3.0.0.dev0"]
 
 aiohttp_extra_require = ["aiohttp >= 3.6.2, < 4.0.0.dev0", *requests_extra_require]
@@ -62,6 +55,8 @@
     cryptography_base_require,
 ]
 
+urllib3_extra_require = [["urllib3", "packaging"]]
+
 # Unit test requirements.
 testing_extra_require = [
     "flask",
@@ -71,33 +66,38 @@
     "pytest-cov",
     "pytest-localserver",
     "responses",
-    "pytest-asyncio",
+    *pyjwt_extra_require,
+    *pyopenssl_extra_require,
+    *reauth_extra_require,
+    *urllib3_extra_require,
+    # Async Dependencies
     "aioresponses",
-    # TODO(): Remove `grpcio` from testing requirements once an extra is added for `grpcio` dependency.
+    "pytest-asyncio",
+    *aiohttp_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",
-    # TODO(): Remove `oauth2client` from testing requirements once an extra is added for `grpcio` dependency.
+    # TODO(https://github.com/googleapis/google-auth-library-python/issues/1736): Remove `oauth2client` from testing requirements once an extra is added for `oauth2client` dependency.
     "oauth2client",
-    # Async Dependencies
+    # TODO(https://github.com/googleapis/google-auth-library-python/issues/1665): Remove the pinned version of pyopenssl
+    # once `TestDecryptPrivateKey::test_success` is updated to remove the deprecated `OpenSSL.crypto.sign` and
+    # `OpenSSL.crypto.verify` methods. See: https://www.pyopenssl.org/en/latest/changelog.html#id3.
+    "pyopenssl < 24.3.0",
     # TODO(https://github.com/googleapis/google-auth-library-python/issues/1722): `test_aiohttp_requests` depend on
-    # aiohttp < 3.10.0 which is a bug. Investigate and remove the pinned aiohttp version and use `aiohttp_extra_require`.
+    # aiohttp < 3.10.0 which is a bug. Investigate and remove the pinned aiohttp version.
     "aiohttp < 3.10.0",
-    *pyjwt_extra_require,
-    *reauth_extra_require,
-    *pyopenssl_extra_require,
 ]
 
 extras = {
     "aiohttp": aiohttp_extra_require,
     "pyopenssl": pyopenssl_extra_require,
     "requests": requests_extra_require,
-    "urllib3": ["urllib3", "packaging"],
+    "urllib3": urllib3_extra_require,
     "reauth": reauth_extra_require,
     "enterprise_cert": enterprise_cert_extra_require,
     "pyjwt": pyjwt_extra_require,
     "testing": testing_extra_require,
-    # TODO(): Add an extra for `grpcio` dependency.
-    # TODO(): Add an extra for `oauth2client` dependency.
-    # TODO(): Add an extra for `urllib3` dependency.
+    # 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.
 }
 
 with io.open("README.rst", "r") as fh: