summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2011-11-18 16:57:10 -0800
committerBob Ippolito <bob@redivi.com>2011-11-18 16:57:10 -0800
commit205ec293aa75538599c47692c18c048b80ed0d3e (patch)
tree5eebbf0e7725f733c422ff19803c6cc8a9d32513
parent6aeb8f5963b9e683c6473766fef66875f6fcf40e (diff)
downloadsimplejson-205ec293aa75538599c47692c18c048b80ed0d3e.tar.gz
bump version to 2.3.0
-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 55d748f..5cefb18 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,9 @@
+Version 2.3.0 released 2011-11-18
+
+* Any objects with _asdict() methods are now considered for
+ namedtuple_as_object.
+ https://github.com/simplejson/simplejson/pull/22
+
Version 2.2.1 released 2011-09-06
* Fix MANIFEST.in issue when building a sdist from a sdist.
diff --git a/conf.py b/conf.py
index e9cabf5..4b4537a 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.2'
+version = '2.3'
# The full version, including alpha/beta/rc tags.
-release = '2.2.1'
+release = '2.3.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 c54f39c..534c333 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.2.1'
+VERSION = '2.3.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 ef5c0db..50886f6 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.2.1'
+__version__ = '2.3.0'
__all__ = [
'dump', 'dumps', 'load', 'loads',
'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',