Update version number to 1.2

diff --git a/setup.py b/setup.py
index 38011a057859339e0477aee7fbe683cc77a4a189..8e1550e8fd7b789fddf31738493ba73047af8e7a 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@ if "linux" in sys.platform.lower() and not python_26:
     extensions.append(distutils.core.Extension(
         "tornado.epoll", ["tornado/epoll.c"]))
 
-version = "1.1.1"
+version = "1.2"
 
 distutils.core.setup(
     name="tornado",

diff --git a/tornado/__init__.py b/tornado/__init__.py
index b5992116f5e296afde9665960140cc3f9f95dd21..bfb96b086950e5d102db6baa545a9c5d66b3f8fa 100644 (file)
--- a/tornado/__init__.py
+++ b/tornado/__init__.py
@@ -16,5 +16,5 @@
 
 """The Tornado web server and tools."""
 
-version = "1.1.1"
-version_info = (1, 1, 1)
+version = "1.2"
+version_info = (1, 2, 0)

diff --git a/website/templates/documentation.txt b/website/templates/documentation.txt
index 129ce3488a3a25e6489603d452da21e310751158..ffea8e7138ac4e72fac402b38cde2c56b6474c61 100644 (file)
--- a/website/templates/documentation.txt
+++ b/website/templates/documentation.txt
@@ -50,9 +50,9 @@ Download and install
 --------------------
   <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>
 
-  <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>
-  <pre><code>tar xvzf tornado-1.1.1.tar.gz
-cd tornado-1.1.1
+  <p><b>Manual installation:</b> Download <a href="http://github.com/downloads/facebook/tornado/tornado-1.2.tar.gz">tornado-1.2.tar.gz</a></p>
+  <pre><code>tar xvzf tornado-1.2.tar.gz
+cd tornado-1.2
 python setup.py build
 sudo python setup.py install</code></pre>
   <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>

diff --git a/website/templates/index.html b/website/templates/index.html
index ff003a489988214dd8548b44d3ea39286b2df7d6..a34a7e4860ea1faceb790bbb2aa01aaedfb62baf 100644 (file)
--- a/website/templates/index.html
+++ b/website/templates/index.html
@@ -8,9 +8,9 @@
   <h2>Download and install</h2>
   <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>
 
-  <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>
-  <pre><code>tar xvzf tornado-1.1.1.tar.gz
-cd tornado-1.1.1
+  <p><b>Manual installation:</b> Download <a href="http://github.com/downloads/facebook/tornado/tornado-1.2.tar.gz">tornado-1.2.tar.gz</a></p>
+  <pre><code>tar xvzf tornado-1.2.tar.gz
+cd tornado-1.2
 python setup.py build
 sudo python setup.py install</code></pre>
   <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>