Merge pull request #25 from aws/linter_fixes

Linter fixes

Author: rstevens011

README.md

@@ -27,7 +27,6 @@ For development and testing purposes, this library requires the following additi
 * pytest-sugar
 * codecov
 * pylint
-* isort
 * sphinx
 
 Please review the `requirements.txt` and `dev-requirements.txt` file for specific version requirements.

dev-requirements.txt

@@ -3,5 +3,4 @@ pytest-cov
 pytest-sugar
 codecov>=1.4.0
 pylint>1.9.4
-isort>=4.3.4
 sphinx>=1.8.4

setup.cfg

@@ -21,10 +21,3 @@ select = C,E,F,W,B
 # C812, W503 clash with black
 ignore = C812,W503
 exclude = venv,.venv,.tox,dist,doc,build,*.egg
-
-[isort]
-line_length = 120
-multi_line_output = 5
-include_trailing_comma = true
-force_grid_wrap = 0
-combine_as_imports = true

src/aws_secretsmanager_caching/cache/items.py

@@ -11,6 +11,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 """Secret cache items"""
+# pylint: disable=super-with-arguments
 
 import threading
 from abc import ABCMeta, abstractmethod

src/aws_secretsmanager_caching/decorators.py

@@ -85,15 +85,15 @@ def __call__(self, func):
         try:
             secret = json.loads(self.cache.get_secret_string(secret_id=self.secret_id))
         except json.decoder.JSONDecodeError:
-            raise RuntimeError('Cached secret is not valid JSON')
+            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]
             try:
                 resolved_kwargs[orig_kwarg] = secret[secret_key]
             except KeyError:
-                raise RuntimeError('Cached secret does not contain key {0}'.format(secret_key))
+                raise RuntimeError('Cached secret does not contain key {0}'.format(secret_key)) from None
 
         def _wrapped_func(*args, **kwargs):
             """

tox.ini

@@ -5,7 +5,7 @@
 
 
 [tox]
-envlist = py36, py37, flake8, pylint, isort
+envlist = py36, py37, flake8, pylint
 skip_missing_interpreters = true
 
 [testenv]
@@ -38,10 +38,6 @@ commands=pytest {posargs}
 [testenv:pylint]
 commands = pylint --rcfile=.pylintrc src/aws_secretsmanager_caching
 
-[testenv:isort]
-changedir = {toxinidir}
-commands = isort --recursive --check-only --diff src/aws_secretsmanager_caching test
-
 
 [testenv:docs]
 changedir = {toxinidir}