Merge pull request #2602 from bdarnell/version-6.0

Set version to 6.0
tornadoweb · Mar 1, 2019 · 3c8728d · 3c8728d
2 parents 4f1ebe4 + 99ea6d2
commit 3c8728d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/docs/releases/v6.0.0.rst b/docs/releases/v6.0.0.rst
@@ -1,7 +1,7 @@
 What's new in Tornado 6.0
 =========================
 
-In progress
+Mar 1, 2019
 -----------
 
 Backwards-incompatible changes
@@ -16,6 +16,10 @@ Backwards-incompatible changes
   application with the ``-Wd`` Python command-line flag or the
   environment variable ``PYTHONWARNINGS=d`` should tell you whether
   your application is ready to move to Tornado 6.0.
+- ``.WebSocketHandler.get`` is now a coroutine and must be called
+  accordingly in any subclasses that override this method (but note
+  that overriding ``get`` is not recommended; either ``prepare`` or
+  ``open`` should be used instead).
 
 General changes
 ~~~~~~~~~~~~~~~

diff --git a/tornado/__init__.py b/tornado/__init__.py
@@ -22,5 +22,5 @@
 # is zero for an official release, positive for a development branch,
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)
-version = "6.0b1"
-version_info = (6, 0, 0, -98)
+version = "6.0"
+version_info = (6, 0, 0, 0)