diff --git a/Changelog.rst b/Changelog.rst index 905937ca..77b7faba 100644 --- a/Changelog.rst +++ b/Changelog.rst @@ -3,8 +3,17 @@ Changelog ========= -1.0.1 (dev) ------------ +1.1.0 (2014-07-02) +------------------ + +Compatibility with newest Elasticsearch APIs. + + * Test helpers - `ElasticsearchTestCase` and `get_test_client` for use in your + tests + * Python 3.2 compatibility + * Use ``simplejson`` if installed instead of stdlib json library + * Introducing a global `request_timeout` parameter for per-call timeout + * Bug fixes 1.0.0 (2014-02-11) ------------------ diff --git a/docs/conf.py b/docs/conf.py index 7cd5414a..ca048fb9 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.0.1' +version = '1.1.0' # The full version, including alpha/beta/rc tags. -release = '1.0.1 (dev)' +release = '1.1.0' # 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 51a09150..7e5e8ac1 100644 --- a/elasticsearch/__init__.py +++ b/elasticsearch/__init__.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -VERSION = (1, 0, 1) +VERSION = (1, 1, 0) __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION)) diff --git a/setup.py b/setup.py index 68782163..e7750aba 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import setup, find_packages import sys import os -VERSION = (1, 0, 1) +VERSION = (1, 1, 0) __version__ = VERSION __versionstr__ = '.'.join(map(str, VERSION)) @@ -59,6 +59,7 @@ setup( "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.2", "Programming Language :: Python :: 3.3", + "Programming Language :: Python :: 3.4", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", ],