summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Ippolito <bob@redivi.com>2018-04-21 15:07:48 -0700
committerBob Ippolito <bob@redivi.com>2018-04-21 15:07:48 -0700
commit729945a655b2c351ad4c91293a494c066f3bb152 (patch)
treebe1db9f7dfe87920c30cd963015ab9fcd04e78ee
parent967a3b33f6df1eb360cb41753f859c5ba309e09e (diff)
downloadsimplejson-729945a655b2c351ad4c91293a494c066f3bb152.tar.gz
v3.14.0v3.14.0
-rw-r--r--CHANGES.txt6
-rw-r--r--conf.py6
-rw-r--r--setup.py2
-rw-r--r--simplejson/__init__.py2
4 files changed, 10 insertions, 6 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 88d412f..16686f9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,9 @@
-Version 3.13.3 released 2018-XX-XX
+Version 3.14.0 released 2018-04-21
+* Defer is_raw_json test (performance improvement)
+ https://github.com/simplejson/simplejson/pull/212
+* Avoid escaping U+2028 and U+2029 without ensure_ascii
+ https://github.com/simplejson/simplejson/pull/211
* Fix an incorrect type test in Python 2, avoiding an unnecessary unicode copy.
https://github.com/simplejson/simplejson/pull/210
diff --git a/conf.py b/conf.py
index d4b31c0..df77b4e 100644
--- a/conf.py
+++ b/conf.py
@@ -36,15 +36,15 @@ master_doc = 'index'
# General substitutions.
project = 'simplejson'
-copyright = '2017, Bob Ippolito'
+copyright = '2018, Bob Ippolito'
# The default replacements for |version| and |release|, also used in various
# other places throughout the built documents.
#
# The short X.Y version.
-version = '3.13'
+version = '3.14'
# The full version, including alpha/beta/rc tags.
-release = '3.13.3'
+release = '3.14.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 35042c6..500e447 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.13.3'
+VERSION = '3.14.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 0d63911..dc35e15 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.13.3'
+__version__ = '3.14.0'
__all__ = [
'dump', 'dumps', 'load', 'loads',
'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',