Merge remote-tracking branch 'origin/master' into develop

landscapeio · Nov 18, 2018 · 283bca1 · 283bca1
2 parents c7f82b4 + 744112f
commit 283bca1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 Prospector Changelog
 =======
 
+# Version 1.1.5
+- [#283](https://github.com/PyCQA/prospector/pull/283) Remove unexpected argument from read_config_file - Remove quiet 
+argument
+- [#291](https://github.com/PyCQA/prospector/pull/291) Update pycodestyle support until 2.4.0
+- [#280](https://github.com/PyCQA/prospector/pull/280) Add strict option and fixed emacs output format for mypy tool
+- [#282](https://github.com/PyCQA/prospector/pull/282) Fix working dir detection
+
 ## Version 1.1.4
 - [#285](https://github.com/PyCQA/prospector/issues/285) Fix dependency tree resolution - now insists on `pep8-naming<=0.4.1` as later versions cause conflicting versions of flake8 to be installed.
 

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