Skip to content

Commit

Permalink
Renamed jwt CLI script to jwt-cli to avoid issues with jwt script ove…
Browse files Browse the repository at this point in the history
…rlapping with the jwt package. Fixes #130
  • Loading branch information
mark-adams committed Oct 24, 2016
1 parent 0d0d10c commit 5c5fab1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ Change Log
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

[Unreleased][unreleased]
-------------------------------------------------------------------------
### Changed
- Renamed commandline script `jwt` to `jwt-cli` to avoid issues with the script clobbering the `jwt` module in some circumstances.

### Fixed

[v1.4.2][1.4.2]
-------------------------------------------------------------------------
### Fixed
Expand Down Expand Up @@ -89,7 +96,7 @@ rarely used. Users affected by this should upgrade to 3.3+.
- Fixed a security vulnerability by adding support for a whitelist of allowed `alg` values `jwt.decode(algorithms=[])`. [#110][110]


[unreleased]: https://github.com/jpadilla/pyjwt/compare/1.3.0...HEAD
[unreleased]: https://github.com/jpadilla/pyjwt/compare/1.4.2...HEAD
[1.0.0]: https://github.com/jpadilla/pyjwt/compare/0.4.3...1.0.0
[1.0.1]: https://github.com/jpadilla/pyjwt/compare/1.0.0...1.0.1
[1.0.1]: https://github.com/jpadilla/pyjwt/compare/1.0.0...1.0.1
Expand Down
2 changes: 1 addition & 1 deletion jwt/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def main():
'''
p = optparse.OptionParser(
usage=usage,
prog=__package__,
prog='pyjwt',
version='%s %s' % (__package__, __version__),
)

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def get_version(package):
),
entry_points={
'console_scripts': [
'jwt = jwt.__main__:main'
'pyjwt = jwt.__main__:main'
]
}
)

0 comments on commit 5c5fab1

Please sign in to comment.