Bump botocore dependency specification

Author: jakob-keller

aiobotocore/discovery.py

@@ -33,7 +33,8 @@ async def describe_endpoint(self, **kwargs):
         if not self._always_discover and not discovery_required:
             # Discovery set to only run on required operations
             logger.debug(
-                f'Optional discovery disabled. Skipping discovery for Operation: {operation}'
+                'Optional discovery disabled. Skipping discovery for Operation: %s',
+                operation,
             )
             return None
 

aiobotocore/httpchecksum.py

@@ -196,8 +196,8 @@ async def handle_checksum_body(
         return
 
     logger.debug(
-        f'Skipping checksum validation. Response did not contain one of the '
-        f'following algorithms: {algorithms}.'
+        'Skipping checksum validation. Response did not contain one of the following algorithms: %s.',
+        algorithms,
     )
 
 

aiobotocore/regions.py

@@ -27,7 +27,7 @@ async def construct_endpoint(
             operation_model, call_args, request_context
         )
         LOG.debug(
-            f'Calling endpoint provider with parameters: {provider_params}'
+            'Calling endpoint provider with parameters: %s', provider_params
         )
         try:
             provider_result = self._provider.resolve_endpoint(
@@ -41,7 +41,7 @@ async def construct_endpoint(
                 raise
             else:
                 raise botocore_exception from ex
-        LOG.debug(f'Endpoint provider result: {provider_result.url}')
+        LOG.debug('Endpoint provider result: %s', provider_result.url)
 
         # The endpoint provider does not support non-secure transport.
         if not self._use_ssl and provider_result.url.startswith('https://'):

aiobotocore/session.py

@@ -191,8 +191,9 @@ async def _create_client(
                 aws_session_token, aws_account_id
             ):
                 logger.debug(
-                    f"Ignoring the following credential-related values which were set without "
-                    f"an access key id and secret key on the session or client: {ignored_credentials}"
+                    "Ignoring the following credential-related values which were set without "
+                    "an access key id and secret key on the session or client: %s",
+                    ignored_credentials,
                 )
             credentials = await self.get_credentials()
         auth_token = self.get_auth_token()

aiobotocore/signers.py

@@ -2,6 +2,7 @@
 
 import botocore
 import botocore.auth
+from botocore.compat import get_current_datetime
 from botocore.exceptions import ParamValidationError, UnknownClientMethodError
 from botocore.signers import (
     RequestSigner,
@@ -368,7 +369,7 @@ async def generate_presigned_post(
         policy = {}
 
         # Create an expiration date for the policy
-        datetime_now = datetime.datetime.utcnow()
+        datetime_now = get_current_datetime()
         expire_date = datetime_now + datetime.timedelta(seconds=expires_in)
         policy['expiration'] = expire_date.strftime(botocore.auth.ISO8601)
 

aiobotocore/tokens.py

@@ -125,7 +125,7 @@ async def _refresh_access_token(self, token):
 
         expiry = dateutil.parser.parse(token["registrationExpiresAt"])
         if total_seconds(expiry - self._now()) <= 0:
-            logger.info(f"SSO token registration expired at {expiry}")
+            logger.info("SSO token registration expired at %s", expiry)
             return None
 
         try:
@@ -137,10 +137,10 @@ async def _refresh_access_token(self, token):
     async def _refresher(self):
         start_url = self._sso_config["sso_start_url"]
         session_name = self._sso_config["session_name"]
-        logger.info(f"Loading cached SSO token for {session_name}")
+        logger.info("Loading cached SSO token for %s", session_name)
         token_dict = self._token_loader(start_url, session_name=session_name)
         expiration = dateutil.parser.parse(token_dict["expiresAt"])
-        logger.debug(f"Cached SSO token expires at {expiration}")
+        logger.debug("Cached SSO token expires at %s", expiration)
 
         remaining = total_seconds(expiration - self._now())
         if remaining < self._REFRESH_WINDOW:

aiobotocore/utils.py

@@ -486,16 +486,21 @@ async def redirect_from_error(
 
         if new_region is None:
             logger.debug(
-                f"S3 client configured for region {client_region} but the "
-                f"bucket {bucket} is not in that region and the proper region "
-                "could not be automatically determined."
+                "S3 client configured for region %s but the "
+                "bucket %s is not in that region and the proper region "
+                "could not be automatically determined.",
+                client_region,
+                bucket,
             )
             return
 
         logger.debug(
-            f"S3 client configured for region {client_region} but the bucket {bucket} "
-            f"is in region {new_region}; Please configure the proper region to "
-            f"avoid multiple unnecessary redirects and signing attempts."
+            "S3 client configured for region %s but the bucket %s "
+            "is in region %s; Please configure the proper region to "
+            "avoid multiple unnecessary redirects and signing attempts.",
+            client_region,
+            bucket,
+            new_region,
         )
         # Adding the new region to _cache will make construct_endpoint() to
         # use the new region as value for the AWS::Region builtin parameter.
@@ -622,16 +627,21 @@ async def redirect_from_error(
 
         if new_region is None:
             logger.debug(
-                f"S3 client configured for region {client_region} but the bucket {bucket} is not "
+                "S3 client configured for region %s but the bucket %s is not "
                 "in that region and the proper region could not be "
-                "automatically determined."
+                "automatically determined.",
+                client_region,
+                bucket,
             )
             return
 
         logger.debug(
-            f"S3 client configured for region {client_region} but the bucket {bucket} is in region"
-            f" {new_region}; Please configure the proper region to avoid multiple "
-            "unnecessary redirects and signing attempts."
+            "S3 client configured for region %s but the bucket %s is in region"
+            " %s; Please configure the proper region to avoid multiple "
+            "unnecessary redirects and signing attempts.",
+            client_region,
+            bucket,
+            new_region,
         )
         endpoint = self._endpoint_resolver.resolve('s3', new_region)
         endpoint = endpoint['endpoint_url']

pyproject.toml

@@ -32,7 +32,7 @@ dynamic = ["version", "readme"]
 dependencies = [
     "aiohttp >= 3.9.2, < 4.0.0",
     "aioitertools >= 0.5.1, < 1.0.0",
-    "botocore >= 1.39.15, < 1.40.2", # NOTE: When updating, always keep `project.optional-dependencies` aligned
+    "botocore >= 1.40.2, < 1.40.6", # 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",
@@ -41,10 +41,10 @@ dependencies = [
 
 [project.optional-dependencies]
 awscli = [
-    "awscli >= 1.41.15, < 1.42.2",
+    "awscli >= 1.42.2, < 1.42.6",
 ]
 boto3 = [
-    "boto3 >= 1.39.15, < 1.40.2",
+    "boto3 >= 1.40.2, < 1.40.6",
 ]
 httpx = [
     "httpx >= 0.25.1, < 0.29"
@@ -145,10 +145,17 @@ indent-width = 4
 target-version = "py39"
 
 [tool.ruff.lint]
-# Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`)  codes by default.
 # Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or
 # McCabe complexity (`C901`) by default.
-select = ["E4", "E7", "E9", "F", "I", "UP"]
+select = [
+    "E4", # pycodestyle
+    "E7", # pycodestyle
+    "E9", # pycodestyle
+    "F", # Pyflakes
+    "I", # Import sorting
+    "UP", # PyUpgrade
+    "G", # Log formatting
+]
 ignore = []
 
 # Allow fix for all enabled rules (when `--fix`) is provided.

tests/botocore_tests/unit/test_signers.py

@@ -44,7 +44,7 @@ async def test_signers_generate_db_auth_token(rds_client):
     clock = datetime.datetime(2016, 11, 7, 17, 39, 33, tzinfo=timezone.utc)
 
     with mock.patch('datetime.datetime') as dt:
-        dt.utcnow.return_value = clock
+        dt.now.return_value = clock
         result = await aiobotocore.signers.generate_db_auth_token(
             rds_client, hostname, port, username
         )

tests/test_patches.py

@@ -907,8 +907,7 @@ def test_protocol_parsers():
         (
             EndpointRulesetResolver.construct_endpoint,
             {
-                'ccbed61e316a0e92e1d0f67c554ee15efa4ee6b8',
-                'ab22bb1ec171713e548567fbe84dd88a3d5f4b76',
+                'f3ad94494006fcfdbd622f6c19e0de9fba0ad199',
             },
         ),
         (
@@ -928,7 +927,7 @@ def test_protocol_parsers():
         (
             StreamingBody,
             {
-                'e6f0cb3b61c8b0a7c6961e77949e27c520b30a5c',
+                'e358f72191c4c1cb37d8fe90871342abf79afde2',
             },
         ),
         (
@@ -1065,8 +1064,7 @@ def test_protocol_parsers():
         (
             S3PostPresigner.generate_presigned_post,
             {
-                '269efc9af054a2fd2728d5b0a27db82c48053d7f',
-                '48418dc6c9b04fdc8689c7cb5b6eb987321a84e3',
+                '01c61dc0f33392a19def738afc634f5def401e32',
             },
         ),
         (
@@ -1158,13 +1156,13 @@ def test_protocol_parsers():
         (
             SSOTokenProvider._refresh_access_token,
             {
-                'cb179d1f262e41cc03a7c218e624e8c7fbeeaf19',
+                '6263c009e6d86011ca1226d61ea95163bbfca258',
             },
         ),
         (
             SSOTokenProvider._refresher,
             {
-                '824d41775dbb8a05184f6e9c7b2ea7202b72f2a9',
+                'd89b3446344826e5b740840c12fd9279810c45d2',
             },
         ),
         (
@@ -1285,7 +1283,7 @@ def test_protocol_parsers():
         (
             S3RegionRedirectorv2.redirect_from_error,
             {
-                '8e3003ec881c7eab0945fe4b6e021ca488fbcd78',
+                '2a715115e94bddcea4cce936bf7c7013f1f6ecdf',
             },
         ),
         (
@@ -1297,8 +1295,7 @@ def test_protocol_parsers():
         (
             S3RegionRedirector.redirect_from_error,
             {
-                '3863b2c6472513b7896bfccc9dfd2567c472f441',
-                'e1d93a4a85dfbfa810b9249da0b22ce14744b99d',
+                '5db904d0311db5c875aed0f6a78278f173ca40a7',
             },
         ),
         (
@@ -1428,8 +1425,7 @@ def test_protocol_parsers():
         (
             EndpointDiscoveryManager.describe_endpoint,
             {
-                'b2f1b29177cf30f299e61b85ddec09eaa070e54e',
-                'cbd237b874daef01cf7be82fef30516557ba17f9',
+                '2d7c40eec571a14e6e3968b710c23677ae3685e6',
             },
         ),
         (
@@ -1524,7 +1520,7 @@ def test_protocol_parsers():
         (
             handle_checksum_body,
             {
-                '040cb48d8ebfb5ca195d41deb55b38d1fcb489f8',
+                'f019114f7fc3a4e200157b9689ed8a1cc9d72825',
             },
         ),
         (