drop support for Python 2.6 and 3.2

This commit is contained in:
Victor Stinner 2016-02-22 14:16:40 +01:00
parent a0b7e8f193
commit 66049e8358
5 changed files with 20 additions and 34 deletions

View File

@ -1,7 +1,15 @@
Changelog Changelog
========= =========
* aioeventlet API is now considered as stable Version 0.5
-----------
* Unit tests now use the aiotest library.
* Fix for eventlet used with monkey-patching: inject the original threading
module and the original threading.get_ident() function in
asyncio.base_events.
* Drop support for Python 2.6 and Python 3.2. aioeventlet depends on trollius
and pip which don't support these Python versions anymore.
2014-12-03: Version 0.4 2014-12-03: Version 0.4
----------------------- -----------------------

View File

@ -123,6 +123,10 @@ API
aioeventlet specific functions: aioeventlet specific functions:
.. warning::
aioeventlet API is not considered as stable yet.
yield_future yield_future
------------ ------------
@ -282,7 +286,7 @@ Requirements:
needed) needed)
* Python 3.3: need Tulip 0.4.1 or newer (``pip install asyncio``), * Python 3.3: need Tulip 0.4.1 or newer (``pip install asyncio``),
but Tulip 3.4.1 or newer is recommended but Tulip 3.4.1 or newer is recommended
* Python 2.6-3.2: need Trollius 0.3 or newer (``pip install trollius``), * Python 2.7: need Trollius 0.3 or newer (``pip install trollius``),
but Trollius 1.0 or newer is recommended but Trollius 1.0 or newer is recommended
Type:: Type::
@ -298,7 +302,7 @@ Run tests with tox
The `tox project <http://testrun.org/tox/latest/>`_ can be used to build a The `tox project <http://testrun.org/tox/latest/>`_ can be used to build a
virtual environment with all runtime and test dependencies and run tests virtual environment with all runtime and test dependencies and run tests
against different Python versions (2.6, 2.7, 3.2, 3.3, 3.4). against different Python versions (2.7, 3.3, 3.4, 3.5).
To test all Python versions, just type:: To test all Python versions, just type::
@ -310,17 +314,16 @@ To run tests with Python 2.7, type::
To run tests against other Python versions: To run tests against other Python versions:
* ``py26``: Python 2.6
* ``py27``: Python 2.7 * ``py27``: Python 2.7
* ``py27_patch``: Python 2.7 with eventlet monkey patching * ``py27_patch``: Python 2.7 with eventlet monkey patching
* ``py27_old``: Python 2.7 with the oldest supported versions of eventlet and * ``py27_old``: Python 2.7 with the oldest supported versions of eventlet and
trollius trollius
* ``py32``: Python 3.2
* ``py33``: Python 3.3 * ``py33``: Python 3.3
* ``py3_patch``: Python 3 with eventlet monkey patching * ``py3_patch``: Python 3 with eventlet monkey patching
* ``py3_old``: Python 3 with the oldest supported versions of eventlet and * ``py3_old``: Python 3 with the oldest supported versions of eventlet and
tulip tulip
* ``py34``: Python 3.4 * ``py34``: Python 3.4
* ``py35``: Python 3.5
Run tests manually Run tests manually
------------------ ------------------

View File

@ -35,7 +35,7 @@ elif (3, 3) <= sys.version_info < (3, 4):
# Python 3.3: use Tulip # Python 3.3: use Tulip
requirements.append('asyncio>=0.4.1') requirements.append('asyncio>=0.4.1')
else: else:
# Python 2.6-3.2: use Trollius # Python 2.7: use Trollius
requirements.append('trollius>=0.3') requirements.append('trollius>=0.3')
with open("README") as fp: with open("README") as fp:

View File

@ -4,13 +4,7 @@ try:
import asyncio import asyncio
except ImportError: except ImportError:
import trollius as asyncio import trollius as asyncio
try: import unittest
# On Python 2.6, unittest2 is needed to get new features like addCleanup()
import unittest2
unittest = unittest2
except ImportError:
import unittest
unittest2 = None
try: try:
from unittest import mock from unittest import mock
except ImportError: except ImportError:
@ -26,6 +20,6 @@ class TestCase(unittest.TestCase):
self.addCleanup(self.loop.close) self.addCleanup(self.loop.close)
self.addCleanup(asyncio.set_event_loop, None) self.addCleanup(asyncio.set_event_loop, None)
if sys.version_info < (3,) and unittest2 is None: if sys.version_info < (3,):
def assertRaisesRegex(self, *args): def assertRaisesRegex(self, *args):
return self.assertRaisesRegexp(*args) return self.assertRaisesRegexp(*args)

21
tox.ini
View File

@ -1,22 +1,12 @@
[tox] [tox]
minversion = 1.4 minversion = 1.4
envlist = py26,py27,py27_old,py27_patch,py32,py33,py3_patch,py3_old,py34,py35 envlist = py27,py27_old,py27_patch,py33,py3_patch,py3_old,py34,py35
[testenv] [testenv]
commands= commands=
python runtests.py -r python runtests.py -r
python run_aiotest.py -r python run_aiotest.py -r
[testenv:py26]
setenv =
TROLLIUSDEBUG = 1
deps=
aiotest
eventlet
mock
trollius
unittest2
[testenv:py27] [testenv:py27]
setenv = setenv =
TROLLIUSDEBUG = 1 TROLLIUSDEBUG = 1
@ -49,15 +39,6 @@ commands=
python runtests.py -r -m python runtests.py -r -m
python run_aiotest.py -r -m python run_aiotest.py -r -m
[testenv:py32]
setenv =
TROLLIUSDEBUG = 1
deps=
aiotest
eventlet
mock
trollius
[testenv:py33] [testenv:py33]
setenv = setenv =
PYTHONASYNCIODEBUG = 1 PYTHONASYNCIODEBUG = 1