From 1fdcddd94b67a722671b4c9ad659189a4bffbd0d Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Thu, 19 Aug 2010 00:05:20 +0200 Subject: [PATCH 1/6] We follow the development process from nvie.com/git-model --- docs/development/contributing.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/development/contributing.rst b/docs/development/contributing.rst index a2ef4a15..dc982dac 100644 --- a/docs/development/contributing.rst +++ b/docs/development/contributing.rst @@ -58,6 +58,8 @@ Code style Commit guidelines ================= +- We follow the development process described at http://nvie.com/git-model. + - Keep commits small and on topic. - If a commit looks too big you should be working in a feature branch not a From a8a8af4d17f0c7c71e28ba68d66e986c092759f4 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Thu, 19 Aug 2010 00:05:38 +0200 Subject: [PATCH 2/6] We turned of Hudson's IRC nagging a long time ago --- docs/development/contributing.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/development/contributing.rst b/docs/development/contributing.rst index dc982dac..16200162 100644 --- a/docs/development/contributing.rst +++ b/docs/development/contributing.rst @@ -109,8 +109,7 @@ Continuous integration server We run a continuous integration server called Hudson at http://hudson.mopidy.com/ that runs all test on multiple platforms (Ubuntu, OS -X, etc.) for every commit we push to GitHub. If the build is broken or fixed, -Hudson will issue notifications to our IRC channel. +X, etc.) for every commit we push to GitHub. In addition to running tests, Hudson also does coverage statistics and uses pylint to check for errors and possible improvements in our code. So, if you're From 53d2d93f77884ab4800f74418f13a4c93658e75d Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Thu, 19 Aug 2010 00:05:55 +0200 Subject: [PATCH 3/6] We now publish docs for both the master and develop branches --- docs/development/contributing.rst | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/docs/development/contributing.rst b/docs/development/contributing.rst index 16200162..eac94799 100644 --- a/docs/development/contributing.rst +++ b/docs/development/contributing.rst @@ -136,9 +136,16 @@ Then, to generate docs:: .. note:: - The documentation at http://www.mopidy.com/docs/ is automatically updated - within 10 minutes after a documentation update is pushed to - ``jodal/mopidy/master`` at GitHub. + The documentation at http://www.mopidy.com/ is automatically updated when a + documentation update is pushed to ``jodal/mopidy`` at GitHub. + + Documentation generated from the ``master`` branch is published at + http://www.mopidy.com/docs/master/, and will always be valid for the latest + release. + + Documentation generated from the ``develop`` branch is published at + http://www.mopidy.com/docs/develop/, and will always be valid for the + latest development snapshot. Creating releases From 714529fee6db20243cc052b66312ad099489ebfb Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Thu, 19 Aug 2010 00:09:36 +0200 Subject: [PATCH 4/6] Link from README to both docs versions --- README.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 1e4430e2..6855135e 100644 --- a/README.rst +++ b/README.rst @@ -9,9 +9,10 @@ in Spotify's vast archive, manage playlists, and play music, you can use most platforms, including Windows, Mac OS X, Linux, and iPhone and Android phones. To install Mopidy, check out -`the installation docs `_. +`the installation docs `_. -* `Documentation `_ +* `Documentation `_ +* `Documentation (development version) `_ * `Source code `_ * `Issue tracker `_ * IRC: ``#mopidy`` at `irc.freenode.net `_ From a91a5eb04aacd070a17ebfbcf09ceb1eb2eb2517 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Fri, 20 Aug 2010 00:43:12 +0200 Subject: [PATCH 5/6] Put in place better logging for exceptions in processes --- mopidy/process.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mopidy/process.py b/mopidy/process.py index 01ac8ed4..5ad1b0b4 100644 --- a/mopidy/process.py +++ b/mopidy/process.py @@ -30,6 +30,9 @@ class BaseProcess(multiprocessing.Process): except ImportError as e: logger.error(e) sys.exit(1) + except Exception as e: + logger.exception(e) + raise e def run_inside_try(self): raise NotImplementedError From 366f5d8feece07e40eed6d68a57c1506815a3195 Mon Sep 17 00:00:00 2001 From: Thomas Adamcik Date: Fri, 20 Aug 2010 00:45:23 +0200 Subject: [PATCH 6/6] Don't use return values from backend in frontend.mpd.protocol.playback.seek --- mopidy/frontends/mpd/protocol/playback.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mopidy/frontends/mpd/protocol/playback.py b/mopidy/frontends/mpd/protocol/playback.py index 7abc4509..4c602f3b 100644 --- a/mopidy/frontends/mpd/protocol/playback.py +++ b/mopidy/frontends/mpd/protocol/playback.py @@ -300,7 +300,7 @@ def seek(frontend, songpos, seconds): """ if frontend.backend.playback.current_playlist_position != songpos: playpos(frontend, songpos) - return frontend.backend.playback.seek(int(seconds) * 1000) + frontend.backend.playback.seek(int(seconds) * 1000) @handle_pattern(r'^seekid "(?P\d+)" "(?P\d+)"$') def seekid(frontend, cpid, seconds): @@ -313,7 +313,7 @@ def seekid(frontend, cpid, seconds): """ if frontend.backend.playback.current_cpid != cpid: playid(frontend, cpid) - return frontend.backend.playback.seek(int(seconds) * 1000) + frontend.backend.playback.seek(int(seconds) * 1000) @handle_pattern(r'^setvol "(?P[-+]*\d+)"$') def setvol(frontend, volume):