address PR feedback

Author: ohmayr

noxfile.py

@@ -89,7 +89,7 @@ def unit(session):
     constraints_path = str(
         CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
     )
-    session.install("-e", ".[testing_extra_require]", "-c", constraints_path)
+    session.install("-e", ".[testing]", "-c", constraints_path)
     session.run(
         "pytest",
         f"--junitxml=unit_{session.python}_sponge_log.xml",
@@ -104,7 +104,7 @@ def unit(session):
 
 @nox.session(python="3.8")
 def cover(session):
-    session.install("-e", ".[testing_extra_require]")
+    session.install("-e", ".[testing]")
     session.run(
         "pytest",
         "--cov=google.auth",
@@ -142,7 +142,7 @@ def docs(session):
 
 @nox.session(python="pypy")
 def pypy(session):
-    session.install("-e", ".[testing_extra_require]")
+    session.install("-e", ".[testing]")
     session.run(
         "pytest",
         f"--junitxml=unit_{session.python}_sponge_log.xml",

setup.py

@@ -27,6 +27,12 @@
     "rsa>=3.1.4,<5",
 )
 
+
+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
+
 # Unit test requirements.
 testing_extra_require = [
     "flask",
@@ -39,7 +45,6 @@
     "pytest-localserver",
     "pyu2f",
     "pyjwt",
-    "requests",
     "urllib3",
     "cryptography < 39.0.0",
     "responses",
@@ -48,17 +53,16 @@
     "pytest-asyncio; python_version > '3.0'",
     "aioresponses; python_version > '3.0'",
     "asynctest; python_version > '3.0'",
-    "aiohttp < 3.10.0; python_version > '3.0'",
-]
+] + aiohttp_extra_require
 
 extras = {
-    "aiohttp": ["aiohttp >= 3.6.2, < 4.0.0.dev0", "requests >= 2.20.0, < 3.0.0.dev0"],
+    "aiohttp": aiohttp_extra_require,
     "pyopenssl": ["pyopenssl>=20.0.0", "cryptography>=38.0.3"],
-    "requests": "requests >= 2.20.0, < 3.0.0.dev0",
+    "requests": requests_extra_require,
     "reauth": "pyu2f>=0.1.5",
     "enterprise_cert": ["cryptography", "pyopenssl"],
     "pyjwt": ["pyjwt>=2.0", "cryptography>=38.0.3"],
-    "testing_extra_require": testing_extra_require,
+    "testing": testing_extra_require,
 }
 
 with io.open("README.rst", "r") as fh: