fix: add extra for aiohttp

parthea · parthea · commit 700a47f87aba · 2024-09-20T20:05:53.000Z
diff --git a/google/api_core/rest_streaming_async.py b/google/api_core/rest_streaming_async.py
@@ -22,7 +22,7 @@
     import google.auth.aio.transport
 except ImportError as e:  # pragma: NO COVER
     raise ImportError(
-        "google-auth>=2.35.0 is required to use asynchronous rest streaming."
+        "google-api-core[async_rest] is required to use asynchronous rest streaming."
     ) from e
 
 import google.protobuf.message
diff --git a/noxfile.py b/noxfile.py
@@ -110,7 +110,7 @@ def install_prerelease_dependencies(session, constraints_path):
         session.install(*other_deps)
 
 
-def default(session, install_grpc=True, prerelease=False, install_auth_aio=False):
+def default(session, install_grpc=True, prerelease=False, install_async_rest=False):
     """Default unit test session.
 
     This is intended to be run **without** an interpreter set, so
@@ -136,20 +136,28 @@ def default(session, install_grpc=True, prerelease=False, install_auth_aio=False
             session, f"{constraints_dir}/constraints-{PYTHON_VERSIONS[0]}.txt"
         )
         # This *must* be the last install command to get the package from source.
-        session.install("-e", ".", "--no-deps")
+        session.install(
+            "-e", "." + ("[async_rest]" if install_async_rest else ""), "--no-deps"
+        )
     else:
         session.install(
             "-e",
-            ".[grpc]" if install_grpc else ".",
+            "."
+            + (
+                "[grpc,async_rest]"
+                if install_grpc and install_async_rest
+                else (
+                    "[grpc]"
+                    if install_grpc
+                    else "[async_rest]"
+                    if install_async_rest
+                    else ""
+                )
+            ),
             "-c",
             f"{constraints_dir}/constraints-{session.python}.txt",
         )
 
-    if install_auth_aio:
-        session.install(
-            "google-auth @ git+https://git@github.com/googleapis/google-auth-library-python@8833ad6f92c3300d6645355994c7db2356bd30ad"
-        )
-
     # Print out package versions of dependencies
     session.run(
         "python", "-c", "import google.protobuf; print(google.protobuf.__version__)"
@@ -236,9 +244,9 @@ def unit_wo_grpc(session):
 
 
 @nox.session(python=PYTHON_VERSIONS)
-def unit_with_auth_aio(session):
-    """Run the unit test suite with google.auth.aio installed"""
-    default(session, install_auth_aio=True)
+def unit_with_async_rest_extra(session):
+    """Run the unit test suite with the `async_rest` extra"""
+    default(session, install_async_rest=True)
 
 
 @nox.session(python=DEFAULT_PYTHON_VERSION)
@@ -261,7 +269,7 @@ def mypy(session):
     """Run type-checking."""
     # TODO(https://github.com/googleapis/python-api-core/issues/682):
     # Use the latest version of mypy instead of mypy<1.11.0
-    session.install(".[grpc]", "mypy<1.11.0")
+    session.install(".[grpc,async_rest]", "mypy<1.11.0")
     session.install(
         "types-setuptools",
         "types-requests",
diff --git a/setup.py b/setup.py
@@ -36,6 +36,9 @@
     "requests >= 2.18.0, < 3.0.0.dev0",
 ]
 extras = {
+    "async_rest": [
+        "google-auth[aiohttp] >= 2.35.0, < 3.0.dev0",
+    ],
     "grpc": [
         "grpcio >= 1.33.2, < 2.0dev",
         "grpcio >= 1.49.1, < 2.0dev; python_version>='3.11'",
diff --git a/tests/asyncio/test_rest_streaming_async.py b/tests/asyncio/test_rest_streaming_async.py
@@ -35,7 +35,7 @@
 
 if not AUTH_AIO_INSTALLED:  # pragma: NO COVER
     pytest.skip(
-        "google-auth>=2.35.0 is required to use asynchronous rest streaming.",
+        "google-api-core[async_rest] is required to use asynchronous rest streaming.",
         allow_module_level=True,
     )
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`
`36`	`36`	`if not AUTH_AIO_INSTALLED: # pragma: NO COVER`
`37`	`37`	`pytest.skip(`
`38`		`- "google-auth>=2.35.0 is required to use asynchronous rest streaming.",`
	`38`	`+ "google-api-core[async_rest] is required to use asynchronous rest streaming.",`
`39`	`39`	`allow_module_level=True,`
`40`	`40`	`)`
`41`	`41`