diff --git a/CHANGES.txt b/CHANGES.txt index 8d7d1348390b0026db4c8af9ab342d3aaef62fad_Q0hBTkdFUy50eHQ=..bba6f3af3488d3073b9066c79bb0d02bde250301_Q0hBTkdFUy50eHQ= 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,8 @@ +Version 2.2.1 released 2011-09-06 + +* Fix MANIFEST.in issue when building a sdist from a sdist. + https://github.com/simplejson/simplejson/issues/16 + Version 2.2.0 released 2011-09-04 * Remove setuptools requirement, reverted to pure distutils diff --git a/MANIFEST.in b/MANIFEST.in index 8d7d1348390b0026db4c8af9ab342d3aaef62fad_TUFOSUZFU1QuaW4=..bba6f3af3488d3073b9066c79bb0d02bde250301_TUFOSUZFU1QuaW4= 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,3 +2,4 @@ include *.txt include *.rst include scripts/*.py +include MANIFEST.in diff --git a/conf.py b/conf.py index 8d7d1348390b0026db4c8af9ab342d3aaef62fad_Y29uZi5weQ==..bba6f3af3488d3073b9066c79bb0d02bde250301_Y29uZi5weQ== 100644 --- a/conf.py +++ b/conf.py @@ -44,7 +44,7 @@ # The short X.Y version. version = '2.2' # The full version, including alpha/beta/rc tags. -release = '2.2.0' +release = '2.2.1' # 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 8d7d1348390b0026db4c8af9ab342d3aaef62fad_c2V0dXAucHk=..bba6f3af3488d3073b9066c79bb0d02bde250301_c2V0dXAucHk= 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ DistutilsPlatformError IS_PYPY = hasattr(sys, 'pypy_translation_info') -VERSION = '2.2.0' +VERSION = '2.2.1' DESCRIPTION = "Simple, fast, extensible JSON encoder/decoder for Python" LONG_DESCRIPTION = open('README.rst', 'r').read() diff --git a/simplejson/__init__.py b/simplejson/__init__.py index 8d7d1348390b0026db4c8af9ab342d3aaef62fad_c2ltcGxlanNvbi9fX2luaXRfXy5weQ==..bba6f3af3488d3073b9066c79bb0d02bde250301_c2ltcGxlanNvbi9fX2luaXRfXy5weQ== 100644 --- a/simplejson/__init__.py +++ b/simplejson/__init__.py @@ -97,7 +97,7 @@ $ echo '{ 1.2:3.4}' | python -m simplejson.tool Expecting property name: line 1 column 2 (char 2) """ -__version__ = '2.2.0' +__version__ = '2.2.1' __all__ = [ 'dump', 'dumps', 'load', 'loads', 'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',