From: Ben Darnell Date: Sun, 20 Feb 2011 20:49:53 +0000 (-0800) Subject: Document the fact that tornado can be installed with pip/etc. X-Git-Tag: v1.2.0~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=210c5c827bc7b4538b243893e00473ee0d921292;p=thirdparty%2Ftornado.git Document the fact that tornado can be installed with pip/etc. --- diff --git a/website/templates/documentation.txt b/website/templates/documentation.txt index f08492563..129ce3488 100644 --- a/website/templates/documentation.txt +++ b/website/templates/documentation.txt @@ -46,39 +46,27 @@ modules, so you should (theoretically) be able to use any of the modules independently in your project without using the whole package. -Download --------- -Download the most recent version of Tornado from GitHub: - -> [tornado-1.1.1.tar.gz](http://github.com/downloads/facebook/tornado/tornado-1.1.1.tar.gz) - -You can also [browse the source](http://github.com/facebook/tornado) on GitHub. To install Tornado: - - tar xvzf tornado-1.1.1.tar.gz - cd tornado-1.1.1 - python setup.py build - sudo python setup.py install - -After installation, you should be able to run any of the demos in the `demos` -directory included with the Tornado package. - - ./demos/helloworld/helloworld.py - -### 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](http://pycurl.sourceforge.net/) (version 7.18.2 or higher) and (for Python 2.5 only) [simplejson](http://pypi.python.org/pypi/simplejson/) installed (Python 2.6 includes JSON support in the standard library so simplejson is not needed). Complete installation instructions for Mac OS X and Ubuntu are included below for convenience. - -**Mac OS X 10.6 (Python 2.6)** - - sudo easy_install pycurl - -**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 +Download and install +-------------------- +

Automatic installation: Tornado is listed in PyPI and can be installed with pip or easy_install. If you do not already have libcurl installed you may need to install it separately; see the prerequisites section below. Note that the source distribution includes demo applications that are not present when Tornado is installed using pip or easy_install

+ +

Manual installation: Download tornado-1.1.1.tar.gz

+ 
tar xvzf tornado-1.1.1.tar.gz
+cd tornado-1.1.1
+python setup.py build
+sudo python setup.py install
+

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, 2.6, and 2.7. To use all of the features of Tornado, you need to have PycURL (version 7.18.2 or higher) and (for Python 2.5 only) simplejson installed (Python 2.6 includes JSON support in the standard library so simplejson is not needed). Complete installation instructions for Mac OS X and Ubuntu are included below for convenience.

+

Mac OS X 10.6 (Python 2.6+)

+ 
sudo easy_install setuptools pycurl
+ +

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
Module index diff --git a/website/templates/index.html b/website/templates/index.html index a409dade2..ff003a489 100644 --- a/website/templates/index.html +++ b/website/templates/index.html @@ -6,7 +6,9 @@

See the Tornado documentation for a detailed walkthrough of the framework.

Download and install

-

Download: tornado-1.1.1.tar.gz

+

Automatic installation: Tornado is listed in PyPI and can be installed with pip or easy_install. If you do not already have libcurl installed you may need to install it separately; see the prerequisites section below. Note that the source distribution includes demo applications that are not present when Tornado is installed using pip or easy_install

+ +

Manual installation: Download tornado-1.1.1.tar.gz

tar xvzf tornado-1.1.1.tar.gz
 cd tornado-1.1.1
 python setup.py build
@@ -14,11 +16,11 @@ sudo python setup.py install

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 (version 7.18.2 or higher) and (for Python 2.5 only) simplejson installed (Python 2.6 includes JSON support in the standard library so simplejson is not needed). Complete installation instructions for Mac OS X and Ubuntu are included below for convenience.

-

Mac OS X 10.6 (Python 2.6)

+

Tornado has been tested on Python 2.5, 2.6, and 2.7. To use all of the features of Tornado, you need to have PycURL (version 7.18.2 or higher) and (for Python 2.5 only) simplejson installed (Python 2.6 includes JSON support in the standard library so simplejson is not needed). Complete installation instructions for Mac OS X and Ubuntu are included below for convenience.

+

Mac OS X 10.6 (Python 2.6+)

sudo easy_install setuptools pycurl
-

Ubuntu Linux (Python 2.6)

+

Ubuntu Linux (Python 2.6+)

sudo apt-get install python-pycurl

Ubuntu Linux (Python 2.5)