Merge remote-tracking branch 'mpdavis/master' into deterministic-headers

Author: delajozate

.travis.yml

@@ -33,17 +33,6 @@ matrix:
     - python: 3.4
       env: TOXENV=py34-compatibility
     # CPython 3.5
-    - python: 3.5
-      env: TOXENV=py35-base
-    - python: 3.5
-      env: TOXENV=py35-cryptography-only
-    - python: 3.5
-      env: TOXENV=py35-pycryptodome-norsa
-    - python: 3.5
-      env: TOXENV=py35-pycrypto-norsa
-    - python: 3.5
-      env: TOXENV=py35-compatibility
-    # CPython 3.5
     - python: 3.5
       env: TOXENV=py35-base
     - python: 3.5
@@ -56,36 +45,36 @@ matrix:
       env: TOXENV=py35-compatibility
     # CPython 3.6
     - python: 3.6
-      env: TOXENV=py35-base
+      env: TOXENV=py36-base
     - python: 3.6
-      env: TOXENV=py35-cryptography-only
+      env: TOXENV=py36-cryptography-only
     - python: 3.6
-      env: TOXENV=py35-pycryptodome-norsa
+      env: TOXENV=py36-pycryptodome-norsa
     - python: 3.6
-      env: TOXENV=py35-pycrypto-norsa
+      env: TOXENV=py36-pycrypto-norsa
     - python: 3.6
-      env: TOXENV=py35-compatibility
+      env: TOXENV=py36-compatibility
     # CPython 3.7
     # xenial + sudo are currently needed to get 3.7
     # https://github.com/travis-ci/travis-ci/issues/9815
     - python: 3.7
-      env: TOXENV=py35-base
+      env: TOXENV=py37-base
       dist: xenial
       sudo: true
     - python: 3.7
-      env: TOXENV=py35-cryptography-only
+      env: TOXENV=py37-cryptography-only
       dist: xenial
       sudo: true
     - python: 3.7
-      env: TOXENV=py35-pycryptodome-norsa
+      env: TOXENV=py37-pycryptodome-norsa
       dist: xenial
       sudo: true
     - python: 3.7
-      env: TOXENV=py35-pycrypto-norsa
+      env: TOXENV=py37-pycrypto-norsa
       dist: xenial
       sudo: true
     - python: 3.7
-      env: TOXENV=py35-compatibility
+      env: TOXENV=py37-compatibility
       dist: xenial
       sudo: true
     # PyPy 5.3.1

CHANGELOG.rst

@@ -0,0 +1,35 @@
+---------
+Changelog
+---------
+
+3.1.0 -- 2019-??-??
+^^^^^^^^^^^^^^^^^^^
+
+Major
+"""""
+
+* Isolate and flesh out cryptographic backends to enable independent operation.
+  `#114 <https://github.com/mpdavis/python-jose/issues/114>`_
+  `#129 <https://github.com/mpdavis/python-jose/pull/129>`_
+* Remove pyca/cryptography backend's dependency on python-ecdsa.
+  `#117 <https://github.com/mpdavis/python-jose/pull/117>`_
+* Remove pycrypto/dome backends' dependency on python-rsa.
+  `#121 <https://github.com/mpdavis/python-jose/pull/121>`_
+* Make pyca/cryptography backend the preferred backend if multiple backends are present.
+  `#122 <https://github.com/mpdavis/python-jose/pull/122>`_
+
+Bugfixes
+""""""""
+
+* Fix invalid RSA private key PKCS8 encoding by python-rsa backend.
+  `#120 <https://github.com/mpdavis/python-jose/pull/120>`_
+
+Housekeeping
+""""""""""""
+
+* Test each cryptographic backend independently in CI.
+  `#114 <https://github.com/mpdavis/python-jose/issues/114>`_
+  `#129 <https://github.com/mpdavis/python-jose/pull/129>`_
+  `#135 <https://github.com/mpdavis/python-jose/pull/135>`_
+* Add flake8 checks in CI.
+* Add CPython 3.7 and PyPy 3.5 testing in CI.

jose/jws.py

@@ -3,7 +3,10 @@
 import json
 import six
 
-from collections import Mapping, Iterable
+try:
+    from collections.abc import Mapping, Iterable  # Python 3
+except ImportError:
+    from collections import Mapping, Iterable  # Python 2, will be deprecated in Python 3.8
 
 from jose import jwk
 from jose.constants import ALGORITHMS

jose/jwt.py

@@ -2,7 +2,10 @@
 import json
 
 from calendar import timegm
-from collections import Mapping
+try:
+    from collections.abc import Mapping  # Python3
+except ImportError:
+    from collections import Mapping  # Python2, will be depecrated in Python 3.8
 from datetime import datetime
 from datetime import timedelta
 from six import string_types

requirements-dev.txt

@@ -1,14 +1,14 @@
 PyYAML==3.11
 cov-core==1.15.0
-coverage==3.7.1
-coveralls==0.5
+coverage==4.4
+coveralls==1.5.1
+cryptography==2.4.2
 docopt==0.6.2
 nose==1.3.6
-py==1.4.26
-pytest==2.7.0
-pytest-cov==1.8.1
-ecdsa==0.13
-wsgiref==0.1.2
-
+py==1.5.4
+pytest==4.1.1
+pytest-cov==2.6.1
+# wsgiref is included in python standard library in Python 3, and will fail to install.
+wsgiref==0.1.2; python_version < "3.0"
 -r requirements.txt
 -r requirements-rtd.txt