summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2018-06-28 14:08:44 -0700
committerBob Ippolito <bob@redivi.com>2018-06-28 14:08:44 -0700
commit543b4232813d3be2231124d27f7ae9b95be1beb6 (patch)
tree42eae5b5c72cb8572d5561b9e1eea613446879f6
parent131d225786a98c2c2da5a1dfbbf9db0491fe9ac6 (diff)
downloadsimplejson-543b4232813d3be2231124d27f7ae9b95be1beb6.tar.gz
Update CHANGES for v3.16.0v3.16.0
-rw-r--r--CHANGES.txt10
-rw-r--r--conf.py4
-rw-r--r--setup.py2
-rw-r--r--simplejson/__init__.py2
4 files changed, 14 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index e0e76b4..f64c3a0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,13 @@
+Version 3.16.0 released 2018-06-28
+
+* Restore old behavior with regard to the type of decoded empty
+ strings with speedups enabled on Python 2.x
+ https://github.com/simplejson/simplejson/pull/225
+* Add python_requires to setup.py to help pip
+ https://github.com/simplejson/simplejson/pull/224
+* Fix CSS in docs when built locally
+ https://github.com/simplejson/simplejson/pull/222
+
Version 3.15.0 released 2018-05-12
* Clean up the C code
diff --git a/conf.py b/conf.py
index 0757c78..41001f6 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.15'
+version = '3.16'
# The full version, including alpha/beta/rc tags.
-release = '3.15.0'
+release = '3.16.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 d1a44a6..6c5ca12 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.15.0'
+VERSION = '3.16.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 c796156..0556a7a 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.15.0'
+__version__ = '3.16.0'
__all__ = [
'dump', 'dumps', 'load', 'loads',
'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',