Bump botocore dependency specification (#1387)

Author: jakob-keller

CHANGES.rst

@@ -1,6 +1,10 @@
 Changes
 -------
 
+2.23.2 (2025-07-24)
+^^^^^^^^^^^^^^^^^^^
+* bump botocore dependency specification
+
 2.23.1 (2025-07-16)
 ^^^^^^^^^^^^^^^^^^^
 * bump botocore dependency specification

aiobotocore/__init__.py

@@ -1 +1 @@
-__version__ = '2.23.1'
+__version__ = '2.23.2'

aiobotocore/client.py

@@ -81,6 +81,10 @@ async def create_client(
             config_store=self._config_store,
             service_signature_version=service_signature_version,
         )
+        if token := self._evaluate_client_specific_token(
+            service_model.signing_name
+        ):
+            auth_token = token
         client_args = self._get_client_args(
             service_model,
             region_name,
@@ -355,6 +359,7 @@ async def _make_api_call(self, operation_name, api_params):
             'has_streaming_input': operation_model.has_streaming_input,
             'auth_type': operation_model.resolved_auth_type,
             'unsigned_payload': operation_model.unsigned_payload,
+            'auth_options': self._service_model.metadata.get('auth'),
         }
 
         api_params = await self._emit_api_params(
@@ -412,9 +417,9 @@ async def _make_api_call(self, operation_name, api_params):
 
         if http.status_code >= 300:
             error_info = parsed_response.get("Error", {})
-            error_code = error_info.get("QueryErrorCode") or error_info.get(
-                "Code"
-            )
+            error_code = request_context.get(
+                'error_code_override'
+            ) or error_info.get("Code")
             error_class = self.exceptions.from_code(error_code)
             raise error_class(parsed_response, operation_name)
         else:

aiobotocore/endpoint.py

@@ -30,10 +30,9 @@
 async def convert_to_response_dict(http_response, operation_model):
     """Convert an HTTP response object to a request dict.
 
-    This converts the requests library's HTTP response object to
-    a dictionary.
+    This converts the HTTP response object to a dictionary.
 
-    :type http_response: botocore.vendored.requests.model.Response
+    :type http_response: botocore.awsrequest.AWSResponse
     :param http_response: The HTTP response from an AWS service request.
 
     :rtype: dict

aiobotocore/session.py

@@ -234,6 +234,7 @@ async def _create_client(
             exceptions_factory,
             config_store,
             user_agent_creator=user_agent_creator,
+            auth_token_resolver=self.get_auth_token,
         )
         client = await client_creator.create_client(
             service_name=service_name,

aiobotocore/signers.py

@@ -12,6 +12,7 @@
     create_request_object,
     prepare_request_dict,
 )
+from botocore.tokens import FrozenAuthToken
 from botocore.utils import ArnParser
 
 
@@ -146,9 +147,12 @@ async def get_auth_instance(
             )
 
         if cls.REQUIRES_TOKEN is True:
-            frozen_token = None
-            if self._auth_token is not None:
+            if self._auth_token and not isinstance(
+                self._auth_token, FrozenAuthToken
+            ):
                 frozen_token = await self._auth_token.get_frozen_token()
+            else:
+                frozen_token = self._auth_token
             auth = cls(frozen_token)
             return auth
 

aiobotocore/tokens.py

@@ -8,6 +8,7 @@
 from botocore.tokens import (
     DeferredRefreshableToken,
     FrozenAuthToken,
+    ScopedEnvTokenProvider,
     SSOTokenProvider,
     TokenProviderChain,
     _utc_now,
@@ -18,6 +19,7 @@
 
 def create_token_resolver(session):
     providers = [
+        ScopedEnvTokenProvider(session),
         AioSSOTokenProvider(session),
     ]
     return TokenProviderChain(providers=providers)
@@ -150,7 +152,7 @@ async def _refresher(self):
             token_dict["accessToken"], expiration=expiration
         )
 
-    def load_token(self):
+    def load_token(self, **kwargs):
         if self._sso_config is None:
             return None
 

pyproject.toml

@@ -31,7 +31,7 @@ dynamic = ["version", "readme"]
 dependencies = [
     "aiohttp >= 3.9.2, < 4.0.0",
     "aioitertools >= 0.5.1, < 1.0.0",
-    "botocore >= 1.38.40, < 1.38.47", # NOTE: When updating, always keep `project.optional-dependencies` aligned
+    "botocore >= 1.39.7, < 1.39.9", # NOTE: When updating, always keep `project.optional-dependencies` aligned
     "python-dateutil >= 2.1, < 3.0.0",
     "jmespath >= 0.7.1, < 2.0.0",
     "multidict >= 6.0.0, < 7.0.0",
@@ -40,10 +40,10 @@ dependencies = [
 
 [project.optional-dependencies]
 awscli = [
-    "awscli >= 1.40.39, < 1.40.46",
+    "awscli >= 1.41.7, < 1.41.9",
 ]
 boto3 = [
-    "boto3 >= 1.38.40, < 1.38.47",
+    "boto3 >= 1.39.7, < 1.39.9",
 ]
 httpx = [
     "httpx >= 0.25.1, < 0.29"
@@ -107,12 +107,6 @@ markers = [
     "patch_attributes",
 ]
 
-[tool.isort]
-profile = "black"
-line_length = 79
-honor_noqa = true
-src_paths = ["aiobotocore", "tests"]
-
 [tool.ruff]
 exclude = [
     ".bzr",

tests/botocore_tests/__init__.py

@@ -163,3 +163,16 @@ class ClientHTTPStubber(BaseHTTPStubber):
     @property
     def _events(self):
         return self._obj_with_event_emitter.meta.events
+
+
+def patch_load_service_model(
+    session, monkeypatch, service_model_json, ruleset_json
+):
+    def mock_load_service_model(service_name, type_name, api_version=None):
+        if type_name == 'service-2':
+            return service_model_json
+        if type_name == 'endpoint-rule-set-1':
+            return ruleset_json
+
+    loader = session.get_component('data_loader')
+    monkeypatch.setattr(loader, 'load_service_model', mock_load_service_model)

tests/botocore_tests/functional/conftest.py

@@ -0,0 +1,14 @@
+import pytest
+
+from tests.botocore_tests import create_session
+
+
+@pytest.fixture()
+def patched_session(monkeypatch):
+    monkeypatch.setenv('AWS_ACCESS_KEY_ID', 'access_key')
+    monkeypatch.setenv('AWS_SECRET_ACCESS_KEY', 'secret_key')
+    monkeypatch.setenv('AWS_CONFIG_FILE', 'no-exist-foo')
+    monkeypatch.delenv('AWS_PROFILE', raising=False)
+    monkeypatch.delenv('AWS_DEFAULT_REGION', raising=False)
+    session = create_session()
+    return session