Merge branch 'release-2.1' into develop

.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/audio.rst

@@ -84,7 +84,7 @@ simultaneously. To use the Icecast output, do the following:
 
        [audio]
        output = audioresample ! audioconvert ! vorbisenc ! oggmux ! shout2send mount=mopidy ip=127.0.0.1 port=8000 password=hackme
-    
+
    Example for MP3 streaming and local audio (multiple outputs):
 
    .. code-block:: ini

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']
 

docs/ext/backends.rst

@@ -48,15 +48,6 @@ Provides a backend for playing music from your `Beets
 <http://beets.radbox.org/>`_ music library through Beets' web extension.
 
 
-Mopidy-Deezer
-=============
-
-https://github.com/rusty-dev/mopidy-deezer
-
-Extension for playing music from the `Deezer <http://www.deezer.com/>`_ music
-streaming service.
-
-
 Mopidy-Dirble
 =============
 
@@ -80,7 +71,7 @@ Mopidy-Emby
 
 https://github.com/xsteadfastx/mopidy-emby
 
-Provides a backend for playing music from `Emby Media Servers <https://emby.media>`_. 
+Provides a backend for playing music from `Emby Media Servers <https://emby.media>`_.
 
 
 Mopidy-File
@@ -182,6 +173,15 @@ Extension for listening to Internet radio stations and podcasts listed at
 `radio.fr <http://www.radio.fr/>`_, and `radio.at <http://www.radio.at/>`_.
 
 
+Mopidy-RNZ
+==========
+
+https://github.com/danbrough/mopidy-rnz
+
+Extension for playing `Radio New Zealands <http://www.radionz.co.nz>`_
+podcasts,live streams and latest news bulletin.
+
+
 Mopidy-SomaFM
 =============
 

docs/ext/web.rst

@@ -38,9 +38,10 @@ https://github.com/gotling/mopidy-auto
 Mopidy extension to automate music playback based on time of day.
 
 .. warning::
-    This extension reacts to the events ``tracklist_changed``, ``track_playback_ended``, and
+    This extension reacts to the events ``tracklist_changed``,
-    ``track_playback_resumed`` to accomplish its goals. Other web extensions will not work
+    ``track_playback_ended``, and ``track_playback_resumed`` to accomplish its
-    as expected when this extension is installed.
+    goals. Other web extensions will not work as expected when this extension
+    is installed.
 
 .. image:: /ext/auto.png
     :width: 533
@@ -56,8 +57,9 @@ Mopidy-Iris
 
 https://github.com/jaedb/iris
 
-A comprehensive and mobile-friendly client that presents your library and extensions in a 
+A comprehensive and mobile-friendly client that presents your library and
-user-friendly and intuitive interface. Built using React and Redux. Made by James Barnsley.
+extensions in a user-friendly and intuitive interface. Built using React and
+Redux. Made by James Barnsley.
 
 .. image:: /ext/iris.jpg
     :width: 888

mopidy/__main__.py

@@ -19,6 +19,7 @@ try:
 except ImportError:
     pass
 
+
 logger = logging.getLogger(__name__)
 
 

setup.py

@@ -28,7 +28,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={