summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt10
-rw-r--r--conf.py2
-rw-r--r--setup.py2
-rw-r--r--simplejson/__init__.py2
4 files changed, 13 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 9c66080..443c5c3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,13 @@
+Version 3.12.1 released 2017-11-23
+
+* Misc updates to build infrastructure
+* Fix an assertion failure when make_encoder receives a bad encoder argument
+ https://github.com/simplejson/simplejson/issues/188
+* Fix potential crash during GC
+ https://github.com/simplejson/simplejson/issues/187
+* Fix a reference leak when sorting keys
+ https://github.com/simplejson/simplejson/issues/186
+
Version 3.12.0 released 2017-11-05
* Fix threaded import race condition
diff --git a/conf.py b/conf.py
index 374da34..52a0f51 100644
--- a/conf.py
+++ b/conf.py
@@ -44,7 +44,7 @@ copyright = '2017, Bob Ippolito'
# The short X.Y version.
version = '3.12'
# The full version, including alpha/beta/rc tags.
-release = '3.12.0'
+release = '3.12.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 70e2391..50ee63c 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ from distutils.errors import CCompilerError, DistutilsExecError, \
DistutilsPlatformError
IS_PYPY = hasattr(sys, 'pypy_translation_info')
-VERSION = '3.12.0'
+VERSION = '3.12.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 2f14262..3741f1f 100644
--- a/simplejson/__init__.py
+++ b/simplejson/__init__.py
@@ -97,7 +97,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.12.0'
+__version__ = '3.12.1'
__all__ = [
'dump', 'dumps', 'load', 'loads',
'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',