Merge pull request #1613 from rhattersley/v1.7.4

Prepare v1.7.4
SciTools · Apr 9, 2015 · f70029e · f70029e
2 parents 0a4feaf + 781ef4e
commit f70029e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/docs/iris/src/whatsnew/1.7.rst b/docs/iris/src/whatsnew/1.7.rst
@@ -2,7 +2,7 @@ What's new in Iris 1.7
 **********************
 
 :Release: 1.7.4
-:Date: ???
+:Date: 31st March 2015
 
 Iris 1.7 features
 =================

diff --git a/lib/iris/__init__.py b/lib/iris/__init__.py
@@ -108,7 +108,7 @@ def callback(cube, field, filename):
 
 
 # Iris revision.
-__version__ = '1.7.4rc1'
+__version__ = '1.7.4'
 
 # Restrict the names imported when using "from iris import *"
 __all__ = ['load', 'load_cube', 'load_cubes', 'load_raw',

diff --git a/lib/iris/tests/unit/fileformats/pp/test__create_field_data.py b/lib/iris/tests/unit/fileformats/pp/test__create_field_data.py
@@ -1,4 +1,4 @@
-# (C) British Crown Copyright 2013 - 2014, Met Office
+# (C) British Crown Copyright 2013 - 2015, Met Office
 #
 # This file is part of Iris.
 #
@@ -56,7 +56,7 @@ def test_deferred_bytes(self):
         dtype = mock.Mock(newbyteorder=newbyteorder)
         deferred_bytes = (fname, position, n_bytes, dtype)
         field = mock.Mock(_data=deferred_bytes)
-        data_shape = (mock.sentinel.lat, mock.sentinel.lon)
+        data_shape = (100, 120)
         land_mask = mock.Mock()
         proxy = mock.Mock(dtype=mock.sentinel.dtype, shape=data_shape)
         # We can't directly inspect the concrete data source underlying