summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Adams <madams@atlassian.com>2016-08-08 14:42:23 -0500
committerMark Adams <madams@atlassian.com>2016-08-08 14:42:23 -0500
commitb35d522135044ba10ac41e7db5b95348cb4c4707 (patch)
treeaafb9e3993645d0beb6b3437ee1668336d263c5c
parent899fdaf493fb263b2ec8feaa0fac83f62fe20eb1 (diff)
downloadpyjwt-b35d522135044ba10ac41e7db5b95348cb4c4707.tar.gz
Bump version to 1.4.2 and update CHANGELOG1.4.2
-rw-r--r--CHANGELOG.md19
-rw-r--r--jwt/__init__.py2
2 files changed, 20 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 573eabd..de4b14d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,18 @@ Change Log
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
+[v1.4.2][1.4.2]
+-------------------------------------------------------------------------
+### Fixed
+- A PEM-formatted key encoded as bytes could cause a `TypeError` to be raised [#213][213]
+
+[v1.4.1][1.4.1]
+-------------------------------------------------------------------------
+### Fixed
+- Newer versions of Pytest could not detect warnings properly [#182][182]
+- Non-string 'kid' value now raises `InvalidTokenError` [#174][174]
+- `jwt.decode(None)` now gracefully fails with `InvalidTokenError` [#183][183]
+
[v1.4][1.4.0]
-------------------------------------------------------------------------
### Fixed
@@ -86,6 +98,9 @@ rarely used. Users affected by this should upgrade to 3.3+.
[1.2.0]: https://github.com/jpadilla/pyjwt/compare/1.1.0...1.2.0
[1.3.0]: https://github.com/jpadilla/pyjwt/compare/1.2.0...1.3.0
[1.4.0]: https://github.com/jpadilla/pyjwt/compare/1.3.0...1.4.0
+[1.4.1]: https://github.com/jpadilla/pyjwt/compare/1.4.0...1.4.1
+[1.4.2]: https://github.com/jpadilla/pyjwt/compare/1.4.1...1.4.2
+
[109]: https://github.com/jpadilla/pyjwt/pull/109
@@ -102,3 +117,7 @@ rarely used. Users affected by this should upgrade to 3.3+.
[141]: https://github.com/jpadilla/pyjwt/pull/141
[158]: https://github.com/jpadilla/pyjwt/pull/158
[163]: https://github.com/jpadilla/pyjwt/pull/163
+[174]: https://github.com/jpadilla/pyjwt/pull/174
+[182]: https://github.com/jpadilla/pyjwt/pull/182
+[183]: https://github.com/jpadilla/pyjwt/pull/183
+[213]: https://github.com/jpadilla/pyjwt/pull/214
diff --git a/jwt/__init__.py b/jwt/__init__.py
index d70cdf0..64b2f97 100644
--- a/jwt/__init__.py
+++ b/jwt/__init__.py
@@ -10,7 +10,7 @@ http://self-issued.info/docs/draft-jones-json-web-token-01.html
__title__ = 'pyjwt'
-__version__ = '1.4.1'
+__version__ = '1.4.2'
__author__ = 'José Padilla'
__license__ = 'MIT'
__copyright__ = 'Copyright 2015 José Padilla'