summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2012-03-06 10:31:40 -0800
committerBob Ippolito <bob@redivi.com>2012-03-06 10:31:40 -0800
commit1544fcc00249096849ee803bd9c1ad021c972ea3 (patch)
tree5812110055f929301e5444a87afc1ecbcbea6dc6
parent4460550c22e5cd4f52fb1f0449c4b1c02ff38fd1 (diff)
downloadsimplejson-1544fcc00249096849ee803bd9c1ad021c972ea3.tar.gz
version and changelog bump
-rw-r--r--CHANGES.txt6
-rw-r--r--conf.py4
-rw-r--r--setup.py2
-rw-r--r--simplejson/__init__.py2
4 files changed, 10 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index b98a371..4b770e3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,9 @@
+Version 2.4.0 released 2012-03-XX
+
+* New bigint_as_string option for encoder to trade JavaScript number precision
+ issues for type issues.
+ https://github.com/simplejson/simplejson/issues/31
+
Version 2.3.3 released 2012-02-27
* Allow unknown numerical types for indent parameter
diff --git a/conf.py b/conf.py
index ed8f6a6..150c7cc 100644
--- a/conf.py
+++ b/conf.py
@@ -42,9 +42,9 @@ copyright = '2011, Bob Ippolito'
# other places throughout the built documents.
#
# The short X.Y version.
-version = '2.3'
+version = '2.4'
# The full version, including alpha/beta/rc tags.
-release = '2.3.3'
+release = '2.4.0'
# 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 f53793d..68fb1db 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ from distutils.errors import CCompilerError, DistutilsExecError, \
DistutilsPlatformError
IS_PYPY = hasattr(sys, 'pypy_translation_info')
-VERSION = '2.3.3'
+VERSION = '2.4.0'
DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python"
LONG_DESCRIPTION = open('README.rst', 'r').read()
diff --git a/simplejson/__init__.py b/simplejson/__init__.py
index 7771bb6..4a5e5df 100644
--- a/simplejson/__init__.py
+++ b/simplejson/__init__.py
@@ -97,7 +97,7 @@ Using simplejson.tool from the shell to validate and pretty-print::
$ echo '{ 1.2:3.4}' | python -m simplejson.tool
Expecting property name: line 1 column 2 (char 2)
"""
-__version__ = '2.3.3'
+__version__ = '2.4.0'
__all__ = [
'dump', 'dumps', 'load', 'loads',
'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',