From 4ea3bb11674b78480e09ee4e49872dcd7afcf39b Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sun, 22 Apr 2012 01:26:27 +0200 Subject: [PATCH 1/2] Don't override notify_main_thread, which has a sensible default implementation --- mopidy/backends/spotify/session_manager.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mopidy/backends/spotify/session_manager.py b/mopidy/backends/spotify/session_manager.py index af731e1b..2ae4ed2d 100644 --- a/mopidy/backends/spotify/session_manager.py +++ b/mopidy/backends/spotify/session_manager.py @@ -96,10 +96,6 @@ class SpotifySessionManager(BaseThread, PyspotifySessionManager): """Callback used by pyspotify""" logger.debug(u'User message: %s', message.strip()) - def notify_main_thread(self, session): - """Callback used by pyspotify""" - logger.debug(u'notify_main_thread() called') - def music_delivery(self, session, frames, frame_size, num_frames, sample_type, sample_rate, channels): """Callback used by pyspotify""" From 1dae3442e0373a2cc6b4d62e99e395a06998ccb4 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sun, 22 Apr 2012 01:30:20 +0200 Subject: [PATCH 2/2] Release v0.7.1 --- docs/changes.rst | 12 ++++++++++++ mopidy/__init__.py | 2 +- tests/version_test.py | 5 +++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/docs/changes.rst b/docs/changes.rst index 65bd6b4b..5fd5212a 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -4,6 +4,18 @@ Changes This change log is used to track all major changes to Mopidy. + +v0.7.1 (2012-04-22) +=================== + +This is a maintenance release to make Mopidy 0.6 work with pyspotify >= 1.7. + +**Changes** + +- Don't override pyspotify's ``notify_main_thread`` callback. The default + implementation is sensible, while our override did nothing. + + v0.7.0 (2012-02-25) =================== diff --git a/mopidy/__init__.py b/mopidy/__init__.py index b94378b2..c433d47f 100644 --- a/mopidy/__init__.py +++ b/mopidy/__init__.py @@ -8,7 +8,7 @@ import os from subprocess import PIPE, Popen -VERSION = (0, 7, 0) +VERSION = (0, 7, 1) DATA_PATH = os.path.join(str(glib.get_user_data_dir()), 'mopidy') CACHE_PATH = os.path.join(str(glib.get_user_cache_dir()), 'mopidy') diff --git a/tests/version_test.py b/tests/version_test.py index dbaed0a2..58965589 100644 --- a/tests/version_test.py +++ b/tests/version_test.py @@ -24,8 +24,9 @@ class VersionTest(unittest.TestCase): self.assert_(SV('0.4.1') < SV('0.5.0')) self.assert_(SV('0.5.0') < SV('0.6.0')) self.assert_(SV('0.6.0') < SV('0.6.1')) - self.assert_(SV('0.6.1') < SV(get_plain_version())) - self.assert_(SV(get_plain_version()) < SV('0.7.1')) + self.assert_(SV('0.6.1') < SV('0.7.0')) + self.assert_(SV('0.7.0') < SV(get_plain_version())) + self.assert_(SV(get_plain_version()) < SV('0.7.2')) def test_get_platform_contains_platform(self): self.assert_(platform.platform() in get_platform())