diff --git a/Changelog.rst b/Changelog.rst index 03d0d31a..c419594f 100644 --- a/Changelog.rst +++ b/Changelog.rst @@ -3,6 +3,9 @@ Changelog ========= +1.4.0 (dev) +----------- + 1.3.0 (2014-12-31) ------------------ diff --git a/docs/conf.py b/docs/conf.py index 0c45ae5a..94b5c3ed 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -50,9 +50,9 @@ copyright = u'2013, Honza Král' # built documents. # # The short X.Y version. -version = '1.3.0' +version = '1.4.0' # The full version, including alpha/beta/rc tags. -release = '1.3.0' +release = '1.4.0-dev' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/elasticsearch/__init__.py b/elasticsearch/__init__.py index c809aed3..a9b93805 100644 --- a/elasticsearch/__init__.py +++ b/elasticsearch/__init__.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -VERSION = (1, 3, 0) +VERSION = (1, 4, 0, 'dev') __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION)) @@ -9,8 +9,7 @@ import sys if (2, 7) <= sys.version_info < (3, 2): # On Python 2.7 and Python3 < 3.2, install no-op handler to silence # `No handlers could be found for logger "elasticsearch"` message per - # , - # : + # import logging logger = logging.getLogger('elasticsearch') logger.addHandler(logging.NullHandler()) diff --git a/setup.py b/setup.py index dc28c4ff..61ad949b 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup, find_packages import sys import os -VERSION = (1, 3, 0) +VERSION = (1, 4, 0, 'dev') __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION))