From: Ben Darnell Date: Sat, 19 Jan 2013 17:58:54 +0000 (-0500) Subject: Doc updates for py25 removal X-Git-Tag: v3.0.0~174 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=356045e7a8f2257c169fd8230a5f0d5333f2465c;p=thirdparty%2Ftornado.git Doc updates for py25 removal --- diff --git a/README.md b/README.md index 1fc8c2445..2cdb05a7d 100644 --- a/README.md +++ b/README.md @@ -18,10 +18,10 @@ way, so you may wish to download a copy of the source tarball as well. Manual installation ------------------- -Download https://github.com/downloads/facebook/tornado/tornado-2.3.tar.gz +Download the latest release from http://pypi.python.org/pypi/tornado - tar xvzf tornado-2.3.tar.gz - cd tornado-2.3 + tar xvzf tornado-$VERSION.tar.gz + cd tornado-$VERSION python setup.py build sudo python setup.py install @@ -34,22 +34,23 @@ the standard library includes epoll support. Prerequisites ------------- -Tornado runs on Python 2.5, 2.6, 2.7 and 3.2. +Tornado runs on Python 2.6+ and 3.2+. Both CPython and PyPy are supported. -On Python 2.6 and 2.7, there are no dependencies outside the Python -standard library, although PycURL (version 7.18.2 or higher required; -version 7.21.1 or higher recommended) may be used if desired. +There are no required dependencies outside the Python standard library, +although unittest2 is required to run Tornado's unittest suite on +Python 2.6. -On Python 2.5, PycURL is required, along with simplejson and the -Python development headers (typically obtained by installing a package -named something like python-dev from your operating system). +Certain optional features require additional third-party modules: -On Python 3.2, the distribute package is required. Note that Python 3 -support is relatively new and may have bugs. +* tornado.curl_httpclient needs PycURL (version 7.18.2 or higher required; + version 7.21.1 or higher recommended) +* Multithreading support requires the concurrent.futures module, + which is in the standard library for Python 3.2+ and available + at http://pypi.python.org/pypi/futures for older versions. Platforms --------- - Tornado should run on any Unix-like platform, although for the best +Tornado should run on any Unix-like platform, although for the best performance and scalability only Linux and BSD (including BSD derivatives like Mac OS X) are recommended. diff --git a/website/sphinx/releases/next.rst b/website/sphinx/releases/next.rst index 465572ded..28e6a2199 100644 --- a/website/sphinx/releases/next.rst +++ b/website/sphinx/releases/next.rst @@ -4,8 +4,7 @@ What's new in the next release of Tornado In progress ----------- -* The Tornado test suite now requires ``unittest2`` when run on Python 2.5 - or 2.6. +* The Tornado test suite now requires ``unittest2`` when run on Python 2.6. * `tornado.testing.AsyncTestCase` and friends now extend ``unittest2.TestCase`` when it is available (and continue to use the standard ``unittest`` module when ``unittest2`` is not available) @@ -208,3 +207,5 @@ In progress * `IOStream.close` now has an ``exc_info`` argument (similar to the one used in the `logging` module) that can be used to set the stream's ``error`` attribute when closing it. +* Python 2.5 is no longer supported. +* Installation under Python 3 no longer uses ``2to3``. diff --git a/website/templates/index.html b/website/templates/index.html index 9414d2f2b..bd61129a0 100644 --- a/website/templates/index.html +++ b/website/templates/index.html @@ -49,13 +49,12 @@ if __name__ == "__main__": cd tornado-{{version}} python setup.py build sudo python setup.py install -

The Tornado source code is hosted on GitHub. On Python 2.6 and 2.7, it is also possible to simply add the tornado directory to your PYTHONPATH instead of building with setup.py, since the standard library includes epoll support.

+

The Tornado source code is hosted on GitHub. It is also possible to simply add the tornado directory to your PYTHONPATH instead of building with setup.py. -

Prerequisites: Tornado runs on Python 2.5, 2.6, 2.7 and 3.2. +

Prerequisites: Tornado runs on Python 2.6+ and 3.2+. Both CPython and PyPy are supported. There are no required dependencies outside the Python standard library, although unittest2 is required to run Tornado's unittest suite on Python 2.6. Certain optional features require additional third-party modules:

Platforms: Tornado should run on any Unix-like platform, although