Merge pull request #991 from theisensanders-wf/upgrade-aio-deps

Upgrade aio dependencies
Workiva · Apr 18, 2018 · 4a407a9 · 4a407a9
2 parents 94e131e + 1e24e30
commit 4a407a9
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/lib/python/frugal/aio/transport/http_transport.py b/lib/python/frugal/aio/transport/http_transport.py
@@ -130,7 +130,7 @@ async def _make_request(self, context: FContext, payload):
         # apply the default headers so their values cannot be modified
         request_headers.update(self._headers)
 
-        with ClientSession() as session:
+        async with ClientSession() as session:
             try:
                 with async_timeout.timeout(context.timeout / 1000):
                     async with session.post(self._url,

diff --git a/lib/python/frugal/tests/aio/server/test_http_handler.py b/lib/python/frugal/tests/aio/server/test_http_handler.py
@@ -38,7 +38,7 @@ async def test_basic(self):
         request_payload = base64.b64encode(request_frame)
         response_data = bytearray([6, 7, 8, 9])
         response_frame = bytearray([0, 0, 0, 4]) + response_data
-        request_payload_reader = StreamReader()
+        request_payload_reader = StreamReader(mock.Mock())
         request_payload_reader.feed_data(request_payload)
         request_payload_reader.feed_eof()
 
@@ -68,7 +68,7 @@ async def test_response_too_large(self):
         request_frame = bytearray([0, 0, 0, 3]) + request_data
         request_payload = base64.b64encode(request_frame)
         response_data = bytearray([6, 7, 8, 9, 10, 11])
-        request_payload_reader = StreamReader()
+        request_payload_reader = StreamReader(mock.Mock())
         request_payload_reader.feed_data(request_payload)
         request_payload_reader.feed_eof()
 

diff --git a/lib/python/requirements_dev_asyncio.txt b/lib/python/requirements_dev_asyncio.txt
@@ -1,6 +1,6 @@
-asyncio-nats-client==0.6.4
+asyncio-nats-client==0.7.0
 multidict==3.1.3 # DO NOT CHANGE without verifying asyncio nats with tls works
-aiohttp==2.3.8
-async-timeout==1.1.0
+aiohttp==3.1.2
+async-timeout==2.0.1
 
 -r requirements_dev_common.txt
diff --git a/lib/python/requirements_dev_common.txt b/lib/python/requirements_dev_common.txt
@@ -3,7 +3,6 @@ nose-exclude==0.4.1
 rednose==1.2.1
 mock==1.0.1
 coverage==4.2
-setuptools==7.0
 flake8==3.3.0
 
 -r requirements.txt
diff --git a/lib/python/setup.py b/lib/python/setup.py
@@ -29,11 +29,11 @@
     extras_require={
         'tornado': ["nats-client==0.5.0"],
         'asyncio': [
-            "async-timeout==1.1.0",
-            "asyncio-nats-client==0.6.4",
+            "async-timeout==2.0.1",
+            "asyncio-nats-client==0.7.0",
             # DO NOT CHANGE without verifying asyncio nats with tls works
             "multidict==3.1.3",
-            "aiohttp==2.3.8",
+            "aiohttp==3.1.2",
         ],
         'gae': ["webapp2==2.5.2"],
     }

diff --git a/scripts/smithy/smithy_python.sh b/scripts/smithy/smithy_python.sh
@@ -5,7 +5,7 @@ set -e
 # Python
 virtualenv -p /usr/bin/python /tmp/frugal
 source /tmp/frugal/bin/activate
-pip install -U pip
+pip install -U pip setuptools==39.0.1
 cd $FRUGAL_HOME/lib/python
 make deps-tornado
 make deps-gae
@@ -20,7 +20,7 @@ deactivate
 
 virtualenv -p /usr/bin/python3.5 /tmp/frugal-py3
 source /tmp/frugal-py3/bin/activate
-pip install -U pip
+pip install -U pip setuptools==39.0.1
 cd $FRUGAL_HOME/lib/python
 make deps-asyncio
 make xunit-py3
@@ -37,4 +37,4 @@ mv $FRUGAL_HOME/lib/python/coverage.xml $FRUGAL_HOME/lib/python/coverage_py3.xml
 
 $FRUGAL_HOME/scripts/smithy/codecov.sh $FRUGAL_HOME/lib/python/coverage_py3.xml python_three
 
-deactivate
+deactivate