Merge branch 'master' into develop

prospector-dev · May 30, 2017 · c7a1eb7 · c7a1eb7
2 parents 58b3fc8 + bf72577
commit c7a1eb7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Prospector Changelog
 =======
 
+* Version 0.12.6
+* [#210](https://github.com/landscapeio/prospector/issues/210) [#212](https://github.com/landscapeio/prospector/issues/212) Removing debug output accidentally left in (@souliane)
+* [#211](https://github.com/landscapeio/prospector/issues/211) Added VSCode extension to docs (@DonJayamanne)
+
 # Version 0.12.5
 * [#207](https://github.com/landscapeio/prospector/pull/207) Fixed missing 'UnknownMessage' exception caused by recent pylint submodule changes
 * Minor documentation formatting updates

diff --git a/docs/usage.rst b/docs/usage.rst
@@ -2,7 +2,7 @@ Command Line Usage
 ==================
 
 .. _issue_16: https://github.com/landscapeio/prospector/issues/16
-
+.. _vscode_python_plugin: https://marketplace.visualstudio.com/items?itemName=donjayamanne.python
 The simplest way to run prospector is from the project root with no arguments. It will try to figure everything else out itself and provide sensible defaults::
 
     prospector
@@ -29,7 +29,7 @@ The default output format of ``prospector`` is designed to be human readable. Yo
 +=============+============================================================================+
 | ``emacs``   | | Support for emacs compilation output mode, see `issue_16`_.              |
 +-------------+----------------------------------------------------------------------------+
-| ``vscode``  | | Support for vscode python plugin                                         |
+| ``vscode``  | | Support for `vscode_python_plugin`_                                      |
 +-------------+----------------------------------------------------------------------------+
 | ``grouped`` | | Similar to ``text``, but groups all message on the same line together    |
 |             | | rather than having a separate entry per message.                         |

diff --git a/prospector/__pkginfo__.py b/prospector/__pkginfo__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
-__version_info__ = (0, 12, 5)
+__version_info__ = (0, 12, 6)
 __version__ = '.'.join(map(str, __version_info__))