summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudiu Popa <pcmanticore@gmail.com>2016-01-15 22:27:02 +0200
committerClaudiu Popa <pcmanticore@gmail.com>2016-01-15 22:27:02 +0200
commit4fa1477d7627f46b2a92551738bb04799c753be2 (patch)
treeac43fb5e9bcc000df8f82a72315fddba245083a4
parent104a3269a04132880a9c62358a420d7fccf97fe2 (diff)
downloadpylint-git-4fa1477d7627f46b2a92551738bb04799c753be2.tar.gz
Prepare 1.5.4 releasepylint-1.5.4
-rw-r--r--ChangeLog3
-rw-r--r--pylint/__pkginfo__.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ec758874..11740bfb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,8 @@ ChangeLog for Pylint
--------------------
---
+2016-01-15 -- 1.5.4
+
* Merge StringMethodChecker with StringFormatChecker. This fixes a
bug where disabling all the messages and enabling only a handful of
messages from the StringFormatChecker would have resulted in no
diff --git a/pylint/__pkginfo__.py b/pylint/__pkginfo__.py
index 251cb2707..c7bbee51e 100644
--- a/pylint/__pkginfo__.py
+++ b/pylint/__pkginfo__.py
@@ -23,7 +23,7 @@ from os.path import join
modname = distname = 'pylint'
-numversion = (1, 5, 3)
+numversion = (1, 5, 4)
version = '.'.join([str(num) for num in numversion])
install_requires = [