Merge pull request #64 from IdentityPython/develop

Prepare for release 1.2.0

Author: rohe

.coveragerc

@@ -13,12 +13,9 @@ addons:
 install:
   - pip install codecov
   - pip install tox tox-travis
-  - pip install isort black
 script:
   - codecov --version
   - tox
-  - isort --check src tests
-  - black -l 100 --check src tests
 after_success:
   - codecov
 notifications:

.travis.yml

@@ -31,36 +31,38 @@
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = ['sphinx.ext.autodoc',
-    'sphinx.ext.intersphinx',
-    'sphinx.ext.coverage',
-    'sphinx.ext.viewcode']
+extensions = [
+    "sphinx.ext.autodoc",
+    "sphinx.ext.intersphinx",
+    "sphinx.ext.coverage",
+    "sphinx.ext.viewcode",
+]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 #
 # source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # General information about the project.
-project = 'CryptoJWT'
-copyright = '2018, Roland Hedberg'
-author = 'Roland Hedberg'
+project = "CryptoJWT"
+copyright = "2018, Roland Hedberg"
+author = "Roland Hedberg"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.4'
+version = "0.4"
 # The full version, including alpha/beta/rc tags.
-release = '0.4'
+release = "0.4"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -72,10 +74,10 @@
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This patterns also effect to html_static_path and html_extra_path
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = False
@@ -86,7 +88,7 @@
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'default'
+html_theme = "default"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -97,25 +99,25 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ["_static"]
 
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.
 #
 # This is required for the alabaster theme
 # refs: http://alabaster.readthedocs.io/en/latest/installation.html#sidebars
 html_sidebars = {
-    '**': [
-        'relations.html',  # needs 'show_related': True theme option to display
-        'searchbox.html',
+    "**": [
+        "relations.html",  # needs 'show_related': True theme option to display
+        "searchbox.html",
     ]
 }
 
 
 # -- Options for HTMLHelp output ------------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'CryptoJWTdoc'
+htmlhelp_basename = "CryptoJWTdoc"
 
 
 # -- Options for LaTeX output ---------------------------------------------
@@ -124,15 +126,12 @@
     # The paper size ('letterpaper' or 'a4paper').
     #
     # 'papersize': 'letterpaper',
-
     # The font size ('10pt', '11pt' or '12pt').
     #
     # 'pointsize': '10pt',
-
     # Additional stuff for the LaTeX preamble.
     #
     # 'preamble': '',
-
     # Latex figure (float) alignment
     #
     # 'figure_align': 'htbp',
@@ -142,19 +141,15 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'CryptoJWT.tex', 'CryptoJWT Documentation',
-     'Roland Hedberg', 'manual'),
+    (master_doc, "CryptoJWT.tex", "CryptoJWT Documentation", "Roland Hedberg", "manual"),
 ]
 
 
 # -- Options for manual page output ---------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'cryptojwt', 'CryptoJWT Documentation',
-     [author], 1)
-]
+man_pages = [(master_doc, "cryptojwt", "CryptoJWT Documentation", [author], 1)]
 
 
 # -- Options for Texinfo output -------------------------------------------
@@ -163,13 +158,17 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'CryptoJWT', 'CryptoJWT Documentation',
-     author, 'CryptoJWT', 'One line description of project.',
-     'Miscellaneous'),
+    (
+        master_doc,
+        "CryptoJWT",
+        "CryptoJWT Documentation",
+        author,
+        "CryptoJWT",
+        "One line description of project.",
+        "Miscellaneous",
+    ),
 ]
 
 
-
-
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'https://docs.python.org/': None}
+intersphinx_mapping = {"https://docs.python.org/": None}

doc/conf.py

@@ -0,0 +1,21 @@
+# PEP 518: https://www.python.org/dev/peps/pep-0518/
+
+[tool.black]
+line-length = 100
+
+[tool.isort]
+force_single_line = true
+known_first_party = "cryptojwt"
+include_trailing_comma = true
+force_grid_wrap = 0
+use_parentheses = true
+line_length = 100
+
+[tool.coverage.run]
+branch = true
+
+[tool.coverage.report]
+exclude_lines = [
+    "pragma: no cover",
+    "raise NotImplementedError",
+]

