diff --git a/docs/conf.py b/docs/conf.py index 5c3eb6e0..8ea77310 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -48,9 +48,9 @@ copyright = u'2011, Kenneth Reitz' # built documents. # # The short X.Y version. -version = '0.2.0' +version = '0.3.2' # The full version, including alpha/beta/rc tags. -release = '0.2.0' +release = version # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/requests/core.py b/requests/core.py index 2a4cc09b..625d845f 100644 --- a/requests/core.py +++ b/requests/core.py @@ -25,8 +25,8 @@ from .packages.poster.streaminghttp import register_openers, get_handlers __title__ = 'requests' -__version__ = '0.3.1' -__build__ = 0x000301 +__version__ = '0.3.2' +__build__ = 0x000302 __author__ = 'Kenneth Reitz' __license__ = 'ISC' __copyright__ = 'Copyright 2011 Kenneth Reitz' diff --git a/setup.py b/setup.py index edf89f1d..b261718a 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ import requests from distutils.core import setup - + if sys.argv[-1] == "publish": os.system("python setup.py sdist upload") sys.exit() @@ -16,10 +16,11 @@ if sys.argv[-1] == "publish": if sys.argv[-1] == "test": os.system("python test_requests.py") sys.exit() - + required = [] -# if python > 2.6, require simplejson +if sys.version_info[:2] < (2,6): + required.append('simplejson') setup( name='requests',