summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO.rst1
-rw-r--r--doc/changelog.rst1
-rw-r--r--doc/dev.rst5
-rw-r--r--doc/index.rst4
-rw-r--r--doc/install.rst22
-rw-r--r--tox.ini2
6 files changed, 21 insertions, 14 deletions
diff --git a/TODO.rst b/TODO.rst
index 31683a5..e4a785e 100644
--- a/TODO.rst
+++ b/TODO.rst
@@ -1,6 +1,5 @@
Unsorted "TODO" tasks:
-* Drop Python 2.6 and 3.2 support
* Drop platform without ssl module?
* streams.py:FIXME: should we support __aiter__ and __anext__ in Trollius?
* replace selectors.py with selectors34:
diff --git a/doc/changelog.rst b/doc/changelog.rst
index 186d4e1..78fe94e 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -8,6 +8,7 @@ Version 2.1
Changes:
* Better exception traceback. Patch written by Dhawal Yogesh Bhanushali.
+* Drop support for Python 2.6 and 3.2.
Version 2.0 (2015-07-13)
diff --git a/doc/dev.rst b/doc/dev.rst
index 1bed7f8..c0bbf36 100644
--- a/doc/dev.rst
+++ b/doc/dev.rst
@@ -6,7 +6,7 @@ Run tests with tox
The `tox project <https://testrun.org/tox/latest/>`_ can be used to build a
virtual environment with all runtime and test dependencies and run tests
-against different Python versions (2.6, 2.7, 3.2, 3.3).
+against different Python versions (2.7, 3.3, 3.4).
For example, to run tests with Python 2.7, just type::
@@ -14,10 +14,9 @@ For example, to run tests with Python 2.7, just type::
To run tests against other Python versions:
-* ``py26``: Python 2.6
* ``py27``: Python 2.7
-* ``py32``: Python 3.2
* ``py33``: Python 3.3
+* ``py34``: Python 3.4
Test Dependencies
diff --git a/doc/index.rst b/doc/index.rst
index 5135da1..cb344e4 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -35,8 +35,8 @@ Here is a more detailed list of the package contents:
Trollius is a portage of the `asyncio project <https://github.com/python/asyncio>`_
(``asyncio`` module, `PEP 3156 <http://legacy.python.org/dev/peps/pep-3156/>`_)
-on Python 2. Trollius works on Python 2.6-3.5. It has been tested on Windows,
-Linux, Mac OS X, FreeBSD and OpenIndiana.
+on Python 2. Trollius works on Python 2.7, 3.3 and 3.4. It has been tested on
+Windows, Linux, Mac OS X, FreeBSD and OpenIndiana.
* `Asyncio documentation <http://docs.python.org/dev/library/asyncio.html>`_
* `Trollius documentation <http://trollius.readthedocs.org/>`_ (this document)
diff --git a/doc/install.rst b/doc/install.rst
index db4a8b1..845e6e5 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -2,6 +2,17 @@
Install Trollius
++++++++++++++++
+Trollius supports Python 2.7, 3.3 and 3.4.
+
+There is an experimental support of Python 3.5. Issues with Python 3.5:
+
+* don't support asyncio coroutines
+* ``Task.get_task()`` is broken
+* ``repr(Task)`` is broken
+
+Support of Python 2.6 and 3.2 was dropped in Trollius 2.1.
+
+
Packages for Linux
==================
@@ -67,11 +78,8 @@ Dependencies
Trollius requires the `six <https://pypi.python.org/pypi/six>`_ module.
-On Python older than 3.2, the `futures <https://pypi.python.org/pypi/futures>`_
-project is needed to get a backport of ``concurrent.futures``.
-
-Python 2.6 requires also `ordereddict
-<https://pypi.python.org/pypi/ordereddict>`_.
+Python 2.7 requires `futures <https://pypi.python.org/pypi/futures>`_ to get a
+backport of ``concurrent.futures``.
Build manually Trollius on Windows
@@ -90,8 +98,8 @@ extension using::
Backports
=========
-To support Python 2.6-3.4, many Python modules of the standard library have
-been backported:
+To support old Python versions, many Python modules of the standard library
+have been backported:
======================== ========= =======================
Name Python Backport
diff --git a/tox.ini b/tox.ini
index 2dde943..5058dd8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py26,py27,py2_release,py2_no_ssl,py2_no_concurrent,py32,py33,py34,py3_release,py3_no_ssl
+envlist = py27,py2_release,py2_no_ssl,py2_no_concurrent,py33,py34,py3_release,py3_no_ssl
# and: pyflakes2,pyflakes3
[testenv]