Merge branch 'v1.0.x' into develop

Conflicts:
	docs/changelog.rst
This commit is contained in:
Stein Magnus Jodal 2015-07-22 18:41:17 +02:00
commit 80e33e273c
4 changed files with 6 additions and 5 deletions

View File

@ -130,7 +130,7 @@ Internal changes
:issue:`1115`)
v1.0.8 (UNRELEASED)
v1.0.8 (2015-07-22)
===================
Bug fix release.

View File

@ -18,7 +18,7 @@ If you are running OS X, you can install everything needed with Homebrew.
date before you continue::
brew update
brew upgrade
brew upgrade --all
Notice that this will upgrade all software on your system that have been
installed with Homebrew.

View File

@ -14,4 +14,4 @@ if not (2, 7) <= sys.version_info < (3,):
warnings.filterwarnings('ignore', 'could not open display')
__version__ = '1.0.7'
__version__ = '1.0.8'

View File

@ -63,5 +63,6 @@ class VersionTest(unittest.TestCase):
self.assertVersionLess('1.0.3', '1.0.4')
self.assertVersionLess('1.0.4', '1.0.5')
self.assertVersionLess('1.0.5', '1.0.6')
self.assertVersionLess('1.0.6', __version__)
self.assertVersionLess(__version__, '1.0.8')
self.assertVersionLess('1.0.6', '1.0.7')
self.assertVersionLess('1.0.7', __version__)
self.assertVersionLess(__version__, '1.0.9')