Release v0.19.1

docs/changelog.rst

@@ -4,6 +4,27 @@ Changelog
 
 This changelog is used to track all major changes to Mopidy.
 
+v0.19.1 (2014-07-23)
+====================
+
+Bug fix release.
+
+**Dependencies**
+
+- Mopidy now requires Tornado >= 2.3, instead of >= 3.1. This should make
+  Mopidy continue to work on Debian/Raspbian stable, where Tornado 2.3 is the
+  newest version available.
+
+**HTTP**
+
+- Add missing string interpolation placeholder.
+
+**Development**
+
+- ``mopidy --version`` and :meth:`mopidy.core.Core.get_version` now returns the
+  correct version when Mopidy is run from a Git repo other than Mopidy's own.
+  (Related to :issue:`706`)
+
 
 v0.19.0 (2014-07-21)
 ====================

docs/devtools.rst

@@ -118,6 +118,11 @@ packages is maintained.
 
        sudo apt-get install build-essential git-buildpackage
 
+#. Create a Wheezy pbuilder env if running on Ubuntu and this the first time.
+   See :issue:`561` for details about why this is needed::
+
+       DIST=wheezy sudo git-pbuilder update --mirror=http://mirror.rackspace.com/debian/ --debootstrapopts --keyring=/usr/share/keyrings/debian-archive-keyring.gpg
+
 #. Check out the ``debian`` branch of the repo::
 
        git checkout -t origin/debian
@@ -142,15 +147,27 @@ packages is maintained.
 
        git buildpackage -uc -us
 
+   If you are using the pbuilder make sure this command is::
+
+       sudo git buildpackage -uc -us --git-ignore-new --git-pbuilder --git-dist=wheezy --git-no-pbuilder-autoconf
+
 #. Install and test newly built package::
 
        sudo debi
 
+   Again for pbuilder use::
+
+       sudo debi --debs-dir /var/cache/pbuilder/result/
+
 #. If everything is OK, build the package a final time to tag the package
    version::
 
        git buildpackage -uc -us --git-tag
 
+   Pbuilder::
+
+       sudo git buildpackage -uc -us --git-ignore-new --git-pbuilder --git-dist=wheezy --git-no-pbuilder-autoconf --git-tag
+
 #. Push the changes you've done to the ``debian`` branch and the new tag::
 
        git push
@@ -161,6 +178,8 @@ packages is maintained.
 
        git buildpackage -uc -us
 
+   Modify as above to use the pbuilder as needed.
+
 #. Copy files to the APT server. Make sure to select the correct part of the
    repo, e.g. main, contrib, or non-free::
 

mopidy/__init__.py

@@ -21,4 +21,4 @@ if (isinstance(pykka.__version__, basestring)
 warnings.filterwarnings('ignore', 'could not open display')
 
 
-__version__ = '0.19.0'
+__version__ = '0.19.1'

mopidy/http/handlers.py

@@ -2,6 +2,7 @@ from __future__ import unicode_literals
 
 import logging
 import os
+import socket
 
 import tornado.escape
 import tornado.web
@@ -76,7 +77,12 @@ class WebSocketHandler(tornado.websocket.WebSocketHandler):
         self.jsonrpc = make_jsonrpc_wrapper(core)
 
     def open(self):
-        self.set_nodelay(True)
+        if hasattr(self, 'set_nodelay'):
+            # New in Tornado 3.1
+            self.set_nodelay(True)
+        else:
+            self.stream.socket.setsockopt(
+                socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
         self.clients.add(self)
         logger.debug(
             'New WebSocket connection from %s', self.request.remote_ip)
@@ -138,7 +144,7 @@ class JsonRpcHandler(tornado.web.RequestHandler):
                     'Sent RPC message to %s: %r',
                     self.request.remote_ip, response)
         except Exception as e:
-            logger.error('HTTP JSON-RPC request error:', e)
+            logger.error('HTTP JSON-RPC request error: %s', e)
             self.write_error(500)
 
     def set_extra_headers(self):

mopidy/utils/versioning.py

@@ -1,19 +1,24 @@
 from __future__ import unicode_literals
 
-from subprocess import PIPE, Popen
+import os
+import subprocess
 
-from mopidy import __version__
+import mopidy
 
 
 def get_version():
     try:
         return get_git_version()
     except EnvironmentError:
-        return __version__
+        return mopidy.__version__
 
 
 def get_git_version():
-    process = Popen(['git', 'describe'], stdout=PIPE, stderr=PIPE)
+    project_dir = os.path.abspath(
+        os.path.join(os.path.dirname(mopidy.__file__), '..'))
+    process = subprocess.Popen(
+        ['git', 'describe'],
+        stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=project_dir)
     if process.wait() != 0:
         raise EnvironmentError('Execution of "git describe" failed')
     version = process.stdout.read().strip()

setup.py

@@ -26,7 +26,7 @@ setup(
     install_requires=[
         'setuptools',
         'Pykka >= 1.1',
-        'tornado >= 3.1',
+        'tornado >= 2.3',
     ],
     extras_require={'http': []},
     test_suite='nose.collector',

tests/test_version.py

@@ -46,5 +46,6 @@ class VersionTest(unittest.TestCase):
         self.assertLess(SV('0.18.0'), SV('0.18.1'))
         self.assertLess(SV('0.18.1'), SV('0.18.2'))
         self.assertLess(SV('0.18.2'), SV('0.18.3'))
-        self.assertLess(SV('0.18.3'), SV(__version__))
-        self.assertLess(SV(__version__), SV('0.19.1'))
+        self.assertLess(SV('0.18.3'), SV('0.19.0'))
+        self.assertLess(SV('0.19.0'), SV(__version__))
+        self.assertLess(SV(__version__), SV('0.19.2'))