Merge branch 'release-0.6.2' into develop

jamesls · jamesls · commit bd93d08b643f · 2015-04-08T23:20:20.000-07:00
* release-0.6.2:
  Bump version to 0.6.2
  Add changelog for 0.6.2
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -0,0 +1,8 @@
+0.6.2
+=====
+
+* Implement JEP-10, slice projections
+* Fix bug with filter projection parsing
+* Add ``to_array`` function
+* Add ``merge`` function
+* Fix error messages for function argument type errors
diff --git a/docs/conf.py b/docs/conf.py
@@ -38,7 +38,7 @@
 # The short X.Y version.
 version = '0.4'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.1'
+release = '0.6.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/jmespath/__init__.py b/jmespath/__init__.py
@@ -1,6 +1,6 @@
 from jmespath import parser
 
-__version__ = '0.6.1'
+__version__ = '0.6.2'
 
 
 def compile(expression):
diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@
 
 setup(
     name='jmespath',
-    version='0.6.1',
+    version='0.6.2',
     description='JSON Matching Expressions',
     long_description=io.open('README.rst', encoding='utf-8').read(),
     author='James Saryerwinnie',
