unpin tx; modify travis setup
This commit is contained in:
Tobias Oberstein
parent
1c86fefa73
commit
35b4c86a37
25
.travis.yml
25
.travis.yml
|
|
@ -10,26 +10,31 @@ env:
|
|||
- TOX_ENV=py27-tw121
|
||||
- TOX_ENV=py27-tw132
|
||||
- TOX_ENV=py27-tw155
|
||||
- TOX_ENV=py27-tw162
|
||||
- TOX_ENV=py27-twtrunk
|
||||
- TOX_ENV=py27-asyncio
|
||||
|
||||
- TOX_ENV=pypy-tw121
|
||||
- TOX_ENV=pypy-tw132
|
||||
- TOX_ENV=pypy-tw155
|
||||
- TOX_ENV=pypy-tw162
|
||||
- TOX_ENV=pypy-twtrunk
|
||||
- TOX_ENV=pypy-asyncio
|
||||
|
||||
- TOX_ENV=py33-tw155
|
||||
- TOX_ENV=py33-tw162
|
||||
- TOX_ENV=py33-twtrunk
|
||||
- TOX_ENV=py33-asyncio
|
||||
|
||||
- TOX_ENV=py34-tw155
|
||||
- TOX_ENV=py34-tw162
|
||||
- TOX_ENV=py34-twtrunk
|
||||
- TOX_ENV=py34-asyncio
|
||||
|
||||
# - TOX_ENV=py35-tw155
|
||||
# - TOX_ENV=py35-twtrunk
|
||||
# - TOX_ENV=py35-asyncio
|
||||
- TOX_ENV=py35-tw155
|
||||
- TOX_ENV=py35-tw162
|
||||
- TOX_ENV=py35-twtrunk
|
||||
- TOX_ENV=py35-asyncio
|
||||
|
||||
script:
|
||||
- tox -c tox.ini -e $TOX_ENV
|
||||
|
|
@ -40,20 +45,6 @@ after_script:
|
|||
matrix:
|
||||
fast_finish: true
|
||||
|
||||
# https://github.com/travis-ci/travis-ci/issues/4794#issuecomment-143758799
|
||||
include:
|
||||
- python: 3.5
|
||||
env:
|
||||
- TOX_ENV=py35-tw155
|
||||
|
||||
- python: 3.5
|
||||
env:
|
||||
- TOX_ENV=py35-twtrunk
|
||||
|
||||
- python: 3.5
|
||||
env:
|
||||
- TOX_ENV=py35-asyncio
|
||||
|
||||
notifications:
|
||||
irc:
|
||||
channels:
|
||||
|
|
|
|||
10
setup.py
10
setup.py
|
|
@ -54,8 +54,8 @@ with open('README.rst') as f:
|
|||
# Twisted dependencies (be careful bumping these minimal versions,
|
||||
# as we make claims to support older Twisted!)
|
||||
extras_require_twisted = [
|
||||
"zope.interface>=4.1.3", # Zope Public License
|
||||
"Twisted>=15.5,<=16.1.1" # MIT license
|
||||
"zope.interface>=3.6.0", # Zope Public License
|
||||
"Twisted>=12.1.0" # MIT license
|
||||
]
|
||||
|
||||
# asyncio dependencies
|
||||
|
|
@ -96,14 +96,14 @@ extras_require_compress = [
|
|||
os.environ['PYUBJSON_NO_EXTENSION'] = '1' # enforce use of pure Python py-ubjson (no Cython)
|
||||
extras_require_serialization = [
|
||||
"u-msgpack-python>=2.1", # MIT license
|
||||
"cbor>=0.1.24", # Apache 2.0 license
|
||||
"py-ubjson>=0.8.3" # Apache 2.0 license
|
||||
"cbor>=1.0.0", # Apache 2.0 license
|
||||
"py-ubjson>=0.8.4" # Apache 2.0 license
|
||||
]
|
||||
|
||||
# payload encryption (required for WAMP-cryptosign support!)
|
||||
os.environ['SODIUM_INSTALL'] = 'bundled' # enforce use of bundled libsodium
|
||||
extras_require_encryption = [
|
||||
'pynacl>=1.0', # Apache license
|
||||
'pynacl>=1.0.1', # Apache license
|
||||
'pytrie>=0.2', # BSD license
|
||||
'pyqrcode>=1.1' # BSD license
|
||||
]
|
||||
|
|
|
|||
22
tox.ini
22
tox.ini
|
|
@ -1,11 +1,11 @@
|
|||
[tox]
|
||||
envlist =
|
||||
flake8
|
||||
py27-{tw121,tw132,tw155,twtrunk,asyncio}
|
||||
pypy-{tw121,tw132,tw155,twtrunk,asyncio}
|
||||
py33-{tw155,twtrunk,asyncio}
|
||||
py34-{tw155,twtrunk,asyncio}
|
||||
py35-{tw155,twtrunk,asyncio}
|
||||
py27-{tw121,tw132,tw155,tw162,twtrunk,asyncio}
|
||||
pypy-{tw121,tw132,tw155,tw162,twtrunk,asyncio}
|
||||
py33-{tw155,tw162,twtrunk,asyncio}
|
||||
py34-{tw155,tw162,twtrunk,asyncio}
|
||||
py35-{tw155,tw162,twtrunk,asyncio}
|
||||
|
||||
|
||||
[flake8]
|
||||
|
|
@ -21,10 +21,7 @@ deps =
|
|||
; WAMP serializers
|
||||
msgpack-python
|
||||
cbor
|
||||
|
||||
; FIXME: install from pypi once py-ubjson has done release >0.8.3
|
||||
; py-ubjson
|
||||
git+https://github.com/Iotic-Labs/py-ubjson@dev-contrib
|
||||
py-ubjson
|
||||
|
||||
; txaio
|
||||
git+https://github.com/tavendo/txaio
|
||||
|
|
@ -34,8 +31,9 @@ deps =
|
|||
tw132: twisted==13.2.0
|
||||
tw154: twisted==15.4.0
|
||||
tw155: twisted==15.5.0
|
||||
tw162: twisted==16.2.0
|
||||
twtrunk: https://github.com/twisted/twisted/archive/trunk.zip
|
||||
{tw121,tw132,tw154,tw155,twtrunk}: pytest-twisted
|
||||
{tw121,tw132,tw154,tw155,tw162,twtrunk}: pytest-twisted
|
||||
|
||||
; asyncio dependencies
|
||||
py26-asyncio: trollius>=2.0
|
||||
|
|
@ -50,7 +48,7 @@ commands =
|
|||
python -V
|
||||
coverage --version
|
||||
asyncio: coverage run {envbindir}/py.test autobahn/
|
||||
tw121,tw132,tw155,twtrunk: coverage run {envbindir}/trial autobahn
|
||||
tw121,tw132,tw155,tw162,twtrunk: coverage run {envbindir}/trial autobahn
|
||||
coverage report
|
||||
|
||||
whitelist_externals = sh
|
||||
|
|
@ -59,7 +57,7 @@ setenv =
|
|||
PYUBJSON_NO_EXTENSION = 1
|
||||
SODIUM_INSTALL = bundled
|
||||
asyncio: USE_ASYNCIO = 1
|
||||
tw121,tw132,tw155,twtrunk: USE_TWISTED = 1
|
||||
tw121,tw132,tw155,tw162,twtrunk: USE_TWISTED = 1
|
||||
|
||||
|
||||
[testenv:flake8]
|
||||
|
|
|
|||
Loading…
Reference in New Issue