summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2013-02-21 20:37:02 -0800
committerBob Ippolito <bob@redivi.com>2013-02-21 20:37:02 -0800
commit062aa98fe19c9536b6ede4c0b84f5f3e6711b768 (patch)
tree71dcc9928aaa855ceda5ba31b173bbfb30f8404b
parentc8feb3ab3113dd04aa4897a8897b78742d94124d (diff)
downloadsimplejson-062aa98fe19c9536b6ede4c0b84f5f3e6711b768.tar.gz
tag v3.1.1v3.1.1
-rw-r--r--CHANGES.txt2
-rw-r--r--conf.py2
-rw-r--r--setup.py2
-rw-r--r--simplejson/__init__.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index f2b1ac4..a9fc019 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-Version 3.1.1 released XXXX-XX-XX
+Version 3.1.1 released 2013-02-21
* setup.py now has another workaround for Windows machines without
MSVC installed
diff --git a/conf.py b/conf.py
index 6f8024d..a8d7ed5 100644
--- a/conf.py
+++ b/conf.py
@@ -44,7 +44,7 @@ copyright = '2013, Bob Ippolito'
# The short X.Y version.
version = '3.1'
# The full version, including alpha/beta/rc tags.
-release = '3.1'
+release = '3.1.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 57d467e..9deb4ab 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.1.0'
+VERSION = '3.1.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 a908826..9825a97 100644
--- a/simplejson/__init__.py
+++ b/simplejson/__init__.py
@@ -99,7 +99,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.1.0'
+__version__ = '3.1.1'
__all__ = [
'dump', 'dumps', 'load', 'loads',
'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',