From 05f95246fab928fe2f445781117eeac8088497fb Mon Sep 17 00:00:00 2001
From: Tres Seaver <tseaver@palladion.com>
Date: Mon, 26 Oct 2020 20:52:11 -0400
Subject: [PATCH] fix: pin 'aoihttp < 3.7.0dev' (#634)

Working around breaking change in 3.7.0.  See:

https://github.com/pnuckowski/aioresponses/issues/173
---
 noxfile.py              | 7 ++++++-
 setup.py                | 2 +-
 system_tests/noxfile.py | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/noxfile.py b/noxfile.py
index b92f4939d..388814491 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -30,7 +30,12 @@
     "grpcio",
 ]
 
-ASYNC_DEPENDENCIES = ["pytest-asyncio", "aioresponses", "asynctest"]
+ASYNC_DEPENDENCIES = [
+    "pytest-asyncio",
+    "aiohttp < 3.7.0dev",
+    "aioresponses",
+    "asynctest",
+]
 
 BLACK_VERSION = "black==19.3b0"
 BLACK_PATHS = [
diff --git a/setup.py b/setup.py
index 522b98103..16c277950 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@
     "six>=1.9.0",
 )
 
-extras = {"aiohttp": "aiohttp >= 3.6.2, < 4.0.0dev; python_version>='3.6'"}
+extras = {"aiohttp": "aiohttp >= 3.6.2, < 3.7.0dev; python_version>='3.6'"}
 
 with io.open("README.rst", "r") as fh:
     long_description = fh.read()
diff --git a/system_tests/noxfile.py b/system_tests/noxfile.py
index a039228d9..0f852ea27 100644
--- a/system_tests/noxfile.py
+++ b/system_tests/noxfile.py
@@ -168,7 +168,7 @@ def configure_cloud_sdk(session, application_default_credentials, project=False)
 
 # Test sesssions
 
-TEST_DEPENDENCIES_ASYNC = ["aiohttp", "pytest-asyncio", "nest-asyncio"]
+TEST_DEPENDENCIES_ASYNC = ["aiohttp < 3.7.0dev", "pytest-asyncio", "nest-asyncio"]
 TEST_DEPENDENCIES_SYNC = ["pytest", "requests"]
 PYTHON_VERSIONS_ASYNC = ["3.7"]
 PYTHON_VERSIONS_SYNC = ["2.7", "3.7"]