Skip to content

Commit

Permalink
BUMP 1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ajdavis committed Sep 1, 2015
1 parent d2b3dfb commit d856ecf
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 9 deletions.
4 changes: 4 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ toro

Documentation: http://toro.readthedocs.org/

.. important:: Toro is completed and deprecated; its features have been merged
into Tornado. Development of locks and queues for Tornado coroutines continues
in Tornado itself.

.. image:: https://travis-ci.org/ajdavis/toro.png
:target: https://travis-ci.org/ajdavis/toro

Expand Down
17 changes: 14 additions & 3 deletions doc/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,22 @@ Changelog

.. module:: toro

Changes in Next Version
-----------------------
Changes in Version 1.0
----------------------

This is the final release of Toro. Its features are merged into Tornado 4.2.
Further development of locks and queues for Tornado coroutines will continue
in Tornado.

For more information on the end of Toro,
`read my article <http://emptysqua.re/blog/tornado-locks-and-queues/>`_.
The Tornado changelog has comprehensive instructions on
`porting from Toro's locks and queues to Tornado 4.2 locks and queues
<http://www.tornadoweb.org/en/stable/releases/v4.2.0.html#new-modules-tornado-locks-and-tornado-queues>`_.

:class:`.RWLock` contributed by
Toro 1.0 has one new feature, an :class:`.RWLock` contributed by
`Alexander Gridnev <https://github.com/alexander-gridnev>`_.
:class:`.RWLock` has *not* been merged into Tornado.


Changes in Version 0.8
Expand Down
7 changes: 3 additions & 4 deletions doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,9 @@ Toro provides to Tornado coroutines a set of locking primitives and queues
analogous to those that Gevent provides to Greenlets, or that the standard
library provides to threads.

*(Note that these primitives and queues are not actually thread-safe and cannot
be used in place of those from the standard library--they are meant to
coordinate Tornado coroutines in single-threaded apps, not to protect shared
objects in multithreaded apps.)*
.. important:: Toro is completed and deprecated; its features have been merged
into Tornado. Development of locks and queues for Tornado coroutines continues
in Tornado itself.

.. _gen: http://www.tornadoweb.org/en/stable/gen.html

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
packages.append('test')

setup(name='toro',
version='0.8+',
version='1.0',
packages=packages,
description=description,
long_description=long_description,
Expand Down
2 changes: 1 addition & 1 deletion toro/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from tornado.concurrent import Future


version_tuple = (0, 8, '+')
version_tuple = (1, 0)

version = '.'.join(map(str, version_tuple))
"""Current version of Toro."""
Expand Down

0 comments on commit d856ecf

Please sign in to comment.