diff --git a/.travis.yml b/.travis.yml index bf7be68..1d6ee77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ sudo: false +dist: bionic language: python python: @@ -10,11 +11,12 @@ python: env: - TWISTED="twisted" -- TWISTED="twisted==18.7.0" +- TWISTED="twisted==20.3.0" install: -- pip install $TWISTED -e .[tests] -- pip freeze + - pip install -U pytest # Travis comes with an old version pre-installed. + - pip install $TWISTED -e .[tests] + - pip freeze script: - pytest diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 9462217..b062d02 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,12 +1,19 @@ +Unreleased +---------- + +* Updated twisted requirement to 20.3 or later. +* Updated Autobahn dependency to 20.4 or later. + + 2.5.0 (2020-04-15) ------------------ -* Fixes compatability for twisted when running Python 3.8+ on Windows, by - setting ``asyncio.WindowsSelectorEventLoopPolicy`` as the event loop policy - in this case. +* Fixes compatability for twisted when running Python 3.8+ on Windows, by + setting ``asyncio.WindowsSelectorEventLoopPolicy`` as the event loop policy + in this case. -* The internal ``daphne.testing.TestApplication`` now requires an addition - ``lock`` argument to ``__init__()``. This is expected to be an instance of +* The internal ``daphne.testing.TestApplication`` now requires an addition + ``lock`` argument to ``__init__()``. This is expected to be an instance of ``multiprocessing.Lock``. 2.4.1 (2019-12-18) diff --git a/setup.py b/setup.py index 357e294..5eba488 100755 --- a/setup.py +++ b/setup.py @@ -22,10 +22,10 @@ setup( package_dir={"twisted": "daphne/twisted"}, packages=find_packages() + ["twisted.plugins"], include_package_data=True, - install_requires=["twisted[tls]>=18.7", "autobahn>=0.18", "asgiref~=3.2"], + install_requires=["twisted[tls]>=20.3", "autobahn>=20.4", "asgiref~=3.2"], setup_requires=["pytest-runner"], extras_require={ - "tests": ["hypothesis==4.23", "pytest~=3.10", "pytest-asyncio~=0.8"] + "tests": ["hypothesis", "pytest", "pytest-asyncio"] }, entry_points={ "console_scripts": ["daphne = daphne.cli:CommandLineInterface.entrypoint"]