From 830b19bc205dc475ac27e1431e01d45cf15a9ab6 Mon Sep 17 00:00:00 2001 From: cpelley Date: Thu, 15 Sep 2016 15:47:56 +0100 Subject: [PATCH 1/3] BUG: as_pairs usage removal within iris --- lib/iris/fileformats/pp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/iris/fileformats/pp.py b/lib/iris/fileformats/pp.py index 9a74194387..26a00ab2f5 100644 --- a/lib/iris/fileformats/pp.py +++ b/lib/iris/fileformats/pp.py @@ -2442,8 +2442,8 @@ def as_fields(cube, field_coords=None, target=None): A filename or open file handle. """ - return (field for cube, field in as_pairs(cube, field_coords=field_coords, - target=target)) + return (field for cube, field in save_pairs_from_cube( + cube, field_coords=field_coords, target=target)) def save_fields(fields, target, append=False): From b6535bb1e9475eb3d62f05c7a65aaf067c842cd2 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 1 Oct 2016 02:29:17 -0400 Subject: [PATCH 2/3] Fix portability of whatsnew test. Remove unnecessary use of `shell=True`, and use the correct Python interpreter (i.e., the same one that's running the tests.) --- lib/iris/tests/test_whatsnew_contributions.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/iris/tests/test_whatsnew_contributions.py b/lib/iris/tests/test_whatsnew_contributions.py index 1dee1e7edc..be917e60d8 100644 --- a/lib/iris/tests/test_whatsnew_contributions.py +++ b/lib/iris/tests/test_whatsnew_contributions.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2015, Met Office +# (C) British Crown Copyright 2010 - 2016, Met Office # # This file is part of Iris. # @@ -39,6 +39,7 @@ import os import os.path import subprocess +import sys import iris @@ -61,8 +62,9 @@ def test_check_contributions(self): # Travis bypasses this problem by running the test directly. if os.path.exists(whatsnew_dirpath): # Run a 'check contributions' command in that directory. - cmd = 'python aggregate_directory.py --checkonly --quiet' - subprocess.check_call(cmd, cwd=whatsnew_dirpath, shell=True) + cmd = [sys.executable, 'aggregate_directory.py', '--checkonly', + '--quiet'] + subprocess.check_call(cmd, cwd=whatsnew_dirpath) if __name__ == "__main__": From 3bead4d12975989316c9a8fecf9f0dd5d8fe684d Mon Sep 17 00:00:00 2001 From: marqh Date: Mon, 10 Oct 2016 13:09:43 +0000 Subject: [PATCH 3/3] master version string --- lib/iris/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/iris/__init__.py b/lib/iris/__init__.py index 5ceb09118b..38e257dc0c 100644 --- a/lib/iris/__init__.py +++ b/lib/iris/__init__.py @@ -122,7 +122,7 @@ def callback(cube, field, filename): # Iris revision. -__version__ = '1.10.0' +__version__ = '1.11.0-DEV' # Restrict the names imported when using "from iris import *" __all__ = ['load', 'load_cube', 'load_cubes', 'load_raw',