Merge branch 'release/0.5.0'

* release/0.5.0:
  Prep 0.5.0 release
  Fix setup.py license type not matching LICENSE

CHANGELOG.md

@@ -1,13 +1,15 @@
-![Imgur](http://i.imgur.com/PMQPfxv.gif)
-
-[![Build Status](https://travis-ci.org/donnemartin/gitsome.svg?branch=master)](https://travis-ci.org/donnemartin/gitsome) [![PyPI version](https://badge.fury.io/py/gitsome.svg)](http://badge.fury.io/py/gitsome) [![PyPI](https://img.shields.io/pypi/pyversions/gitsome.svg)](https://pypi.python.org/pypi/gitsome/) [![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
+<p align="center">
+  <img src="http://i.imgur.com/0SXZ90y.gif">
+</p>
 
 gitsome
 =======
 
->A Supercharged Git/Shell Autocompleter with GitHub Integration.
+[![Build Status](https://travis-ci.org/donnemartin/gitsome.svg?branch=master)](https://travis-ci.org/donnemartin/gitsome) [![Codecov](https://img.shields.io/codecov/c/github/donnemartin/gitsome.svg)](https://codecov.io/github/donnemartin/gitsome)
+
+[![PyPI version](https://badge.fury.io/py/gitsome.svg)](http://badge.fury.io/py/gitsome) [![PyPI](https://img.shields.io/pypi/pyversions/gitsome.svg)](https://pypi.python.org/pypi/gitsome/) [![License](https://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
 
-To view the latest `README`, `docs`, and `code` visit the GitHub repo:
+To view the latest `README`, `docs`, and `code`, visit the GitHub repo:
 
 https://github.com/donnemartin/gitsome
 
@@ -18,7 +20,34 @@ https://github.com/donnemartin/gitsome/issues
 Changelog
 =========
 
+0.5.0 (2016-05-15)
+------------------
+
+### Features
+
+* [#12](https://github.com/donnemartin/gitsome/issues/12) - Allow 2FA-enabled users to log in with a password + 2FA code.  Previously 2FA-enabled users could only log in with a [personal access token](https://github.com/settings/tokens).  Also includes an update of login prompts to improve clarity.
+
+### Bug Fixes
+
+* [#16](https://github.com/donnemartin/gitsome/pull/16), [#28](https://github.com/donnemartin/gitsome/pull/28) - Fix typos in README.
+* [#18](https://github.com/donnemartin/gitsome/pull/18) - Fix dev install instructions in README.
+* [#24](https://github.com/donnemartin/gitsome/pull/24) - Fix style guide broken link in CONTRIBUTING.
+
+### Updates
+
+* [#1](https://github.com/donnemartin/gitsome/issues/1) - Add Codecov coverage testing status to README.
+* [#2](https://github.com/donnemartin/gitsome/issues/2) - Add note about enabling Zsh completions to README.
+* [#4](https://github.com/donnemartin/gitsome/issues/4) - Add note about using `pip3` to README.
+* [#5](https://github.com/donnemartin/gitsome/issues/5) - Decrease speed of README gif.
+* [#6](https://github.com/donnemartin/gitsome/pull/6) - Update url for `click`.
+* [#20](https://github.com/donnemartin/gitsome/issues/20) - Add note about enabling more completions to README.
+* [#21](https://github.com/donnemartin/gitsome/issues/21) - Bump up `prompt-toolkit` version from `0.51` to `0.52`.
+* [#26](https://github.com/donnemartin/gitsome/issues/26) - Add `xonsh` copyright notice to LICENSE.
+* [#32](https://github.com/donnemartin/gitsome/pull/32) - Add `github3.py`, `html2text`, and `img2txt` copyright notices to LICENSE.
+* Update installation instructions in README.
+* Update color customization discussion in README.
+
 0.4.0 (2016-05-09)
 ------------------
 
-- Initial release.
+* Initial release.

CHANGELOG.rst

@@ -1,16 +1,19 @@
-.. figure:: http://i.imgur.com/PMQPfxv.gif
-   :alt: Imgur
+.. raw:: html
 
-   Imgur
+   <p align="center">
 
-|Build Status| |PyPI version| |PyPI| |License|
+.. raw:: html
+
+   </p>
 
 gitsome
 =======
 
-    A Supercharged Git/Shell Autocompleter with GitHub Integration.
+|Build Status| |Codecov|
+
+|PyPI version| |PyPI| |License|
 
-To view the latest ``README``, ``docs``, and ``code`` visit the GitHub
+To view the latest ``README``, ``docs``, and ``code``, visit the GitHub
 repo:
 
 https://github.com/donnemartin/gitsome
@@ -22,16 +25,66 @@ https://github.com/donnemartin/gitsome/issues
 Changelog
 =========
 
+0.5.0 (2016-05-15)
+------------------
+
+Features
+~~~~~~~~
+
+-  `#12 <https://github.com/donnemartin/gitsome/issues/12>`__ - Allow
+   2FA-enabled users to log in with a password + 2FA code. Previously
+   2FA-enabled users could only log in with a `personal access
+   token <https://github.com/settings/tokens>`__. Also includes an
+   update of login prompts to improve clarity.
+
+Bug Fixes
+~~~~~~~~~
+
+-  `#16 <https://github.com/donnemartin/gitsome/pull/16>`__,
+   `#28 <https://github.com/donnemartin/gitsome/pull/28>`__ - Fix typos
+   in README.
+-  `#18 <https://github.com/donnemartin/gitsome/pull/18>`__ - Fix dev
+   install instructions in README.
+-  `#24 <https://github.com/donnemartin/gitsome/pull/24>`__ - Fix style
+   guide broken link in CONTRIBUTING.
+
+Updates
+~~~~~~~
+
+-  `#1 <https://github.com/donnemartin/gitsome/issues/1>`__ - Add
+   Codecov coverage testing status to README.
+-  `#2 <https://github.com/donnemartin/gitsome/issues/2>`__ - Add note
+   about enabling Zsh completions to README.
+-  `#4 <https://github.com/donnemartin/gitsome/issues/4>`__ - Add note
+   about using ``pip3`` to README.
+-  `#5 <https://github.com/donnemartin/gitsome/issues/5>`__ - Decrease
+   speed of README gif.
+-  `#6 <https://github.com/donnemartin/gitsome/pull/6>`__ - Update url
+   for ``click``.
+-  `#20 <https://github.com/donnemartin/gitsome/issues/20>`__ - Add note
+   about enabling more completions to README.
+-  `#21 <https://github.com/donnemartin/gitsome/issues/21>`__ - Bump up
+   ``prompt-toolkit`` version from ``0.51`` to ``0.52``.
+-  `#26 <https://github.com/donnemartin/gitsome/issues/26>`__ - Add
+   ``xonsh`` copyright notice to LICENSE.
+-  `#32 <https://github.com/donnemartin/gitsome/pull/32>`__ - Add
+   ``github3.py``, ``html2text``, and ``img2txt`` copyright notices to
+   LICENSE.
+-  Update installation instructions in README.
+-  Update color customization discussion in README.
+
 0.4.0 (2016-05-09)
 ------------------
 
 -  Initial release.
 
 .. |Build Status| image:: https://travis-ci.org/donnemartin/gitsome.svg?branch=master
    :target: https://travis-ci.org/donnemartin/gitsome
+.. |Codecov| image:: https://img.shields.io/codecov/c/github/donnemartin/gitsome.svg
+   :target: https://codecov.io/github/donnemartin/gitsome
 .. |PyPI version| image:: https://badge.fury.io/py/gitsome.svg
    :target: http://badge.fury.io/py/gitsome
 .. |PyPI| image:: https://img.shields.io/pypi/pyversions/gitsome.svg
    :target: https://pypi.python.org/pypi/gitsome/
-.. |License| image:: http://img.shields.io/:license-apache-blue.svg
+.. |License| image:: https://img.shields.io/:license-apache-blue.svg
    :target: http://www.apache.org/licenses/LICENSE-2.0.html

gitsome/__init__.py

@@ -13,4 +13,4 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-__version__ = '0.4.0'
+__version__ = '0.5.0'

setup.py

@@ -71,7 +71,7 @@ def main():
     skw = dict(
         name='gitsome',
         description='A Supercharged Git/Shell Autocompleter with GitHub Integration.',  # NOQA
-        license='BSD',
+        license='Apache License 2.0',
         version=VERSION,
         author='Donne Martin',
         maintainer='Donne Martin',