test tx 16.5; bump version; update changelog

This commit is contained in:
Tobias Oberstein 2016-11-06 19:58:30 +01:00
parent 623ef68776
commit 5a20dfa5fd
4 changed files with 23 additions and 14 deletions

View File

@ -10,29 +10,29 @@ env:
- TOX_ENV=py27-tw121
- TOX_ENV=py27-tw132
- TOX_ENV=py27-tw154
- TOX_ENV=py27-tw162
- TOX_ENV=py27-tw165
- TOX_ENV=py27-twtrunk
- TOX_ENV=py27-asyncio
- TOX_ENV=pypy-tw121
- TOX_ENV=pypy-tw132
- TOX_ENV=pypy-tw154
- TOX_ENV=pypy-tw162
- TOX_ENV=pypy-tw165
- TOX_ENV=pypy-twtrunk
- TOX_ENV=pypy-asyncio
- TOX_ENV=py33-tw154
- TOX_ENV=py33-tw162
- TOX_ENV=py33-tw165
- TOX_ENV=py33-twtrunk
- TOX_ENV=py33-asyncio
- TOX_ENV=py34-tw154
- TOX_ENV=py34-tw162
- TOX_ENV=py34-tw165
- TOX_ENV=py34-twtrunk
- TOX_ENV=py34-asyncio
#- TOX_ENV=py35-tw154
#- TOX_ENV=py35-tw162
#- TOX_ENV=py35-tw165
#- TOX_ENV=py35-twtrunk
#- TOX_ENV=py35-asyncio
@ -55,7 +55,7 @@ matrix:
- python: 3.5
env:
- TOX_ENV=py35-tw162
- TOX_ENV=py35-tw165
- python: 3.5
env:

View File

@ -1,6 +1,15 @@
txio releases
=============
2.5.2
-----
- November 6, 2016
- fix pytest3/2
- fix Sphinx 1.4+ doc building
- Copyrights transferred from Tavendo to Crossbar.io Technologies
2.5.1
-----

14
tox.ini
View File

@ -1,11 +1,11 @@
[tox]
envlist =
flake8
py27-{tw121,tw132,tw154,tw162,twtrunk,asyncio}
pypy-{tw121,tw132,tw154,tw162,twtrunk,asyncio}
py33-{tw154,tw162,twtrunk,asyncio}
py34-{tw154,tw162,twtrunk,asyncio}
py35-{tw154,tw162,twtrunk,asyncio}
py27-{tw121,tw132,tw154,tw165,twtrunk,asyncio}
pypy-{tw121,tw132,tw154,tw165,twtrunk,asyncio}
py33-{tw154,tw165,twtrunk,asyncio}
py34-{tw154,tw165,twtrunk,asyncio}
py35-{tw154,tw165,twtrunk,asyncio}
[testenv]
deps =
@ -18,9 +18,9 @@ deps =
tw121: twisted==12.1.0
tw132: twisted==13.2.0
tw154: twisted==15.4.0
tw162: twisted==16.2.0
tw165: twisted==16.5.0
twtrunk: https://github.com/twisted/twisted/archive/trunk.zip
{tw121,tw132,tw154,tw162,twtrunk}: pytest-twisted
{tw121,tw132,tw154,tw165,twtrunk}: pytest-twisted
; asyncio dependencies
py26-asyncio: trollius>=2.0

View File

@ -1 +1 @@
__version__ = u'2.5.1'
__version__ = u'2.5.2'