From 9f004bd534abc43c81b08630fb32352c245364cc Mon Sep 17 00:00:00 2001
From: Terry Cain <terrycain@users.noreply.github.com>
Date: Fri, 21 Feb 2020 07:04:42 +0000
Subject: [PATCH] Dependencies bump (#767)

* Reviewed patches

* Fixed patch, updated test_patches to be more specific on ClientCreator class

* Fixed flake
---
 CHANGES.rst           |  5 +++++
 aiobotocore/args.py   |  6 +-----
 aiobotocore/client.py |  4 ++--
 requirements-dev.txt  | 10 +++++-----
 setup.py              |  6 +++---
 tests/test_patches.py |  9 +++++----
 6 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index f9abf760..679f9cc3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,11 @@
 Changes
 -------
 
+0.12.0 (TBD)
+^^^^^^^^^^^^
+
+* Bump botocore and extras
+
 0.11.1 (2020-01-03)
 ^^^^^^^^^^^^^^^^^^^
 * Fixed event streaming API calls like S3 Select.
diff --git a/aiobotocore/args.py b/aiobotocore/args.py
index d533f97c..2ff61f78 100644
--- a/aiobotocore/args.py
+++ b/aiobotocore/args.py
@@ -23,7 +23,7 @@ def get_client_args(self, service_model, region_name, is_secure,
             service_model, client_config, endpoint_bridge, region_name,
             endpoint_url, is_secure, scoped_config)
 
-        service_name = final_args['service_name']
+        # service_name = final_args['service_name']
         parameter_validation = final_args['parameter_validation']
         endpoint_config = final_args['endpoint_config']
         protocol = final_args['protocol']
@@ -34,10 +34,6 @@ def get_client_args(self, service_model, region_name, is_secure,
 
         signing_region = endpoint_config['signing_region']
         endpoint_region_name = endpoint_config['region_name']
-        if signing_region is None and endpoint_region_name is None:
-            signing_region, endpoint_region_name = \
-                self._get_default_s3_region(service_name, endpoint_bridge)
-            config_kwargs['region_name'] = endpoint_region_name
 
         event_emitter = copy.copy(self._event_emitter)
         signer = RequestSigner(
diff --git a/aiobotocore/client.py b/aiobotocore/client.py
index 351a007d..1ed43608 100644
--- a/aiobotocore/client.py
+++ b/aiobotocore/client.py
@@ -42,8 +42,8 @@ def _get_client_args(self, service_model, region_name, is_secure,
         args_creator = AioClientArgsCreator(
             self._event_emitter, self._user_agent,
             self._response_parser_factory, self._loader,
-            self._exceptions_factory, loop=self._loop,
-            config_store=self._config_store)
+            self._exceptions_factory, config_store=self._config_store,
+            loop=self._loop)
         return args_creator.get_client_args(
             service_model, region_name, is_secure, endpoint_url,
             verify, credentials, scoped_config, client_config, endpoint_bridge)
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 4eb668b7..e9055a77 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,6 +1,6 @@
 -e .
 coverage==5.0.3
-flake8==3.7.8
+flake8==3.7.9
 flake8-formatter-abspath==1.0.1
 # we specify flask directly and don't use moto[server] as we want to fix the flask version
 Flask==1.1.1
@@ -14,12 +14,12 @@ pytest-xdist==1.31.0
 sphinx==2.4.1
 yarl==1.4.2
 multidict==4.7.4
-wrapt==1.11.2
+wrapt==1.12.0
 dill==0.3.1.1
 
 # The following are what give the most headaches
 aiohttp==3.3.2
 
-botocore==1.13.14
-boto3==1.10.14
-awscli==1.16.278
+botocore==1.15.3
+boto3==1.12.3
+awscli==1.18.3
diff --git a/setup.py b/setup.py
index 74ff5e14..89572153 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@
 # NOTE: When updating botocore make sure to update awscli/boto3 versions below
 install_requires = [
     # pegged to also match items in `extras_require`
-    'botocore>=1.13.14,<1.13.15',
+    'botocore>=1.15.3,<1.15.16',
     'aiohttp>=3.3.1',
     'wrapt>=1.10.10',
     'async_generator>=1.10',  # can remove if we move to py3.6+
@@ -25,8 +25,8 @@ def read(f):
 
 
 extras_require = {
-    'awscli': ['awscli==1.16.278'],
-    'boto3': ['boto3==1.10.14'],
+    'awscli': ['awscli==1.18.3'],
+    'boto3': ['boto3==1.12.3'],
 }
 
 
diff --git a/tests/test_patches.py b/tests/test_patches.py
index 5f6ece1d..47b7e45c 100644
--- a/tests/test_patches.py
+++ b/tests/test_patches.py
@@ -54,15 +54,16 @@
 
 # If you're changing these, most likely need to update setup.py as well.
 _API_DIGESTS = {
-    ClientArgsCreator: {'a23c040b65096dd26abdaa321ba58612fbbfb4fe'},
-    ClientCreator: {'c4abf80fa41d9f4713b9c83d504c759ed905992e'},
+    ClientArgsCreator: {'917d7f5a85d2497c0ee0d7f368a4e6a723bb534a'},
+    ClientCreator._create_client_class: {'5e493d069eedbf314e40e12a7886bbdbcf194335'},
+    ClientCreator._get_client_args: {'555e1e41f93df7558c8305a60466681e3a267ef3'},
     BaseClient: {'d2e69f0184ae83df5b82284194ed1b72191f0161'},
-    Config: {'72129553174455492825ec92ea5d6e66307ed74f'},
+    Config: {'2dcc44190a3dc2a4b26ab0ed9410daefcd7c93c1'},
     convert_to_response_dict: {'2c73c059fa63552115314b079ae8cbf5c4e78da0'},
     Endpoint: {'6839b062c5223d94aaf894dce6ade8606c388b4f'},
     EndpointCreator: {'633337fe0bda97e57c7f0b9596c5a158a03e8e36'},
     PageIterator: {'0409f7878b3493566be5761f5799ed93563f3e20'},
-    Session: {'16b4a08b3b5792d5d9c639b7a07d01902205b238'},
+    Session: {'36b41d75c22bc86afc889a56de92f1f95f836e20'},
     get_session: {'c47d588f5da9b8bde81ccc26eaef3aee19ddd901'},
     NormalizedOperationMethod: {'ee88834b123c6c77dfea0b4208308cd507a6ba36'},
     EventStream: {'0e68633755a7dd4ff79c6d7ca778800a7bc86d3b'},