spotify: Move to external extension

mopidy · Oct 8, 2013 · e7d6a99 · e7d6a99
1 parent f9a6fa5
commit e7d6a99
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 969 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,7 +2,6 @@ include *.rst
 include LICENSE
 include MANIFEST.in
 include data/mopidy.desktop
-include mopidy/backends/spotify/spotify_appkey.key
 include pylintrc
 
 recursive-include docs *

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -9,15 +9,18 @@ v0.16.0 (UNRELEASED)
 
 **Dependencies**
 
-- The Last.fm scrobbler has been moved to its own external extension,
-  `Mopidy-Scrobbler <https://github.com/mopidy/mopidy-scrobbler>`_. You'll need
-  to install it in addition to Mopidy if you want it to continue to work as it
-  used to.
-
-- The MPRIS frontend has been moved to its own external extension,
-  `Mopidy-MPRIS <https://github.com/mopidy/mopidy-mpris>`_. You'll need to
-  install it in addition to Mopidy if you want it to continue to work as it
-  used to.
+Parts of Mopidy have been moved to their own external extensions. If you want
+Mopidy to continue to work like it used to, you may have to install one or more
+of the following extensions as well:
+
+- The Spotify backend has been moved to
+  `Mopidy-Scrobbler <https://github.com/mopidy/mopidy-spotify>`_.
+
+- The Last.fm scrobbler has been moved to
+  `Mopidy-Scrobbler <https://github.com/mopidy/mopidy-scrobbler>`_.
+
+- The MPRIS frontend has been moved to
+  `Mopidy-MPRIS <https://github.com/mopidy/mopidy-mpris>`_.
 
 **Audio**
 

diff --git a/docs/ext/index.rst b/docs/ext/index.rst
@@ -87,10 +87,19 @@ Mopidy-SoundCloud
 
 https://github.com/mopidy/mopidy-soundcloud
 
-Provides a backend for playing music from the `SoundCloud
+rovides a backend for playing music from the `SoundCloud
 <http://www.soundcloud.com/>`_ service.
 
 
+Mopidy-Spotify
+--------------
+
+https://github.com/mopidy/mopidy-spotify
+
+Extension for playing music from the `Spotify <http://www.spotify.com/>`_ music
+streaming service.
+
+
 Mopidy-Subsonic
 ---------------
 

diff --git a/docs/ext/spotify.rst b/docs/ext/spotify.rst
diff --git a/docs/index.rst b/docs/index.rst
@@ -4,9 +4,9 @@ Mopidy
 
 Mopidy is a music server which can play music both from multiple sources, like
 your :ref:`local hard drive <ext-local>`, :ref:`radio streams <ext-stream>`,
-and from :ref:`Spotify <ext-spotify>` and SoundCloud. Searches combines results
-from all music sources, and you can mix tracks from all sources in your play
-queue. Your playlists from Spotify or SoundCloud are also available for use.
+and from Spotify and SoundCloud. Searches combines results from all music
+sources, and you can mix tracks from all sources in your play queue. Your
+playlists from Spotify or SoundCloud are also available for use.
 
 To control your Mopidy music server, you can use one of Mopidy's :ref:`web
 clients <http-clients>`, the :ref:`Ubuntu Sound Menu <ubuntu-sound-menu>`, any

diff --git a/mopidy/backends/spotify/__init__.py b/mopidy/backends/spotify/__init__.py
diff --git a/mopidy/backends/spotify/actor.py b/mopidy/backends/spotify/actor.py
diff --git a/mopidy/backends/spotify/container_manager.py b/mopidy/backends/spotify/container_manager.py
diff --git a/mopidy/backends/spotify/ext.conf b/mopidy/backends/spotify/ext.conf