Merge branch 'master' into release-2.1

.gitignore

@@ -7,6 +7,7 @@
 .coverage
 .idea
 .noseids
+.pytest_cache/
 .tox
 MANIFEST
 build/

dev-requirements.txt

@@ -13,7 +13,7 @@ mock
 responses
 
 # Test runners
-pytest
+pytest<3.3.0
 pytest-capturelog
 pytest-cov
 pytest-xdist

docs/authors.rst

@@ -4,7 +4,7 @@
 Authors
 *******
 
-Mopidy is copyright 2009-2017 Stein Magnus Jodal and contributors. Mopidy is
+Mopidy is copyright 2009-2018 Stein Magnus Jodal and contributors. Mopidy is
 licensed under the `Apache License, Version 2.0
 <http://www.apache.org/licenses/LICENSE-2.0>`_.
 

docs/conf.py

@@ -73,14 +73,14 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 project = 'Mopidy'
-copyright = '2009-2017, Stein Magnus Jodal and contributors'
+copyright = '2009-2018, Stein Magnus Jodal and contributors'
 
 from mopidy.internal.versioning import get_version
 release = get_version()
 version = '.'.join(release.split('.')[:2])
 
 # To make the build reproducible, avoid using today's date in the manpages
-today = '2017'
+today = '2018'
 
 exclude_trees = ['_build']
 

mopidy/__main__.py

@@ -15,7 +15,7 @@ try:
 except ImportError:
     pass
 
-import pykka.debug
+import pykka.debug  # noqa: I100
 
 from mopidy import commands, config as config_lib, ext
 from mopidy.internal import encoding, log, path, process, versioning

mopidy/core/actor.py

@@ -8,7 +8,6 @@ import os
 import pykka
 
 import mopidy
-
 from mopidy import audio, backend, mixer
 from mopidy.audio import PlaybackState
 from mopidy.core.history import HistoryController

mopidy/local/json.py

@@ -7,7 +7,6 @@ import re
 import sys
 
 import mopidy
-
 from mopidy import compat, local, models
 from mopidy.internal import storage as internal_storage
 from mopidy.internal import timer

mopidy/m3u/playlists.py

@@ -34,7 +34,7 @@ def replace(path, mode='w+b', encoding=None, errors=None):
         (fd, tempname) = tempfile.mkstemp(dir=os.path.dirname(path))
     try:
         fp = io.open(fd, mode, encoding=encoding, errors=errors)
-    except:
+    except Exception:
         os.remove(tempname)
         os.close(fd)
         raise
@@ -43,7 +43,7 @@ def replace(path, mode='w+b', encoding=None, errors=None):
         fp.flush()
         os.fsync(fd)
         os.rename(tempname, path)
-    except:
+    except Exception:
         os.remove(tempname)
         raise
     finally:

setup.py

@@ -27,7 +27,7 @@ setup(
         'Pykka >= 1.1',
         'requests >= 2.0',
         'setuptools',
-        'tornado >= 3.2',
+        'tornado >= 3.2, < 5',  # Tornado 5 requires Python >= 2.7.9
     ],
     extras_require={'http': []},
     entry_points={

tests/core/test_actor.py

@@ -10,10 +10,10 @@ import mock
 import pykka
 
 import mopidy
-
 from mopidy.core import Core
 from mopidy.internal import models, storage, versioning
 from mopidy.models import Track
+
 from tests import dummy_mixer
 
 

tests/core/test_mixer.py

@@ -8,6 +8,7 @@ import pykka
 
 from mopidy import core, mixer
 from mopidy.internal.models import MixerState
+
 from tests import dummy_mixer
 
 

tox.ini

@@ -11,7 +11,7 @@ commands =
         {posargs}
 deps =
     mock
-    pytest
+    pytest<3.3.0
     pytest-capturelog
     pytest-cov
     pytest-xdist