summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2013-10-05 11:55:47 -0700
committerBob Ippolito <bob@redivi.com>2013-10-05 11:55:47 -0700
commitd59550cc9bf62bca93b52480536e94707e789579 (patch)
tree190c34f98becdb613133fa6dec1e07f2c81ca1e5
parent475ef1c3b3a7a1bee8b9339336a077ce905ddc4f (diff)
downloadsimplejson-d59550cc9bf62bca93b52480536e94707e789579.tar.gz
update metadata for 3.3.1v3.3.1
-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 6e056a4..618eff1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+Version 3.3.1 released 2013-10-05
+
+* JSONDecodeError exceptions can now be pickled
+ https://github.com/simplejson/simplejson/pull/78
+
Version 3.3.0 released 2013-05-07
* Unpaired surrogates once again pass through the decoder, to match older
diff --git a/conf.py b/conf.py
index 2fb5544..cbb764c 100644
--- a/conf.py
+++ b/conf.py
@@ -44,7 +44,7 @@ copyright = '2013, Bob Ippolito'
# The short X.Y version.
version = '3.3'
# The full version, including alpha/beta/rc tags.
-release = '3.3.0'
+release = '3.3.1'
# 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 0cb9e6a..f5068d3 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,7 @@ from distutils.errors import CCompilerError, DistutilsExecError, \
DistutilsPlatformError
IS_PYPY = hasattr(sys, 'pypy_translation_info')
-VERSION = '3.3.0'
+VERSION = '3.3.1'
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 7fc8153..759a86d 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.3.0'
+__version__ = '3.3.1'
__all__ = [
'dump', 'dumps', 'load', 'loads',
'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',