pyproject.toml

@@ -20,13 +20,12 @@
 
 from setuptools import setup
 
-__author__ = 'Roland Hedberg'
+__author__ = "Roland Hedberg"
 
-with open('src/cryptojwt/__init__.py', 'r') as fd:
-    version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]',
-                        fd.read(), re.MULTILINE).group(1)
+with open("src/cryptojwt/__init__.py", "r") as fd:
+    version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]', fd.read(), re.MULTILINE).group(1)
 
-tests_requires = ['responses', 'pytest', 'isort>=5.0.2', 'black']
+tests_requires = ["responses", "pytest", "isort>=5.0.2", "black"]
 
 setup(
     name="cryptojwt",
@@ -35,8 +34,14 @@
     author="Roland Hedberg",
     author_email="[email protected]",
     license="Apache 2.0",
-    packages=["cryptojwt", "cryptojwt/jwe", "cryptojwt/jwk", "cryptojwt/jws", "cryptojwt/tools",
-              "cryptojwt/serialize"],
+    packages=[
+        "cryptojwt",
+        "cryptojwt/jwe",
+        "cryptojwt/jwk",
+        "cryptojwt/jws",
+        "cryptojwt/tools",
+        "cryptojwt/serialize",
+    ],
     package_dir={"": "src"},
     classifiers=[
         "Development Status :: 4 - Beta",
@@ -45,22 +50,22 @@
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8"
+        "Programming Language :: Python :: 3.8",
     ],
     install_requires=["cryptography", "requests"],
-    tests_require=['pytest'],
+    tests_require=["pytest"],
     zip_safe=False,
     extras_require={
-        'testing': tests_requires,
-        'docs': ['Sphinx', 'sphinx-autobuild', 'alabaster'],
-        'quality': ['isort>=5.0.2', 'black'],
+        "testing": tests_requires,
+        "docs": ["Sphinx", "sphinx-autobuild", "alabaster"],
+        "quality": ["isort>=5.0.2", "black"],
     },
-    scripts=glob.glob('script/*.py'),
+    scripts=glob.glob("script/*.py"),
     entry_points={
         "console_scripts": [
             "jwkgen = cryptojwt.tools.keygen:main",
             "jwkconv = cryptojwt.tools.keyconv:main",
             "jwtpeek = cryptojwt.tools.jwtpeek:main",
         ]
-    }
+    },
 )

setup.cfg

@@ -21,7 +21,7 @@
 except ImportError:
     pass
 
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 
 logger = logging.getLogger(__name__)
 

setup.py

@@ -22,7 +22,14 @@
         "ECDH-ES+A192KW",
         "ECDH-ES+A256KW",
     ],
-    "enc": ["A128CBC-HS256", "A192CBC-HS384", "A256CBC-HS512", "A128GCM", "A192GCM", "A256GCM",],
+    "enc": [
+        "A128CBC-HS256",
+        "A192CBC-HS384",
+        "A256CBC-HS512",
+        "A128GCM",
+        "A192GCM",
+        "A256GCM",
+    ],
 }
 
 

src/cryptojwt/__init__.py

@@ -18,8 +18,7 @@
 
 
 class AES_CBCEncrypter(Encrypter):
-    """
-    """
+    """"""
 
     def __init__(self, key_len=32, key=None, msg_padding="PKCS7"):
         Encrypter.__init__(self)

src/cryptojwt/jwe/__init__.py

@@ -157,7 +157,12 @@ def dec_setup(self, token, key=None, **kwargs):
                 raise Exception("Unknown key length for algorithm")
 
             self.cek = ecdh_derive_key(
-                key, epubkey.pub_key, apu, apv, str(self.headers["enc"]).encode(), dk_len,
+                key,
+                epubkey.pub_key,
+                apu,
+                apv,
+                str(self.headers["enc"]).encode(),
+                dk_len,
             )
         elif self.headers["alg"] in [
             "ECDH-ES+A128KW",