From 9c508e98a375e4546fdd345da36174ba8b32f208 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sat, 22 Jan 2011 14:21:02 +0100 Subject: [PATCH 1/4] Fix path to spotify_appkey.key in MANIFEST.in so it is included in the PyPI package --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index f629bcc7..1c126f85 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,5 @@ include LICENSE pylintrc *.rst data/mopidy.desktop -include mopidy/backends/libspotify/spotify_appkey.key +include mopidy/backends/spotify/spotify_appkey.key recursive-include docs * prune docs/_build recursive-include requirements * From e1259068fa7bbe1b7bfb7753dda91eb4044b16e0 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sat, 22 Jan 2011 14:25:37 +0100 Subject: [PATCH 2/4] Only try to install mopidy.desktop if we are root --- setup.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d9d6af42..3d9d4fdf 100644 --- a/setup.py +++ b/setup.py @@ -69,7 +69,10 @@ for dirpath, dirnames, filenames in os.walk(project_dir): data_files.append([dirpath, [os.path.join(dirpath, f) for f in filenames]]) -data_files.append(('/usr/local/share/applications', ['data/mopidy.desktop'])) +if os.geteuid() == 0: + # Only try to install this file if we are root + data_files.append( + ('/usr/local/share/applications', ['data/mopidy.desktop'])) setup( name='Mopidy', From 2efad346c1bbb1dcdb63b5ade5cb27fb8724a49d Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sat, 22 Jan 2011 14:31:46 +0100 Subject: [PATCH 3/4] Update changelog for v0.3.1 --- docs/changes.rst | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/docs/changes.rst b/docs/changes.rst index cecf3ffa..6446a17e 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -5,6 +5,20 @@ Changes This change log is used to track all major changes to Mopidy. +0.3.1 (2010-01-22) +================== + +A couple of fixes to the 0.3.0 release is needed to get a smooth installation. + +**Bugfixes** + +- The Spotify application key was missing from the Python package. + +- Installation of the Python package as a normal user failed because it did not + have permissions to install ``mopidy.desktop``. The file is now only + installed if the installation is executed as the root user. + + 0.3.0 (2010-01-22) ================== From 2512f468f43bd362355b726de8bb57bb6467b370 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sat, 22 Jan 2011 14:33:39 +0100 Subject: [PATCH 4/4] Bump version number to 0.3.1 --- mopidy/__init__.py | 2 +- tests/version_test.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mopidy/__init__.py b/mopidy/__init__.py index fffa25c7..2090624f 100644 --- a/mopidy/__init__.py +++ b/mopidy/__init__.py @@ -3,7 +3,7 @@ if not (2, 6) <= sys.version_info < (3,): sys.exit(u'Mopidy requires Python >= 2.6, < 3') def get_version(): - return u'0.3.0' + return u'0.3.1' class MopidyException(Exception): def __init__(self, message, *args, **kwargs): diff --git a/tests/version_test.py b/tests/version_test.py index a8bc2955..6b3f16f3 100644 --- a/tests/version_test.py +++ b/tests/version_test.py @@ -14,5 +14,6 @@ class VersionTest(unittest.TestCase): self.assert_(SV('0.1.0a3') < SV('0.1.0')) self.assert_(SV('0.1.0') < SV('0.2.0')) self.assert_(SV('0.1.0') < SV('1.0.0')) - self.assert_(SV('0.2.0') < SV(get_version())) - self.assert_(SV(get_version()) < SV('0.3.1')) + self.assert_(SV('0.2.0') < SV('0.3.0')) + self.assert_(SV('0.3.0') < SV(get_version())) + self.assert_(SV(get_version()) < SV('0.3.2'))