summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2011-04-17 10:06:15 -0700
committerBob Ippolito <bob@redivi.com>2011-04-17 10:06:15 -0700
commit4ca8efd1e78135f01ab921c6f8319133cb0f0c00 (patch)
tree7497a800675c7a06e35d4f88a5704d712d6f7b97
parent9edd8ff0a9ff197035085332deaa1e00eed93cfc (diff)
downloadsimplejson-4ca8efd1e78135f01ab921c6f8319133cb0f0c00.tar.gz
change version number to 2.1.5
-rw-r--r--CHANGES.txt4
-rw-r--r--setup.py2
-rw-r--r--simplejson/__init__.py2
3 files changed, 6 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 0962f67..6f09d2c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+Version 2.1.5 released 2011-04-17
+
+* Built sdist tarball with setuptools_git installed. Argh.
+
Version 2.1.4 released 2011-04-17
* Does not try to build the extension when using PyPy
diff --git a/setup.py b/setup.py
index bf38479..e2e1cac 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ from distutils.errors import CCompilerError, DistutilsExecError, \
DistutilsPlatformError
IS_PYPY = hasattr(sys, 'pypy_translation_info')
-VERSION = '2.1.4'
+VERSION = '2.1.5'
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 6f38aab..dbabdb2 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.1.4'
+__version__ = '2.1.5'
__all__ = [
'dump', 'dumps', 'load', 'loads',
'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',