andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
Conflicts:
	docs/changelog.rst
This commit is contained in:
Stein Magnus Jodal 2014-02-16 21:47:50 +01:00
commit ffde67f882
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/changelog.rst
View File

@ -11,6 +11,14 @@ v0.19.0 (UNRELEASED)
- Nothing yet. - Nothing yet.
v0.18.3 (2014-02-16)
====================
Bug fix release.
- Fix documentation build.
v0.18.2 (2014-02-16) v0.18.2 (2014-02-16)
==================== ====================

2
mopidy/__init__.py
View File

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

5
tests/test_version.py
View File

@ -44,5 +44,6 @@ class VersionTest(unittest.TestCase):
self.assertLess(SV('0.16.0'), SV('0.17.0')) self.assertLess(SV('0.16.0'), SV('0.17.0'))
self.assertLess(SV('0.17.0'), SV('0.18.0')) self.assertLess(SV('0.17.0'), SV('0.18.0'))
self.assertLess(SV('0.18.0'), SV('0.18.1')) self.assertLess(SV('0.18.0'), SV('0.18.1'))
self.assertLess(SV('0.18.1'), SV(__version__)) self.assertLess(SV('0.18.1'), SV('0.18.2'))
self.assertLess(SV(__version__), SV('0.18.3')) self.assertLess(SV('0.18.2'), SV(__version__))
self.assertLess(SV(__version__), SV('0.18.4'))