summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2014-09-29 14:07:14 -0700
committerBob Ippolito <bob@redivi.com>2014-09-29 14:07:14 -0700
commit77437f037f99e9df49dab740b32bdb20af93af44 (patch)
tree75b07ba998753a3a1bbc407ebe54717ca85afa7c
parentc510dd0285bbce594fd772b462eb859a39bf4a9f (diff)
downloadsimplejson-77437f037f99e9df49dab740b32bdb20af93af44.tar.gz
update version for v3.6.4
-rw-r--r--CHANGES.txt5
-rw-r--r--conf.py2
-rw-r--r--setup.py2
-rw-r--r--simplejson/__init__.py2
4 files changed, 8 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 0bfde2e..bd6d978 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+Version 3.6.4 released 2014-09-29
+
+* Important bug fix for dump when only sort_keys is set
+ https://github.com/simplejson/simplejson/issues/106
+
Version 3.6.3 released 2014-08-18
* Documentation updates
diff --git a/conf.py b/conf.py
index 952b979..5d44941 100644
--- a/conf.py
+++ b/conf.py
@@ -44,7 +44,7 @@ copyright = '2014, Bob Ippolito'
# The short X.Y version.
version = '3.6'
# The full version, including alpha/beta/rc tags.
-release = '3.6.3'
+release = '3.6.4'
# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
diff --git a/setup.py b/setup.py
index 31237bf..d937ae2 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ from distutils.errors import CCompilerError, DistutilsExecError, \
DistutilsPlatformError
IS_PYPY = hasattr(sys, 'pypy_translation_info')
-VERSION = '3.6.3'
+VERSION = '3.6.4'
DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python"
with open('README.rst', 'r') as f:
diff --git a/simplejson/__init__.py b/simplejson/__init__.py
index 1dd5a71..cbb5b34 100644
--- a/simplejson/__init__.py
+++ b/simplejson/__init__.py
@@ -98,7 +98,7 @@ Using simplejson.tool from the shell to validate and pretty-print::
Expecting property name: line 1 column 3 (char 2)
"""
from __future__ import absolute_import
-__version__ = '3.6.3'
+__version__ = '3.6.4'
__all__ = [
'dump', 'dumps', 'load', 'loads',
'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',