Merge branch 'master' into develop

Conflicts:
	docs/changelog.rst
This commit is contained in:
Stein Magnus Jodal 2014-08-03 23:40:18 +02:00
commit e9822117e5
3 changed files with 5 additions and 4 deletions

View File

@ -14,7 +14,7 @@ v0.20.0 (UNRELEASED)
:issue:`697`, PR: :issue:`802`)
v0.19.3 (UNRELEASED)
v0.19.3 (2014-08-03)
====================
Bug fix release.

View File

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

View File

@ -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'))