From: Ben Darnell Date: Thu, 22 Jul 2010 20:04:10 +0000 (-0700) Subject: Update installation instructions. X-Git-Tag: v1.0.0~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a288245dc49589f84c45d25fbe4320185cae7d0;p=thirdparty%2Ftornado.git Update installation instructions. --- diff --git a/website/templates/documentation.txt b/website/templates/documentation.txt index 5c55999fb..67bdf895b 100644 --- a/website/templates/documentation.txt +++ b/website/templates/documentation.txt @@ -70,11 +70,19 @@ directory included with the Tornado package. Tornado has been tested on Python 2.5 and 2.6. To use all of the features of Tornado, you need to have [PycURL](http://pycurl.sourceforge.net/) and a JSON library like [simplejson](http://pypi.python.org/pypi/simplejson/) installed. Complete installation instructions for Mac OS X and Ubuntu are included below for convenience. -**Mac OS X 10.5/10.6** +**Mac OS X 10.6 (Python 2.6)** + + sudo easy_install pycurl + +**Mac OS X 10.5 (Python 2.5)** sudo easy_install setuptools pycurl==7.16.2.1 simplejson -**Ubuntu Linux** +**Ubuntu Linux (Python 2.6)** + + sudo apt-get install python-pycurl + +**Ubuntu Linux (Python 2.5)** sudo apt-get install python-dev python-pycurl python-simplejson @@ -688,7 +696,7 @@ the Google credentials in a cookie for later access: self.get_authenticated_user(self.async_callback(self._on_auth)) return self.authenticate_redirect() - + def _on_auth(self, user): if not user: self.authenticate_redirect() @@ -704,7 +712,7 @@ Web application performance is generally bound by architecture, not frontend performance. That said, Tornado is pretty fast relative to most popular Python web frameworks. -We ran a few remedial load tests on a simple "Hello, world" application +We ran a few remedial load tests on a simple "Hello, world" application in each of the most popular Python web frameworks ([Django](http://www.djangoproject.com/), [web.py](http://webpy.org/), and [CherryPy](http://www.cherrypy.org/)) to get the baseline performance of @@ -779,7 +787,7 @@ are running on ports 8000 - 8003: tcp_nodelay on; gzip on; gzip_min_length 1000; - gzip_proxied any; + gzip_proxied any; gzip_types text/plain text/html text/css text/xml application/x-javascript application/xml application/atom+xml text/javascript; diff --git a/website/templates/index.html b/website/templates/index.html index 4aa716598..13e9427e6 100644 --- a/website/templates/index.html +++ b/website/templates/index.html @@ -11,14 +11,20 @@ cd tornado-0.2 python setup.py build sudo python setup.py install -

The Tornado source code is hosted on GitHub.

+

The Tornado source code is hosted on GitHub. On Python 2.6+, 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.

Prerequisites

Tornado has been tested on Python 2.5 and 2.6. To use all of the features of Tornado, you need to have PycURL and a JSON library like simplejson installed. Complete installation instructions for Mac OS X and Ubuntu are included below for convenience.

-

Mac OS X 10.5/10.6

+

Mac OS X 10.6 (Python 2.6)

+ 
sudo easy_install setuptools pycurl
+ +

Mac OS X 10.5 (Python 2.5)

sudo easy_install setuptools pycurl==7.16.2.1 simplejson
-

Ubuntu Linux

+

Ubuntu Linux (Python 2.6)

+ 
sudo apt-get install python-pycurl
+ +

Ubuntu Linux (Python 2.5)

sudo apt-get install python-dev python-pycurl python-simplejson

Hello, world

@@ -43,7 +49,7 @@ if __name__ == "__main__":

Discussion and support

You can discuss Tornado and report bugs on the Tornado developer mailing list. - +

Updates

Follow us on Facebook, Twitter, or FriendFeed to get updates and announcements:

FacebookTwitterFacebook