Skip to content

Commit

Permalink
Rel1921 (#1114)
Browse files Browse the repository at this point in the history
* bump version; update changelog
* update and fix ci
  • Loading branch information
oberstet committed Feb 14, 2019
1 parent 4b4227a commit da5a235
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 112 deletions.
120 changes: 37 additions & 83 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
sudo: false
dist: trusty

language: python
dist: xenial
sudo: true

before_install:
# AWS tools are installed here eg
Expand All @@ -11,7 +10,8 @@ before_install:
- export BUILD_ID="$(date --utc "+%Y%m%d")-$(git rev-parse --short ${TRAVIS_COMMIT})"

install:
- pip install tox codecov
- pip install setuptools wheel tox codecov
- pip install --force-reinstall -U "pip<19"

script:
- tox -c tox.ini -e $TOX_ENV
Expand All @@ -27,131 +27,85 @@ matrix:
fast_finish: true

include:
- python: 3.6
- python: "3.7"
env:
- TOX_ENV=flake8

#
# CPython 2.7
#
- python: 2.7
env:
- TOX_ENV=py27-tw154

- python: 2.7
env:
- TOX_ENV=py27-tw187

- python: 2.7
env:
- TOX_ENV=py27-twtrunk

- python: 2.7
env:
- TOX_ENV=py27-asyncio

#
# CPython 3.4
#
- python: 3.4
env:
- TOX_ENV=py34-tw154

- python: 3.4
env:
- TOX_ENV=py34-tw187

- python: 3.4
env:
- TOX_ENV=py34-twtrunk

- python: 3.4
env:
- TOX_ENV=py34-asyncio

#
# CPython 3.6
# PyPy3
#
- python: 3.6
- python: "pypy3.5"
env:
- TOX_ENV=py36-tw154
- TOX_ENV=pypy3-tw154

- python: 3.6
- python: "pypy3.5"
env:
- TOX_ENV=py36-tw187
- TOX_ENV=pypy3-tw189

- python: 3.6
- python: "pypy3.5"
env:
- TOX_ENV=py36-twtrunk
- TOX_ENV=pypy3-twtrunk

- python: 3.6
- python: "pypy3.5"
env:
- TOX_ENV=py36-asyncio
- TOX_ENV=pypy3-asyncio

#
# CPython 3.7
#
- python: 3.7
dist: xenial
sudo: required
- python: "3.7"
env:
- TOX_ENV=py37-tw154

- python: 3.7
dist: xenial
sudo: required
- python: "3.7"
env:
- TOX_ENV=py37-tw187
- TOX_ENV=py37-tw189

- python: 3.7
dist: xenial
sudo: required
- python: "3.7"
env:
- TOX_ENV=py37-twtrunk

- python: 3.7
dist: xenial
sudo: required
- python: "3.7"
env:
- TOX_ENV=py37-asyncio

#
# PyPy3
# CPython 3.5
#
- python: pypy
- python: "3.5"
env:
- TOX_ENV=pypy-tw154
- TOX_ENV=py35-tw154

- python: pypy
- python: "3.5"
env:
- TOX_ENV=pypy-tw187
- TOX_ENV=py35-tw189

- python: pypy
- python: "3.5"
env:
- TOX_ENV=pypy-twtrunk
- TOX_ENV=py35-twtrunk

- python: pypy
- python: "3.5"
env:
- TOX_ENV=pypy-asyncio
- TOX_ENV=py35-asyncio

#
# PyPy3
# CPython 2.7
#
- python: pypy3
- python: "2.7"
env:
- TOX_ENV=pypy3-tw154
- TOX_ENV=py27-tw154

- python: pypy3
- python: "2.7"
env:
- TOX_ENV=pypy3-tw187
- TOX_ENV=py27-tw189

- python: pypy3
- python: "2.7"
env:
- TOX_ENV=pypy3-twtrunk
- TOX_ENV=py27-twtrunk

- python: pypy3
- python: "2.7"
env:
- TOX_ENV=pypy3-asyncio
- TOX_ENV=py27-asyncio


# CI notifications
Expand Down
2 changes: 1 addition & 1 deletion autobahn/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
#
###############################################################################

__version__ = u'19.1.1'
__version__ = u'19.2.1'
8 changes: 8 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@
Changelog
=========

19.2.1
------

* fix: set announced roles on appsession object (#1109)
* new: lower log noise on ApplicationErrors (#1107)
* new: allow explicit passing of tx endpoint and reactor (#1103)
* new: add attribute to forward applicationrunner to applicationsession via componentconfig

19.1.1
------

Expand Down
38 changes: 10 additions & 28 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,12 @@ envlist =
flake8

# CPython
py27-{tw154,tw187,twtrunk,asyncio}
py34-{tw154,tw187,twtrunk,asyncio}
py35-{tw154,tw187,twtrunk,asyncio}
py36-{tw154,tw187,twtrunk,asyncio}
py37-{tw154,tw187,twtrunk,asyncio}
py27-{tw154,tw189,twtrunk,asyncio}
py35-{tw154,tw189,twtrunk,asyncio}
py37-{tw154,tw189,twtrunk,asyncio}

# PyPy
pypy-{tw154,tw187,twtrunk,asyncio}
pypy3-{tw154,tw187,twtrunk,asyncio}
pypy3-{tw154,tw189,twtrunk,asyncio}


[flake8]
Expand All @@ -23,39 +20,24 @@ deps =
mock
unittest2
coverage
pytest<3.3.0
pytest
# pytest<3.3.0

; txaio
git+https://github.com/crossbario/txaio

; twisted dependencies
tw154: twisted==15.4.0
tw165: twisted==16.5.0
tw169: twisted==16.9.0
tw171: twisted==17.1.0
tw179: twisted==17.9.0
tw187: twisted==18.7.0
tw189: twisted==18.9.0
twtrunk: https://github.com/twisted/twisted/archive/trunk.zip
{tw154,tw165,tw169,tw171,tw179,tw187,twtrunk}: pytest-twisted
{tw154,tw189,twtrunk}: pytest-twisted

; asyncio dependencies
py26-asyncio: trollius>=2.0
py26-asyncio: ordereddict
py27-asyncio: trollius>=2.0
pypy-asyncio: trollius>=2.0
py33-asyncio: asyncio>=3.4.3

py33-asyncio: pytest_asyncio<0.6
py34-asyncio: pytest_asyncio<0.6
py35-asyncio: pytest_asyncio
py36-asyncio: pytest_asyncio
py37-asyncio: pytest_asyncio
pypy3-asyncio: pytest_asyncio

; aiohttp requires Python 3.4.2+
; py34-asyncio: pytest-aiohttp
; py35-asyncio: pytest-aiohttp

# http://tox.readthedocs.io/en/latest/config.html#confval-extras=MULTI-LINE-LIST
extras =
encryption
Expand All @@ -69,7 +51,7 @@ commands =
coverage --version
asyncio: coverage run --source {envsitepackagesdir}/autobahn/ {envbindir}/py.test -v {envsitepackagesdir}/autobahn/
tw154: coverage run --source {envsitepackagesdir}/autobahn/ {envbindir}/trial autobahn
tw165,tw169,tw171,tw179,tw187,twtrunk: coverage run --source {envsitepackagesdir}/autobahn/ -m twisted.trial autobahn
tw189,twtrunk: coverage run --source {envsitepackagesdir}/autobahn/ -m twisted.trial autobahn
coverage report

whitelist_externals = sh
Expand All @@ -78,7 +60,7 @@ setenv =
PYUBJSON_NO_EXTENSION = 1
SODIUM_INSTALL = bundled
asyncio: USE_ASYNCIO = 1
tw154,tw165,tw169,tw171,tw179,tw187,twtrunk: USE_TWISTED = 1
tw154,tw189,twtrunk: USE_TWISTED = 1


[testenv:flake8]
Expand Down

0 comments on commit da5a235

Please sign in to comment.