summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2018-05-12 17:55:14 +0000
committerBob Ippolito <bob@redivi.com>2018-05-12 17:55:14 +0000
commit67d48f67e601bd644f8de975c3287015e4258be2 (patch)
tree2807c58f08cc6b3ce07b0951a2ecce6f6843c77f
parent424a9e9aabba6f000def57c470a18a44076737d8 (diff)
downloadsimplejson-67d48f67e601bd644f8de975c3287015e4258be2.tar.gz
v3.15.0v3.15.0
-rw-r--r--CHANGES.txt15
-rw-r--r--conf.py4
-rw-r--r--setup.py2
-rw-r--r--simplejson/__init__.py2
4 files changed, 19 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 16686f9..e0e76b4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,18 @@
+Version 3.15.0 released 2018-05-12
+
+* Clean up the C code
+ https://github.com/simplejson/simplejson/pull/220
+* Bypass the decode() method in bytes subclasses
+ https://github.com/simplejson/simplejson/pull/219
+* Support builds without cStringIO
+ https://github.com/simplejson/simplejson/pull/217
+* Allow to disable serializing bytes by default in Python 3
+ https://github.com/simplejson/simplejson/pull/216
+* Simplify the compatibility code
+ https://github.com/simplejson/simplejson/pull/215
+* Fix tests in Python 2.5
+ https://github.com/simplejson/simplejson/pull/214
+
Version 3.14.0 released 2018-04-21
* Defer is_raw_json test (performance improvement)
diff --git a/conf.py b/conf.py
index df77b4e..52e51ae 100644
--- a/conf.py
+++ b/conf.py
@@ -42,9 +42,9 @@ copyright = '2018, Bob Ippolito'
# other places throughout the built documents.
#
# The short X.Y version.
-version = '3.14'
+version = '3.15'
# The full version, including alpha/beta/rc tags.
-release = '3.14.0'
+release = '3.15.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 500e447..32b3dcf 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ from distutils.errors import CCompilerError, DistutilsExecError, \
DistutilsPlatformError
IS_PYPY = hasattr(sys, 'pypy_translation_info')
-VERSION = '3.14.0'
+VERSION = '3.15.0'
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 dc35e15..c796156 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.14.0'
+__version__ = '3.15.0'
__all__ = [
'dump', 'dumps', 'load', 'loads',
'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',