summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2014-05-23 08:20:40 -0700
committerBob Ippolito <bob@redivi.com>2014-05-23 08:21:09 -0700
commita19d53c1df389648b31619eda67cb178f8f00036 (patch)
tree9706aefdb5bf7468a9fca2bff1e1e5ab890cf26d
parent8f1778402eff0dd3107c68116e8cdfcecce29ee4 (diff)
downloadsimplejson-a19d53c1df389648b31619eda67cb178f8f00036.tar.gz
update version for v3.5.2v3.5.2
-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 37d2711..deb441b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+Version 3.5.2 released 2014-05-22
+
+* Fix Windows build with VS2008
+ https://github.com/simplejson/simplejson/pull/97
+
Version 3.5.1 released 2014-05-21
* Consistently reject int_as_string_bitcount settings that are not
diff --git a/conf.py b/conf.py
index 8e1a89c..afc298e 100644
--- a/conf.py
+++ b/conf.py
@@ -44,7 +44,7 @@ copyright = '2014, Bob Ippolito'
# The short X.Y version.
version = '3.5'
# The full version, including alpha/beta/rc tags.
-release = '3.5.1'
+release = '3.5.2'
# 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 417b02f..96a098b 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.5.1'
+VERSION = '3.5.2'
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 3112fd5..af70cd4 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.5.1'
+__version__ = '3.5.2'
__all__ = [
'dump', 'dumps', 'load', 'loads',
'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',