Merge branch 'master' into add-python-requires

Author: avian2

.github/workflows/ci.yml

@@ -6,73 +6,75 @@ on:
   pull_request:
     branches:
       - master
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
 jobs:
   test:
     timeout-minutes: 30
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "pypy3.9"]
         os: [ubuntu-latest, macos-latest, windows-latest]
         exclude:
           - os: macos-latest
-            python-version:  "pypy3"
+            python-version:  "pypy3.9"
           - os: windows-latest
-            python-version:  "pypy3"
+            python-version:  "pypy3.9"
     runs-on: ${{ matrix.os }}
     name: "${{ matrix.os }} Python: ${{ matrix.python-version }}"
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         fetch-depth: 0
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        pip install -U "pip>=21.1"
-        pip install -U setuptools
-        pip install -U "tox>=3.23.0,<4" codecov tox-gh-actions coverage
+        pip install -U "pip>=23.1.2"
+        pip install -U "tox-gh-actions==3.1.0" coverage
     - name: Log python & pip versions
       run: |
         python --version
         pip --version
     - name: Run unit tests
       run: tox
-    - name: "Coverage report"
+    - name: Coverage report
       run:  coverage xml
-    - name: "Upload coverage to Codecov"
-      uses: "codecov/codecov-action@v1"
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v3
       with:
-        fail_ci_if_error: true
+        fail_ci_if_error: false
   linting:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: 3.9
     - name: Install dependencies
       run: |
         pip install -U setuptools 
-        pip install -U "tox>=3.23.0,<4"
+        pip install -U "tox>=4.5.1,<5"
     - run: tox -e lint
   package:
-    name: "Build & verify package"
+    name: Build & verify package
     runs-on: "ubuntu-latest"
     steps:
-      - uses: "actions/checkout@v2"
-      - uses: "actions/setup-python@v2"
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
-          python-version: "3.8"
-      - name: "Install build, check-wheel-content, and twine"
+          python-version: "3.9"
+      - name: Install build, check-wheel-content, and twine
         run: "python -m pip install build twine check-wheel-contents"
-      - name: "Build package"
+      - name: Build package
         run: "python -m build --sdist --wheel ."
-      - name: "List result"
+      - name: List result
         run: "ls -l dist"
-      - name: "Check wheel contents"
+      - name: Check wheel contents
         run: "check-wheel-contents dist/*.whl"
-      - name: "Check long_description"
+      - name: Check long_description
         run: "python -m twine check dist/*"

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog #
 
+## 3.4.0 -- UNPUBLISHED ##
+
+### News ###
+
+* Remove support for python 3.6
+
+### Housekeeping ###
+
+* Updated Github Actions Workflows
+* Updated to use tox 4.x
+* Revise codecov integration
+
+
 ## 3.3.0 -- 2021-06-04 ##
 
 ### News ###
@@ -17,7 +30,6 @@
 * Updated Syntax to use Python 3.6+
 * Upgrade to latest pytest, remove used dev requirements.
 
-
 ## 3.2.0 -- 2020-07-29 ##
 
 ### News ###
@@ -39,8 +51,6 @@
 
 * Fixed some typos #160, #162, and #164
 
-
-
 ## 3.1.0 -- 2019-12-10 ##
 
 This is a greatly overdue release.

docs/conf.py

@@ -10,8 +10,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys
 import os
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

jose/backends/rsa_backend.py

@@ -221,7 +221,6 @@ def public_key(self):
         return self.__class__(pyrsa.PublicKey(n=self._prepared_key.n, e=self._prepared_key.e), self._algorithm)
 
     def to_pem(self, pem_format="PKCS8"):
-
         if isinstance(self._prepared_key, pyrsa.PrivateKey):
             der = self._prepared_key.save_pkcs1(format="DER")
             if pem_format == "PKCS8":

jose/jws.py

@@ -1,6 +1,10 @@
 import binascii
 import json
-from collections.abc import Iterable, Mapping
+
+try:
+    from collections.abc import Iterable, Mapping
+except ImportError:
+    from collections import Mapping, Iterable
 
 from jose import jwk
 from jose.backends.base import Key
@@ -215,7 +219,6 @@ def _sig_matches_keys(keys, signing_input, signature, alg):
 
 
 def _get_keys(key):
-
     if isinstance(key, Key):
         return (key,)
 
@@ -248,7 +251,6 @@ def _get_keys(key):
 
 
 def _verify_signature(signing_input, header, signature, key="", algorithms=None):
-
     alg = header.get("alg")
     if not alg:
         raise JWSError("No algorithm was specified in the JWS header.")

jose/jwt.py

@@ -1,6 +1,10 @@
 import json
 from calendar import timegm
-from collections.abc import Mapping
+
+try:
+    from collections.abc import Mapping
+except ImportError:
+    from collections import Mapping
 from datetime import datetime, timedelta
 
 from jose import jws
@@ -42,7 +46,6 @@ def encode(claims, key, algorithm=ALGORITHMS.HS256, headers=None, access_token=N
     """
 
     for time_claim in ["exp", "iat", "nbf"]:
-
         # Convert datetime to a intDate value in known time-format claims
         if isinstance(claims.get(time_claim), datetime):
             claims[time_claim] = timegm(claims[time_claim].utctimetuple())
@@ -456,7 +459,6 @@ def _validate_at_hash(claims, access_token, algorithm):
 
 
 def _validate_claims(claims, audience=None, issuer=None, subject=None, algorithm=None, access_token=None, options=None):
-
     leeway = options.get("leeway", 0)
 
     if isinstance(leeway, timedelta):

jose/utils.py

@@ -9,7 +9,6 @@
     def long_to_bytes(n, blocksize=0):
         return _long_to_bytes(n, blocksize or None)
 
-
 except ImportError:
     from ecdsa.ecdsa import int_to_string as _long_to_bytes
 

requirements-dev.txt

@@ -2,7 +2,7 @@ PyYAML==5.4.1
 cov-core==1.15.0
 coverage==5.5
 coveralls==1.5.1
-cryptography==3.4.7
+cryptography==39.0.1
 docopt==0.6.2
 pytest==6.2.3
 pytest-cov==2.11.1

setup.cfg

@@ -21,11 +21,11 @@ classifiers =
     Programming Language :: Python
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
     Programming Language :: Python :: Implementation :: PyPy
     Topic :: Utilities
 

setup.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
 from setuptools import setup
 
-
 setup()