From 7fc89972a2b928026d5a5e5ff43f3c8dee9e97ae Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sun, 3 Aug 2014 23:23:34 +0200 Subject: [PATCH 1/4] docs: Use text from web site and readme (cherry picked from commit 1e0569abb6e482366b6012e05604826a4df35c12) --- docs/index.rst | 67 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 53 insertions(+), 14 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index aedc0fb0..bf259b08 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -2,25 +2,64 @@ Mopidy ****** -Mopidy is a music server which can play music both from multiple sources, like -your :ref:`local hard drive `, :ref:`radio streams `, -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. +Mopidy is an extensible music server written in Python. -To control your Mopidy music server, you can use one of Mopidy's :ref:`web -clients `, the :ref:`Ubuntu Sound Menu `, any -device on the same network which can control :ref:`UPnP MediaRenderers -`, or any :ref:`MPD client `. MPD clients are -available for many platforms, including Windows, OS X, Linux, Android and iOS. +Mopidy plays music from local disk, Spotify, SoundCloud, Google Play Music, and +more. You edit the playlist from any phone, tablet, or computer using a range +of MPD and web clients. + +**Stream music from the cloud** + +Vanilla Mopidy only plays music from your :ref:`local disk ` and +:ref:`radio streams `. Through :ref:`extensions `, +Mopidy can play music from cloud services like Spotify, SoundCloud, and Google +Play Music. With Mopidy's extension support, backends for new music sources can +be easily added. + +**Mopidy is just a server** + +Mopidy is a Python application that runs in a terminal or in the background on +Linux computers or Macs that have network connectivity and audio output. Out of +the box, Mopidy is an :ref:`MPD ` and :ref:`HTTP ` server. +Additional frontends for controlling Mopidy can be installed from extensions. + +**Everybody use their favorite client** + +You and the people around you can all connect their favorite :ref:`MPD +` or :ref:`web client ` to the Mopidy server to +search for music and manage the playlist together. With a browser or MPD +client, which is available for all popular operating systems, you can control +the music from any phone, tablet, or computer. + +**Mopidy on Raspberry Pi** + +The Raspberry Pi is a popular device to run Mopidy on, either using Raspbian or +Arch Linux. It is quite slow, but it is very affordable. In fact, the +Kickstarter funded Gramofon: Modern Cloud Jukebox project used Mopidy on a +Raspberry Pi to prototype the Gramofon device. Mopidy is also a major building +block in the Pi Musicbox integrated audio jukebox system for Raspberry Pi. + +**Mopidy is hackable** + +Mopidy's extension support and Python, JSON-RPC, and JavaScript APIs makes +Mopidy perfect for building your own hacks. In one project, a Raspberry Pi was +embedded in an old cassette player. The buttons and volume control are wired up +with GPIO on the Raspberry Pi, and is used to control playback through a custom +Mopidy extension. The cassettes have NFC tags used to select playlists from +Spotify. + +**Getting started** To get started with Mopidy, start by reading :ref:`installation`. +**Getting help** + If you get stuck, we usually hang around at ``#mopidy`` at `irc.freenode.net -`_ and also have a `mailing list at Google Groups -`_. If you stumble -into a bug or got a feature request, please create an issue in the `issue -tracker `_. The `source code +`_ (with `searchable logs +`_) and also have a `mailing list at Google +Groups `_. If you +stumble into a bug or got a feature request, please create an issue in the +`issue tracker `_. The `source code `_ may also be of help. If you want to stay up to date on Mopidy developments, you can follow `@mopidy `_ on Twitter. From 6c08c3372469347106a63bf4fbce5a21be63a2cd Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sun, 3 Aug 2014 23:30:47 +0200 Subject: [PATCH 2/4] docs: Add more links into the docs (cherry picked from commit 5dd2be5ec94c8691eb1051e9e78c283a2e09e764) --- docs/index.rst | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index bf259b08..71e8dee7 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -21,7 +21,8 @@ be easily added. Mopidy is a Python application that runs in a terminal or in the background on Linux computers or Macs that have network connectivity and audio output. Out of the box, Mopidy is an :ref:`MPD ` and :ref:`HTTP ` server. -Additional frontends for controlling Mopidy can be installed from extensions. +:ref:`Additional frontends ` for controlling Mopidy can be +installed from extensions. **Everybody use their favorite client** @@ -33,20 +34,21 @@ the music from any phone, tablet, or computer. **Mopidy on Raspberry Pi** -The Raspberry Pi is a popular device to run Mopidy on, either using Raspbian or -Arch Linux. It is quite slow, but it is very affordable. In fact, the -Kickstarter funded Gramofon: Modern Cloud Jukebox project used Mopidy on a -Raspberry Pi to prototype the Gramofon device. Mopidy is also a major building -block in the Pi Musicbox integrated audio jukebox system for Raspberry Pi. +The :ref:`Raspberry Pi ` is a popular device to run +Mopidy on, either using Raspbian or Arch Linux. It is quite slow, but it is +very affordable. In fact, the Kickstarter funded Gramofon: Modern Cloud Jukebox +project used Mopidy on a Raspberry Pi to prototype the Gramofon device. Mopidy +is also a major building block in the Pi Musicbox integrated audio jukebox +system for Raspberry Pi. **Mopidy is hackable** -Mopidy's extension support and Python, JSON-RPC, and JavaScript APIs makes -Mopidy perfect for building your own hacks. In one project, a Raspberry Pi was -embedded in an old cassette player. The buttons and volume control are wired up -with GPIO on the Raspberry Pi, and is used to control playback through a custom -Mopidy extension. The cassettes have NFC tags used to select playlists from -Spotify. +Mopidy's extension support and :ref:`Python `, :ref:`JSON-RPC +`, and :ref:`JavaScript APIs ` makes Mopidy perfect for +building your own hacks. In one project, a Raspberry Pi was embedded in an old +cassette player. The buttons and volume control are wired up with GPIO on the +Raspberry Pi, and is used to control playback through a custom Mopidy +extension. The cassettes have NFC tags used to select playlists from Spotify. **Getting started** From 87e22eb94069f10a800298ba1f32c3bc12fd8dff Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sun, 3 Aug 2014 23:34:18 +0200 Subject: [PATCH 3/4] docs: Update changelog --- docs/changelog.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 277c79ed..25655c98 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -5,7 +5,7 @@ Changelog This changelog is used to track all major changes to Mopidy. -v0.19.3 (UNRELEASED) +v0.19.3 (2014-08-03) ==================== Bug fix release. From dc80f172965d07a8a2b44ff824856b8ef2d52e61 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sun, 3 Aug 2014 23:33:47 +0200 Subject: [PATCH 4/4] Bump version to 0.19.3 --- mopidy/__init__.py | 2 +- tests/test_version.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mopidy/__init__.py b/mopidy/__init__.py index c6593354..47e36e06 100644 --- a/mopidy/__init__.py +++ b/mopidy/__init__.py @@ -21,4 +21,4 @@ if (isinstance(pykka.__version__, basestring) warnings.filterwarnings('ignore', 'could not open display') -__version__ = '0.19.2' +__version__ = '0.19.3' diff --git a/tests/test_version.py b/tests/test_version.py index 1f0006a6..0431beae 100644 --- a/tests/test_version.py +++ b/tests/test_version.py @@ -48,5 +48,6 @@ class VersionTest(unittest.TestCase): self.assertLess(SV('0.18.2'), SV('0.18.3')) self.assertLess(SV('0.18.3'), SV('0.19.0')) self.assertLess(SV('0.19.0'), SV('0.19.1')) - self.assertLess(SV('0.19.1'), SV(__version__)) - self.assertLess(SV(__version__), SV('0.19.3')) + self.assertLess(SV('0.19.1'), SV('0.19.2')) + self.assertLess(SV('0.19.2'), SV(__version__)) + self.assertLess(SV(__version__), SV('0.19.4'))