diff --git a/.travis.yml b/.travis.yml index 73b3e20c..648c3252 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,12 +8,10 @@ python: env: - TOX_ENV=py27 - - TOX_ENV=py27-tornado32 - TOX_ENV=docs - TOX_ENV=flake8 before_install: - - "sudo sed -i '/127.0.1.1/d' /etc/hosts" # Workaround tornadoweb/tornado#1573 - "sudo apt-get update -qq" - "sudo apt-get install -y gir1.2-gst-plugins-base-1.0 gir1.2-gstreamer-1.0 graphviz-dev gstreamer1.0-plugins-good gstreamer1.0-plugins-bad python-gst-1.0" diff --git a/docs/changelog.rst b/docs/changelog.rst index f4439a7c..33c4434a 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -5,10 +5,14 @@ Changelog This changelog is used to track all major changes to Mopidy. -v2.1.1 (UNRELEASED) +v2.2.0 (UNRELEASED) =================== -Bug fix release. +Feature release. + +- Dependencies: Drop support for Tornado < 4.4. Though strictly a breaking + change, this shouldn't affect any supported systems as even Debian stable + includes Tornado >= 4.4. - MPD: Added ``idle`` to the list of available commands. (Fixes: :issue:`1593`, PR: :issue:`1597`) diff --git a/mopidy/http/handlers.py b/mopidy/http/handlers.py index 479cb3a0..6250163c 100644 --- a/mopidy/http/handlers.py +++ b/mopidy/http/handlers.py @@ -3,7 +3,6 @@ from __future__ import absolute_import, unicode_literals import functools import logging import os -import socket import tornado.escape import tornado.ioloop @@ -101,12 +100,7 @@ class WebSocketHandler(tornado.websocket.WebSocketHandler): self.jsonrpc = make_jsonrpc_wrapper(core) def open(self): - if hasattr(self, 'set_nodelay'): - # New in Tornado 3.1 - self.set_nodelay(True) - else: - self.stream.socket.setsockopt( - socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) + self.set_nodelay(True) self.clients.add(self) logger.debug( 'New WebSocket connection from %s', self.request.remote_ip) diff --git a/setup.py b/setup.py index c7731b98..8d315ebc 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ setup( 'Pykka >= 1.1', 'requests >= 2.0', 'setuptools', - 'tornado >= 3.2, < 5', # Tornado 5 requires Python >= 2.7.9 + 'tornado >= 4.4, < 5', # Tornado 5 requires Python >= 2.7.9 ], extras_require={'http': []}, entry_points={ diff --git a/tox.ini b/tox.ini index e7762264..14771402 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27, py27-tornado32, docs, flake8 +envlist = py27, docs, flake8 [testenv] sitepackages = true @@ -17,12 +17,6 @@ deps = pytest-xdist responses -[testenv:py27-tornado32] -commands = pytest tests/http -deps = - {[testenv]deps} - tornado==3.2.2 - [testenv:docs] deps = -r{toxinidir}/docs/requirements.txt changedir = docs