Merged, blackend and isorted.

Added isort.cfg

Author: rohe

.isort.cfg

@@ -1,5 +1,3 @@
 [settings]
 force_single_line = 1
 known_first_party = cryptojwt
-known_third_party = pytest
-default_section = THIRDPARTY

.travis.yml

@@ -1,5 +1,6 @@
 sudo: false
 language: python
+cache: pip
 python:
   - 3.6
   - 3.7
@@ -8,18 +9,16 @@ python:
 addons:
   apt:
     packages:
-    -
+      -
 install:
   - pip install codecov
-  - pip install tox
-  - pip install tox-travis
-  - pip install isort
-  - pip install black
+  - pip install tox tox-travis
+  - pip install isort black
 script:
-  - isort --check --recursive src tests
-  - black --check src tests
   - codecov --version
   - tox
+  - isort --check -sl -p cryptojwt -rc src tests
+  - black --check src tests
 after_success:
   - codecov
 notifications:

setup.py

@@ -26,7 +26,7 @@
     version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]',
                         fd.read(), re.MULTILINE).group(1)
 
-tests_requires = ['responses', 'pytest', 'isort', 'black']
+tests_requires = ['responses', 'pytest', 'isort>=5.0.2', 'black']
 
 setup(
     name="cryptojwt",
@@ -53,7 +53,7 @@
     extras_require={
         'testing': tests_requires,
         'docs': ['Sphinx', 'sphinx-autobuild', 'alabaster'],
-        'quality': ['isort'],
+        'quality': ['isort>=5.0.2', 'black'],
     },
     scripts=glob.glob('script/*.py'),
     entry_points={

src/cryptojwt/__init__.py

@@ -15,9 +15,7 @@
 from .utils import split_token
 
 try:
-    from builtins import zip
-    from builtins import hex
-    from builtins import str
+    from builtins import hex, str, zip
 except ImportError:
     pass
 

src/cryptojwt/jws/jws.py

@@ -23,8 +23,7 @@
 from .utils import alg2keytype
 
 try:
-    from builtins import str
-    from builtins import object
+    from builtins import object, str
 except ImportError:
     pass
 

src/cryptojwt/jws/utils.py

@@ -1,5 +1,4 @@
 # import struct
-
 from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.primitives.asymmetric import padding
 

src/cryptojwt/tools/jwtpeek.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 
 # Thanks to @rohe Roland Hedberg for most of the lines in this script :).
-
 import argparse
 import json
 import os

src/cryptojwt/tools/keyconv.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 
 """Convert JWK from/to PEM and other formats"""
-
 import argparse
 import json
 from binascii import hexlify

src/cryptojwt/tools/keygen.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 
 """JSON Web Key (JWK) Generator"""
-
 import argparse
 import json
 import os

tests/test_02_jwk.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-
 from __future__ import print_function
 
 import base64