Fix Flake8/PyLint errors, upgrade pytest

Author: simonmarty

dev-requirements.txt

@@ -1,4 +1,4 @@
-pytest<7.3.0
+pytest
 pytest-cov
 pytest-sugar
 codecov>=1.4.0

src/aws_secretsmanager_caching/config.py

@@ -67,7 +67,7 @@ def __init__(self, **kwargs):
                     options[key] = value
                 # The key must exist in the available options
                 else:
-                    raise TypeError("Unexpected keyword argument '%s'" % key)
+                    raise TypeError(f"Unexpected keyword argument {key}")
 
         # Set the attributes based on the config options
         for key, value in options.items():

src/aws_secretsmanager_caching/decorators.py

@@ -87,13 +87,12 @@ def __call__(self, func):
         except json.decoder.JSONDecodeError:
             raise RuntimeError('Cached secret is not valid JSON') from None
 
-        resolved_kwargs = dict()
-        for orig_kwarg in self.kwarg_map:
-            secret_key = self.kwarg_map[orig_kwarg]
+        resolved_kwargs = {}
+        for orig_kwarg, secret_key in self.kwarg_map.items():
             try:
                 resolved_kwargs[orig_kwarg] = secret[secret_key]
             except KeyError:
-                raise RuntimeError('Cached secret does not contain key {0}'.format(secret_key)) from None
+                raise RuntimeError(f'Cached secret does not contain key {secret_key}') from None
 
         def _wrapped_func(*args, **kwargs):
             """

test/unit/test_config.py

@@ -36,4 +36,4 @@ def test_config_default_version_stage(self):
 
     def test_default_secret_refresh_interval_typing(self):
         config = SecretCacheConfig()
-        self.assertIsInstance(config.secret_refresh_interval, int)
+        self.assertIsInstance(config.secret_refresh_interval, int)

test/unit/test_items.py

@@ -77,18 +77,19 @@ def test_datetime_fix_refresh(self):
 
         t_before_delay = t_before + timedelta(
             milliseconds=secret_cached_object._config.exception_retry_delay_base * (
-                    secret_cached_object._config.exception_retry_growth_factor ** exp_factor
+                secret_cached_object._config.exception_retry_growth_factor ** exp_factor
             )
         )
         self.assertLessEqual(t_before_delay, secret_cached_object._next_retry_time)
 
         t_after_delay = t_after + timedelta(
             milliseconds=secret_cached_object._config.exception_retry_delay_base * (
-                    secret_cached_object._config.exception_retry_growth_factor ** exp_factor
+                secret_cached_object._config.exception_retry_growth_factor ** exp_factor
             )
         )
         self.assertGreaterEqual(t_after_delay, secret_cached_object._next_retry_time)
 
+
 class TestSecretCacheItem(unittest.TestCase):
     def setUp(self):
         pass