Merge pull request #1602 from bjlittle/rc-1

pp-mo · pp-mo · commit 7890a7292d98 · 2015-03-27T11:35:04.000Z
Bump the version for the release candidate.
diff --git a/lib/iris/__init__.py b/lib/iris/__init__.py
@@ -1,4 +1,4 @@
-# (C) British Crown Copyright 2010 - 2014, Met Office
+# (C) British Crown Copyright 2010 - 2015, Met Office
 #
 # This file is part of Iris.
 #
@@ -111,7 +111,7 @@ def callback(cube, field, filename):
 
 
 # Iris revision.
-__version__ = '1.8.0-DEV'
+__version__ = '1.8.0-rc.1'
 
 # Restrict the names imported when using "from iris import *"
 __all__ = ['load', 'load_cube', 'load_cubes', 'load_raw',

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# (C) British Crown Copyright 2010 - 2014, Met Office`
	`1`	`+# (C) British Crown Copyright 2010 - 2015, Met Office`
`2`	`2`	`#`
`3`	`3`	`# This file is part of Iris.`
`4`	`4`	`#`
`@@ -111,7 +111,7 @@ def callback(cube, field, filename):`
`111`	`111`
`112`	`112`
`113`	`113`	`# Iris revision.`
`114`		`-__version__ = '1.8.0-DEV'`
	`114`	`+__version__ = '1.8.0-rc.1'`
`115`	`115`
`116`	`116`	`# Restrict the names imported when using "from iris import *"`
`117`	`117`	`__all__ = ['load', 'load_cube', 'load_cubes', 'load_raw',`