Merge branch 'master' into develop

Conflicts:
	docs/changelog.rst

docs/changelog.rst

@@ -23,6 +23,17 @@ v0.15.0 (UNRELEASED)
   :option:`mopidy --option` arguments appearing later on the command line.
 
 
+v0.14.2 (2013-07-01)
+====================
+
+This is a maintenance release to make Mopidy 0.14 work with pyspotify 1.11.
+
+**Dependencies**
+
+- pyspotify >= 1.9, < 2 is now required for Spotify support. In other words,
+  you're free to upgrade to pyspotify 1.11, but it isn't a requirement.
+
+
 v0.14.1 (2013-04-28)
 ====================
 

docs/config.rst

@@ -137,6 +137,24 @@ Core configuration values
 .. _the Python logging docs: http://docs.python.org/2/library/logging.config.html
 
 
+Extension configuration
+=======================
+
+Mopidy's extensions have their own config values that you may want to tweak.
+For the available config values, please refer to the docs for each extension.
+Most, if not all, can be found at :ref:`ext`.
+
+Mopidy extensions are enabled by default when they are installed. If you want
+to disable an extension without uninstalling it, all extensions support the
+``enabled`` config value even if it isn't explicitly documented by all
+extensions. If the ``enabled`` config value is set to ``false`` the extension
+will not be started. For example, to disable the Spotify extension, add the
+following to your ``mopidy.conf``::
+
+    [spotify]
+    enabled = false
+
+
 Extension configuration
 =======================
 

mopidy/__init__.py

@@ -23,4 +23,4 @@ if (isinstance(pykka.__version__, basestring)
 warnings.filterwarnings('ignore', 'could not open display')
 
 
-__version__ = '0.14.1'
+__version__ = '0.14.2'

requirements/spotify.txt

@@ -1,4 +1,4 @@
-pyspotify >= 1.9, < 1.11
+pyspotify >= 1.9, < 2
 # The libspotify Python wrapper
 # Available as the python-spotify package from apt.mopidy.com
 

setup.py

@@ -28,7 +28,7 @@ setup(
         'Pykka >= 1.1',
     ],
     extras_require={
-        'spotify': ['pyspotify >= 1.9, < 1.11'],
+        'spotify': ['pyspotify >= 1.9, < 2'],
         'scrobbler': ['pylast >= 0.5.7'],
         'http': ['cherrypy >= 3.2.2', 'ws4py >= 0.2.3'],
     },

tests/version_test.py

@@ -37,5 +37,6 @@ class VersionTest(unittest.TestCase):
         self.assertLess(SV('0.11.1'), SV('0.12.0'))
         self.assertLess(SV('0.12.0'), SV('0.13.0'))
         self.assertLess(SV('0.13.0'), SV('0.14.0'))
-        self.assertLess(SV('0.14.0'), SV(__version__))
+        self.assertLess(SV('0.14.0'), SV('0.14.1'))
-        self.assertLess(SV(__version__), SV('0.14.2'))
+        self.assertLess(SV('0.14.1'), SV(__version__))
+        self.assertLess(SV(__version__), SV('0.14.3'))