v3.11.0v3.11.0

4 files changed, 26 insertions, 4 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index bd01fe8..ae8b7e3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,25 @@
+Version 3.11.0 released 2017-06-18
+
+* docstring fix in JSONEncoder
+  https://github.com/simplejson/simplejson/pull/172
+* Call PyObject_IsTrue() only once for the strict argument of scanner
+  https://github.com/simplejson/simplejson/pull/170
+* Fix a crash with unencodable encoding in the encoder
+  https://github.com/simplejson/simplejson/pull/171
+* Remove unused imports
+  https://github.com/simplejson/simplejson/pull/162
+* Remove remnants of Python 2.4 support
+  https://github.com/simplejson/simplejson/pull/168
+* Fix argument checking errors in _speedups.c
+  https://github.com/simplejson/simplejson/pull/169
+* Remove the `__init__` methods in extension classes
+  https://github.com/simplejson/simplejson/pull/166
+* Fix typo in the doc for loads
+  https://github.com/simplejson/simplejson/issues/161
+* Add Python 3.6 to testing matrix and PyPI metadata
+  https://github.com/simplejson/simplejson/pull/153
+  https://github.com/simplejson/simplejson/pull/152
+
 Version 3.10.0 released 2016-10-28
 
 * Add RawJSON class to allow a faster path for already encoded JSON.
diff --git a/conf.py b/conf.py
index c7ea050..f779eb6 100644
--- a/conf.py
+++ b/conf.py
@@ -42,9 +42,9 @@ copyright = '2016, Bob Ippolito'
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '3.10'
+version = '3.11'
 # The full version, including alpha/beta/rc tags.
-release = '3.10.0'
+release = '3.11.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 901f0ec..7d73979 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.10.0'
+VERSION = '3.11.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 d4876cd..8ba7b7a 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.10.0'
+__version__ = '3.11.0'
 __all__ = [
     'dump', 'dumps', 'load', 'loads',
     'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',