Skip to content

Commit 210c5c8

Browse files
bdarnellbdarnell
committed
Document the fact that tornado can be installed with pip/etc.
1 parent d8b6d98 commit 210c5c8

File tree

2 files changed

+27
-37
lines changed

2 files changed

+27
-37
lines changed

‎website/templates/documentation.txt

Lines changed: 21 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -46,39 +46,27 @@ modules, so you should (theoretically) be able to use any of the modules
4646
independently in your project without using the whole package.
4747

4848

49-
Download
50-
--------
51-
Download the most recent version of Tornado from GitHub:
52-
53-
> [tornado-1.1.1.tar.gz](http://github.com/downloads/facebook/tornado/tornado-1.1.1.tar.gz)
54-
55-
You can also [browse the source](http://github.com/facebook/tornado) on GitHub. To install Tornado:
56-
57-
tar xvzf tornado-1.1.1.tar.gz
58-
cd tornado-1.1.1
59-
python setup.py build
60-
sudo python setup.py install
61-
62-
After installation, you should be able to run any of the demos in the `demos`
63-
directory included with the Tornado package.
64-
65-
./demos/helloworld/helloworld.py
66-
67-
### Prerequisites
68-
69-
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.
70-
71-
**Mac OS X 10.6 (Python 2.6)**
72-
73-
sudo easy_install pycurl
74-
75-
**Ubuntu Linux (Python 2.6)**
76-
77-
sudo apt-get install python-pycurl
78-
79-
**Ubuntu Linux (Python 2.5)**
80-
81-
sudo apt-get install python-dev python-pycurl python-simplejson
49+
Download and install
50+
--------------------
51+
<p><b>Automatic installation:</b> Tornado is listed in <a href="http://pypi.python.org/pypi/tornado">PyPI</a> and can be installed with <code>pip</code> or <code>easy_install</code>. 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 <code>pip</code> or <code>easy_install</code></p>
52+
53+
<p><b>Manual installation:</b> Download <a href="http://github.com/downloads/facebook/tornado/tornado-1.1.1.tar.gz">tornado-1.1.1.tar.gz</a></p>
54+
<pre><code>tar xvzf tornado-1.1.1.tar.gz
55+
cd tornado-1.1.1
56+
python setup.py build
57+
sudo python setup.py install</code></pre>
58+
<p>The Tornado source code is <a href="http://github.com/facebook/tornado">hosted on GitHub</a>. On Python 2.6+, it is also possible to simply add the tornado directory to your <code>PYTHONPATH</code> instead of building with <code>setup.py</code>, since the standard library includes <code>epoll</code> support.</p>
59+
60+
<h3>Prerequisites</h3>
61+
<p>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 <a href="http://pycurl.sourceforge.net/">PycURL</a> (version 7.18.2 or higher) and (for Python 2.5 only) <a href="http://pypi.python.org/pypi/simplejson/">simplejson</a> 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.</p>
62+
<p style="font-weight:bold">Mac OS X 10.6 (Python 2.6+)</p>
63+
<pre><code>sudo easy_install setuptools pycurl</code></pre>
64+
65+
<p style="font-weight:bold">Ubuntu Linux (Python 2.6+)</p>
66+
<pre><code>sudo apt-get install python-pycurl</code></pre>
67+
68+
<p style="font-weight:bold">Ubuntu Linux (Python 2.5)</p>
69+
<pre><code>sudo apt-get install python-dev python-pycurl python-simplejson</code></pre>
8270

8371

8472
Module index

‎website/templates/index.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,21 @@
66
<p>See the <a href="/documentation">Tornado documentation</a> for a detailed walkthrough of the framework.</p>
77

88
<h2>Download and install</h2>
9-
<p><b>Download:</b> <a href="http://github.com/downloads/facebook/tornado/tornado-1.1.1.tar.gz">tornado-1.1.1.tar.gz</a></p>
9+
<p><b>Automatic installation:</b> Tornado is listed in <a href="http://pypi.python.org/pypi/tornado">PyPI</a> and can be installed with <code>pip</code> or <code>easy_install</code>. 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 <code>pip</code> or <code>easy_install</code></p>
10+
11+
<p><b>Manual installation:</b> Download <a href="http://github.com/downloads/facebook/tornado/tornado-1.1.1.tar.gz">tornado-1.1.1.tar.gz</a></p>
1012
<pre><code>tar xvzf tornado-1.1.1.tar.gz
1113
cd tornado-1.1.1
1214
python setup.py build
1315
sudo python setup.py install</code></pre>
1416
<p>The Tornado source code is <a href="http://github.com/facebook/tornado">hosted on GitHub</a>. On Python 2.6+, it is also possible to simply add the tornado directory to your <code>PYTHONPATH</code> instead of building with <code>setup.py</code>, since the standard library includes <code>epoll</code> support.</p>
1517

1618
<h3>Prerequisites</h3>
17-
<p>Tornado has been tested on Python 2.5 and 2.6. To use all of the features of Tornado, you need to have <a href="http://pycurl.sourceforge.net/">PycURL</a> (version 7.18.2 or higher) and (for Python 2.5 only) <a href="http://pypi.python.org/pypi/simplejson/">simplejson</a> 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.</p>
18-
<p style="font-weight:bold">Mac OS X 10.6 (Python 2.6)</p>
19+
<p>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 <a href="http://pycurl.sourceforge.net/">PycURL</a> (version 7.18.2 or higher) and (for Python 2.5 only) <a href="http://pypi.python.org/pypi/simplejson/">simplejson</a> 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.</p>
20+
<p style="font-weight:bold">Mac OS X 10.6 (Python 2.6+)</p>
1921
<pre><code>sudo easy_install setuptools pycurl</code></pre>
2022

21-
<p style="font-weight:bold">Ubuntu Linux (Python 2.6)</p>
23+
<p style="font-weight:bold">Ubuntu Linux (Python 2.6+)</p>
2224
<pre><code>sudo apt-get install python-pycurl</code></pre>
2325

2426
<p style="font-weight:bold">Ubuntu Linux (Python 2.5)</p>

0 commit comments

Comments
 (0)