Merge 18b5ba7 into eb9ee44

landscapeio · Oct 25, 2018 · da96ea5 · da96ea5
2 parents eb9ee44 + 18b5ba7
commit da96ea5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 Prospector Changelog
 =======
 
+## 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.
+
 ## Version 1.1.3
 - [#279](https://github.com/PyCQA/prospector/issues/279) Fix --show-profile crash
 

diff --git a/prospector/__pkginfo__.py b/prospector/__pkginfo__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
-__version_info__ = (1, 1, 3)
+__version_info__ = (1, 1, 4)
 __version__ = '.'.join(map(str, __version_info__))
diff --git a/setup.py b/setup.py
@@ -26,7 +26,7 @@
     'mccabe>=0.5.0',
     'pyflakes<2.0.0,>=0.8.1',
     'pycodestyle<2.4.0,>=2.0.0',
-    'pep8-naming>=0.3.3',
+    'pep8-naming>=0.3.3,<=0.4.1',
     'pydocstyle>=2.0.0',
 ]