diff --git a/CHANGES.txt b/CHANGES.txt index 07128c469925dfc8258c4d3e2aa99d970b2a24b6_Q0hBTkdFUy50eHQ=..228952258d81c04bdc7115f711346707a4b2e9d6_Q0hBTkdFUy50eHQ= 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,8 @@ +Version 3.4.0 released 2014-04-02 + +* Native setuptools support re-introduced + https://github.com/simplejson/simplejson/pull/92 + Version 3.3.3 released 2014-02-14 * Improve test suite's Python 3.4 compatibility diff --git a/conf.py b/conf.py index 07128c469925dfc8258c4d3e2aa99d970b2a24b6_Y29uZi5weQ==..228952258d81c04bdc7115f711346707a4b2e9d6_Y29uZi5weQ== 100644 --- a/conf.py +++ b/conf.py @@ -42,5 +42,5 @@ # other places throughout the built documents. # # The short X.Y version. -version = '3.3' +version = '3.4' # The full version, including alpha/beta/rc tags. @@ -46,5 +46,5 @@ # The full version, including alpha/beta/rc tags. -release = '3.3.3' +release = '3.4.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 07128c469925dfc8258c4d3e2aa99d970b2a24b6_c2V0dXAucHk=..228952258d81c04bdc7115f711346707a4b2e9d6_c2V0dXAucHk= 100644 --- a/setup.py +++ b/setup.py @@ -1,11 +1,6 @@ #!/usr/bin/env python from __future__ import with_statement -# -# To use setuptools commands such as bdist_egg, execute like this: -# -# python -c 'import setuptools; execfile("setup.py")' bdist_egg -# import sys try: from setuptools import setup, Extension, Command @@ -16,7 +11,7 @@ DistutilsPlatformError IS_PYPY = hasattr(sys, 'pypy_translation_info') -VERSION = '3.3.3' +VERSION = '3.4.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 07128c469925dfc8258c4d3e2aa99d970b2a24b6_c2ltcGxlanNvbi9fX2luaXRfXy5weQ==..228952258d81c04bdc7115f711346707a4b2e9d6_c2ltcGxlanNvbi9fX2luaXRfXy5weQ== 100644 --- a/simplejson/__init__.py +++ b/simplejson/__init__.py @@ -98,7 +98,7 @@ Expecting property name: line 1 column 3 (char 2) """ from __future__ import absolute_import -__version__ = '3.3.3' +__version__ = '3.4.0' __all__ = [ 'dump', 'dumps', 'load', 'loads', 'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',