From 9b871a7aff77a8accdcf1ac4dade1b4943df3f1b Mon Sep 17 00:00:00 2001 From: Ed Campbell Date: Wed, 1 May 2013 10:34:42 +0100 Subject: [PATCH 1/2] Fix to license check logic --- lib/iris/tests/test_coding_standards.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/iris/tests/test_coding_standards.py b/lib/iris/tests/test_coding_standards.py index b190a18038..ceb9e1905a 100644 --- a/lib/iris/tests/test_coding_standards.py +++ b/lib/iris/tests/test_coding_standards.py @@ -288,9 +288,13 @@ def last_change_by_fname(): output = subprocess.check_output(['git', 'whatchanged', "--pretty=TIME:%ct"], cwd=REPO_DIR) - output = output.split('\n') - return dict(TestLicenseHeaders.whatchanged_parse(output)) + res = {} + for fname, dt in TestLicenseHeaders.whatchanged_parse(output): + if fname not in res or dt > res[fname]: + res[fname] = dt + + return res def test_license_headers(self): exclude_patterns = ('setup.py', From 5d5e0bcfa825c0d423773c9f84bf41530f44cc06 Mon Sep 17 00:00:00 2001 From: Ed Campbell Date: Wed, 1 May 2013 11:58:49 +0100 Subject: [PATCH 2/2] Updates to erroneous copyright years based on git history. --- docs/iris/example_tests/test_COP_1d_plot.py | 2 +- docs/iris/example_tests/test_COP_maps.py | 2 +- docs/iris/example_tests/test_TEC.py | 2 +- docs/iris/example_tests/test_cross_section.py | 2 +- docs/iris/example_tests/test_custom_file_loading.py | 2 +- docs/iris/example_tests/test_deriving_phenomena.py | 2 +- docs/iris/example_tests/test_global_map.py | 2 +- docs/iris/example_tests/test_hovmoller.py | 2 +- docs/iris/example_tests/test_lagged_ensemble.py | 2 +- docs/iris/example_tests/test_lineplot_with_legend.py | 2 +- docs/iris/example_tests/test_rotated_pole_mapping.py | 2 +- docs/iris/src/conf.py | 2 +- docs/iris/src/sphinxext/gen_example_directory.py | 2 +- lib/iris/__init__.py | 2 +- lib/iris/_constraints.py | 2 +- lib/iris/_cube_coord_common.py | 2 +- lib/iris/_merge.py | 2 +- lib/iris/analysis/__init__.py | 2 +- lib/iris/analysis/calculus.py | 2 +- lib/iris/analysis/cartography.py | 2 +- lib/iris/analysis/geometry.py | 2 +- lib/iris/analysis/maths.py | 2 +- lib/iris/analysis/trajectory.py | 2 +- lib/iris/aux_factory.py | 2 +- lib/iris/config.py | 2 +- lib/iris/coord_categorisation.py | 2 +- lib/iris/coords.py | 2 +- lib/iris/cube.py | 2 +- lib/iris/fileformats/__init__.py | 2 +- lib/iris/fileformats/cf.py | 2 +- lib/iris/fileformats/dot.py | 2 +- lib/iris/fileformats/ff.py | 2 +- lib/iris/fileformats/grib.py | 2 +- lib/iris/fileformats/grib_save_rules.py | 2 +- lib/iris/fileformats/manager.py | 2 +- lib/iris/fileformats/nimrod.py | 2 +- lib/iris/fileformats/pp.py | 2 +- lib/iris/fileformats/rules.py | 2 +- lib/iris/io/__init__.py | 2 +- lib/iris/io/format_picker.py | 2 +- lib/iris/iterate.py | 2 +- lib/iris/palette.py | 2 +- lib/iris/plot.py | 2 +- lib/iris/quickplot.py | 2 +- lib/iris/tests/__init__.py | 2 +- lib/iris/tests/stock.py | 2 +- lib/iris/tests/system_test.py | 2 +- lib/iris/tests/test_aggregate_by.py | 2 +- lib/iris/tests/test_analysis.py | 2 +- lib/iris/tests/test_analysis_calculus.py | 2 +- lib/iris/tests/test_basic_maths.py | 2 +- lib/iris/tests/test_cdm.py | 2 +- lib/iris/tests/test_cell.py | 2 +- lib/iris/tests/test_coord_api.py | 2 +- lib/iris/tests/test_cube.py | 2 +- lib/iris/tests/test_cube_to_pp.py | 2 +- lib/iris/tests/test_ff.py | 2 +- lib/iris/tests/test_file_load.py | 2 +- lib/iris/tests/test_grib_load.py | 2 +- lib/iris/tests/test_grib_save.py | 2 +- lib/iris/tests/test_grib_save_rules.py | 2 +- lib/iris/tests/test_hybrid.py | 2 +- lib/iris/tests/test_interpolation.py | 2 +- lib/iris/tests/test_intersect.py | 2 +- lib/iris/tests/test_io_init.py | 2 +- lib/iris/tests/test_iterate.py | 2 +- lib/iris/tests/test_load.py | 2 +- lib/iris/tests/test_mapping.py | 2 +- lib/iris/tests/test_merge.py | 2 +- lib/iris/tests/test_netcdf.py | 2 +- lib/iris/tests/test_nimrod.py | 2 +- lib/iris/tests/test_plot.py | 2 +- lib/iris/tests/test_pp_cf.py | 2 +- lib/iris/tests/test_pp_stash.py | 2 +- lib/iris/tests/test_pp_to_cube.py | 2 +- lib/iris/tests/test_quickplot.py | 2 +- lib/iris/tests/test_regrid.py | 2 +- lib/iris/tests/test_rules.py | 2 +- lib/iris/tests/test_trajectory.py | 2 +- lib/iris/tests/test_unit.py | 2 +- lib/iris/tests/test_uri_callback.py | 2 +- lib/iris/tests/test_util.py | 2 +- lib/iris/unit.py | 2 +- lib/iris/util.py | 2 +- tools/generate_std_names.py | 2 +- 85 files changed, 85 insertions(+), 85 deletions(-) diff --git a/docs/iris/example_tests/test_COP_1d_plot.py b/docs/iris/example_tests/test_COP_1d_plot.py index e8a9ec41d3..c4cc67a753 100644 --- a/docs/iris/example_tests/test_COP_1d_plot.py +++ b/docs/iris/example_tests/test_COP_1d_plot.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/docs/iris/example_tests/test_COP_maps.py b/docs/iris/example_tests/test_COP_maps.py index f0236ab330..7a6395b850 100644 --- a/docs/iris/example_tests/test_COP_maps.py +++ b/docs/iris/example_tests/test_COP_maps.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/docs/iris/example_tests/test_TEC.py b/docs/iris/example_tests/test_TEC.py index 2207dcb359..138dbbbd1f 100644 --- a/docs/iris/example_tests/test_TEC.py +++ b/docs/iris/example_tests/test_TEC.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/docs/iris/example_tests/test_cross_section.py b/docs/iris/example_tests/test_cross_section.py index a5cbdab407..4e667bce96 100644 --- a/docs/iris/example_tests/test_cross_section.py +++ b/docs/iris/example_tests/test_cross_section.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/docs/iris/example_tests/test_custom_file_loading.py b/docs/iris/example_tests/test_custom_file_loading.py index 92acd56f6f..688796bcdb 100644 --- a/docs/iris/example_tests/test_custom_file_loading.py +++ b/docs/iris/example_tests/test_custom_file_loading.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/docs/iris/example_tests/test_deriving_phenomena.py b/docs/iris/example_tests/test_deriving_phenomena.py index d33856bbd7..28930ce25b 100644 --- a/docs/iris/example_tests/test_deriving_phenomena.py +++ b/docs/iris/example_tests/test_deriving_phenomena.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/docs/iris/example_tests/test_global_map.py b/docs/iris/example_tests/test_global_map.py index deef58f7dd..659b5c630c 100644 --- a/docs/iris/example_tests/test_global_map.py +++ b/docs/iris/example_tests/test_global_map.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/docs/iris/example_tests/test_hovmoller.py b/docs/iris/example_tests/test_hovmoller.py index eb30a379ba..110556bedf 100644 --- a/docs/iris/example_tests/test_hovmoller.py +++ b/docs/iris/example_tests/test_hovmoller.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/docs/iris/example_tests/test_lagged_ensemble.py b/docs/iris/example_tests/test_lagged_ensemble.py index 306e9b5d37..fb862991ab 100644 --- a/docs/iris/example_tests/test_lagged_ensemble.py +++ b/docs/iris/example_tests/test_lagged_ensemble.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/docs/iris/example_tests/test_lineplot_with_legend.py b/docs/iris/example_tests/test_lineplot_with_legend.py index 7477948685..99ef30d6ad 100644 --- a/docs/iris/example_tests/test_lineplot_with_legend.py +++ b/docs/iris/example_tests/test_lineplot_with_legend.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/docs/iris/example_tests/test_rotated_pole_mapping.py b/docs/iris/example_tests/test_rotated_pole_mapping.py index d7dcfc9494..75d61ff975 100644 --- a/docs/iris/example_tests/test_rotated_pole_mapping.py +++ b/docs/iris/example_tests/test_rotated_pole_mapping.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/docs/iris/src/conf.py b/docs/iris/src/conf.py index 944402d4c9..adc86c9067 100644 --- a/docs/iris/src/conf.py +++ b/docs/iris/src/conf.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/docs/iris/src/sphinxext/gen_example_directory.py b/docs/iris/src/sphinxext/gen_example_directory.py index d14fca2d9a..09071cc0fd 100644 --- a/docs/iris/src/sphinxext/gen_example_directory.py +++ b/docs/iris/src/sphinxext/gen_example_directory.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/__init__.py b/lib/iris/__init__.py index 9b642b7358..9d73336cd8 100644 --- a/lib/iris/__init__.py +++ b/lib/iris/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/_constraints.py b/lib/iris/_constraints.py index 6ac1d0f3a6..a662580c75 100644 --- a/lib/iris/_constraints.py +++ b/lib/iris/_constraints.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/_cube_coord_common.py b/lib/iris/_cube_coord_common.py index 4a8a1c0a97..443ac4b77e 100644 --- a/lib/iris/_cube_coord_common.py +++ b/lib/iris/_cube_coord_common.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/_merge.py b/lib/iris/_merge.py index 15a6933c49..d1d44bdc3a 100644 --- a/lib/iris/_merge.py +++ b/lib/iris/_merge.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/analysis/__init__.py b/lib/iris/analysis/__init__.py index 5b2d1b6558..dbeb275764 100644 --- a/lib/iris/analysis/__init__.py +++ b/lib/iris/analysis/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/analysis/calculus.py b/lib/iris/analysis/calculus.py index 1598536dcf..a3fa325837 100644 --- a/lib/iris/analysis/calculus.py +++ b/lib/iris/analysis/calculus.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/analysis/cartography.py b/lib/iris/analysis/cartography.py index 7f02e115f7..b0f8141028 100644 --- a/lib/iris/analysis/cartography.py +++ b/lib/iris/analysis/cartography.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/analysis/geometry.py b/lib/iris/analysis/geometry.py index 93a12b41c7..a2b7517f5f 100644 --- a/lib/iris/analysis/geometry.py +++ b/lib/iris/analysis/geometry.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/analysis/maths.py b/lib/iris/analysis/maths.py index 7a3f2984bf..9179eccae8 100644 --- a/lib/iris/analysis/maths.py +++ b/lib/iris/analysis/maths.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/analysis/trajectory.py b/lib/iris/analysis/trajectory.py index 1ae7b3b514..a92f0f5911 100644 --- a/lib/iris/analysis/trajectory.py +++ b/lib/iris/analysis/trajectory.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/aux_factory.py b/lib/iris/aux_factory.py index 225f95f184..a485b98398 100644 --- a/lib/iris/aux_factory.py +++ b/lib/iris/aux_factory.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/config.py b/lib/iris/config.py index 44cfd1eca8..d82eb57851 100644 --- a/lib/iris/config.py +++ b/lib/iris/config.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/coord_categorisation.py b/lib/iris/coord_categorisation.py index a67cd79551..db6a7fe1e4 100644 --- a/lib/iris/coord_categorisation.py +++ b/lib/iris/coord_categorisation.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/coords.py b/lib/iris/coords.py index f4a1c3fe43..b34c4824b9 100644 --- a/lib/iris/coords.py +++ b/lib/iris/coords.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/cube.py b/lib/iris/cube.py index 437df28b03..110e4dfb83 100644 --- a/lib/iris/cube.py +++ b/lib/iris/cube.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/fileformats/__init__.py b/lib/iris/fileformats/__init__.py index d95fdb1f6b..9e3f22b68f 100644 --- a/lib/iris/fileformats/__init__.py +++ b/lib/iris/fileformats/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/fileformats/cf.py b/lib/iris/fileformats/cf.py index b2f8b1a657..4edb1d0a1a 100644 --- a/lib/iris/fileformats/cf.py +++ b/lib/iris/fileformats/cf.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/fileformats/dot.py b/lib/iris/fileformats/dot.py index 0284476a8c..ab0ce59869 100644 --- a/lib/iris/fileformats/dot.py +++ b/lib/iris/fileformats/dot.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/fileformats/ff.py b/lib/iris/fileformats/ff.py index d908c6435b..a2283becb7 100644 --- a/lib/iris/fileformats/ff.py +++ b/lib/iris/fileformats/ff.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/fileformats/grib.py b/lib/iris/fileformats/grib.py index d055abe0ff..025ebf17b2 100644 --- a/lib/iris/fileformats/grib.py +++ b/lib/iris/fileformats/grib.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/fileformats/grib_save_rules.py b/lib/iris/fileformats/grib_save_rules.py index 2c7944e50e..3951a66877 100644 --- a/lib/iris/fileformats/grib_save_rules.py +++ b/lib/iris/fileformats/grib_save_rules.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/fileformats/manager.py b/lib/iris/fileformats/manager.py index 611bed4438..7d7638328f 100644 --- a/lib/iris/fileformats/manager.py +++ b/lib/iris/fileformats/manager.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/fileformats/nimrod.py b/lib/iris/fileformats/nimrod.py index 25cccb577d..22d868ecda 100644 --- a/lib/iris/fileformats/nimrod.py +++ b/lib/iris/fileformats/nimrod.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/fileformats/pp.py b/lib/iris/fileformats/pp.py index 4a5f3fc25f..dc0ae00c32 100644 --- a/lib/iris/fileformats/pp.py +++ b/lib/iris/fileformats/pp.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/fileformats/rules.py b/lib/iris/fileformats/rules.py index 29256b78ca..34e69f8e31 100644 --- a/lib/iris/fileformats/rules.py +++ b/lib/iris/fileformats/rules.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/io/__init__.py b/lib/iris/io/__init__.py index 034317fce2..76c605998d 100644 --- a/lib/iris/io/__init__.py +++ b/lib/iris/io/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/io/format_picker.py b/lib/iris/io/format_picker.py index c4b56ef826..8df6c18d76 100644 --- a/lib/iris/io/format_picker.py +++ b/lib/iris/io/format_picker.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/iterate.py b/lib/iris/iterate.py index b4c17cee03..bfdc4e83dc 100644 --- a/lib/iris/iterate.py +++ b/lib/iris/iterate.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/palette.py b/lib/iris/palette.py index 89ee9d4703..1d1edd5dc7 100644 --- a/lib/iris/palette.py +++ b/lib/iris/palette.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/plot.py b/lib/iris/plot.py index f93a0b635e..07c3da76a2 100644 --- a/lib/iris/plot.py +++ b/lib/iris/plot.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/quickplot.py b/lib/iris/quickplot.py index 3ff87b2cc6..b3b75b5f2d 100644 --- a/lib/iris/quickplot.py +++ b/lib/iris/quickplot.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/__init__.py b/lib/iris/tests/__init__.py index 532c771c3c..9a1f975dff 100644 --- a/lib/iris/tests/__init__.py +++ b/lib/iris/tests/__init__.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/stock.py b/lib/iris/tests/stock.py index 516b357be9..22f6aaec7b 100644 --- a/lib/iris/tests/stock.py +++ b/lib/iris/tests/stock.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/system_test.py b/lib/iris/tests/system_test.py index 78c4f8c19b..2dc054b8e2 100644 --- a/lib/iris/tests/system_test.py +++ b/lib/iris/tests/system_test.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_aggregate_by.py b/lib/iris/tests/test_aggregate_by.py index e4af22fcaa..658763566a 100644 --- a/lib/iris/tests/test_aggregate_by.py +++ b/lib/iris/tests/test_aggregate_by.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_analysis.py b/lib/iris/tests/test_analysis.py index 6c78b823f3..756f64f8b1 100644 --- a/lib/iris/tests/test_analysis.py +++ b/lib/iris/tests/test_analysis.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_analysis_calculus.py b/lib/iris/tests/test_analysis_calculus.py index dd1f2358d7..b05246e1a6 100644 --- a/lib/iris/tests/test_analysis_calculus.py +++ b/lib/iris/tests/test_analysis_calculus.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_basic_maths.py b/lib/iris/tests/test_basic_maths.py index bba892667f..a2d3977a57 100644 --- a/lib/iris/tests/test_basic_maths.py +++ b/lib/iris/tests/test_basic_maths.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_cdm.py b/lib/iris/tests/test_cdm.py index 4b509cb7f6..fdd3c65a5b 100644 --- a/lib/iris/tests/test_cdm.py +++ b/lib/iris/tests/test_cdm.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_cell.py b/lib/iris/tests/test_cell.py index 268cea4bb3..f161bce3c1 100644 --- a/lib/iris/tests/test_cell.py +++ b/lib/iris/tests/test_cell.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_coord_api.py b/lib/iris/tests/test_coord_api.py index 025cef5bc8..2cd5528d2f 100644 --- a/lib/iris/tests/test_coord_api.py +++ b/lib/iris/tests/test_coord_api.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_cube.py b/lib/iris/tests/test_cube.py index b0848f3825..a7ebdaaf26 100644 --- a/lib/iris/tests/test_cube.py +++ b/lib/iris/tests/test_cube.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_cube_to_pp.py b/lib/iris/tests/test_cube_to_pp.py index ad6a6f3f0f..f6076611c7 100644 --- a/lib/iris/tests/test_cube_to_pp.py +++ b/lib/iris/tests/test_cube_to_pp.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_ff.py b/lib/iris/tests/test_ff.py index 9394de2f22..ce6723d476 100644 --- a/lib/iris/tests/test_ff.py +++ b/lib/iris/tests/test_ff.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_file_load.py b/lib/iris/tests/test_file_load.py index b868116c10..34d49ebbc9 100644 --- a/lib/iris/tests/test_file_load.py +++ b/lib/iris/tests/test_file_load.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_grib_load.py b/lib/iris/tests/test_grib_load.py index 844823b7da..79478de93d 100644 --- a/lib/iris/tests/test_grib_load.py +++ b/lib/iris/tests/test_grib_load.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_grib_save.py b/lib/iris/tests/test_grib_save.py index 34a3e294e1..1df25cbc90 100644 --- a/lib/iris/tests/test_grib_save.py +++ b/lib/iris/tests/test_grib_save.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_grib_save_rules.py b/lib/iris/tests/test_grib_save_rules.py index fb5dcb5ac4..3661a510b7 100644 --- a/lib/iris/tests/test_grib_save_rules.py +++ b/lib/iris/tests/test_grib_save_rules.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_hybrid.py b/lib/iris/tests/test_hybrid.py index dcb0a9c186..e12b9bff6a 100644 --- a/lib/iris/tests/test_hybrid.py +++ b/lib/iris/tests/test_hybrid.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_interpolation.py b/lib/iris/tests/test_interpolation.py index 92cd91f9da..1c45cf973e 100644 --- a/lib/iris/tests/test_interpolation.py +++ b/lib/iris/tests/test_interpolation.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_intersect.py b/lib/iris/tests/test_intersect.py index 61dc43664d..9d19fd2282 100644 --- a/lib/iris/tests/test_intersect.py +++ b/lib/iris/tests/test_intersect.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_io_init.py b/lib/iris/tests/test_io_init.py index 7859daf3f8..d4b09842c3 100644 --- a/lib/iris/tests/test_io_init.py +++ b/lib/iris/tests/test_io_init.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_iterate.py b/lib/iris/tests/test_iterate.py index a2e07bc3c4..438baa4b95 100644 --- a/lib/iris/tests/test_iterate.py +++ b/lib/iris/tests/test_iterate.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_load.py b/lib/iris/tests/test_load.py index 5d24da8f34..b3f1a0d71f 100644 --- a/lib/iris/tests/test_load.py +++ b/lib/iris/tests/test_load.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_mapping.py b/lib/iris/tests/test_mapping.py index 3750e817a2..e40f0d61ce 100644 --- a/lib/iris/tests/test_mapping.py +++ b/lib/iris/tests/test_mapping.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_merge.py b/lib/iris/tests/test_merge.py index ab0cc8b68a..270421992e 100644 --- a/lib/iris/tests/test_merge.py +++ b/lib/iris/tests/test_merge.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_netcdf.py b/lib/iris/tests/test_netcdf.py index acfd1522df..cddf6eb48b 100644 --- a/lib/iris/tests/test_netcdf.py +++ b/lib/iris/tests/test_netcdf.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_nimrod.py b/lib/iris/tests/test_nimrod.py index 2a0668b85e..6fd8815ce1 100644 --- a/lib/iris/tests/test_nimrod.py +++ b/lib/iris/tests/test_nimrod.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_plot.py b/lib/iris/tests/test_plot.py index 7d43441e60..1dfda8e9b3 100644 --- a/lib/iris/tests/test_plot.py +++ b/lib/iris/tests/test_plot.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_pp_cf.py b/lib/iris/tests/test_pp_cf.py index 89e28c998c..8bc7322e6a 100644 --- a/lib/iris/tests/test_pp_cf.py +++ b/lib/iris/tests/test_pp_cf.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_pp_stash.py b/lib/iris/tests/test_pp_stash.py index 98d8e72e24..9d111fcf45 100644 --- a/lib/iris/tests/test_pp_stash.py +++ b/lib/iris/tests/test_pp_stash.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_pp_to_cube.py b/lib/iris/tests/test_pp_to_cube.py index 3f5521d300..d065514aba 100644 --- a/lib/iris/tests/test_pp_to_cube.py +++ b/lib/iris/tests/test_pp_to_cube.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_quickplot.py b/lib/iris/tests/test_quickplot.py index 584217467f..2593673c64 100644 --- a/lib/iris/tests/test_quickplot.py +++ b/lib/iris/tests/test_quickplot.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_regrid.py b/lib/iris/tests/test_regrid.py index 99fb06625c..045413a57e 100644 --- a/lib/iris/tests/test_regrid.py +++ b/lib/iris/tests/test_regrid.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_rules.py b/lib/iris/tests/test_rules.py index 08636d8176..668a92bacc 100644 --- a/lib/iris/tests/test_rules.py +++ b/lib/iris/tests/test_rules.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_trajectory.py b/lib/iris/tests/test_trajectory.py index fb642a9a0d..8211646462 100644 --- a/lib/iris/tests/test_trajectory.py +++ b/lib/iris/tests/test_trajectory.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_unit.py b/lib/iris/tests/test_unit.py index 3b3d609426..344b5c4037 100644 --- a/lib/iris/tests/test_unit.py +++ b/lib/iris/tests/test_unit.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_uri_callback.py b/lib/iris/tests/test_uri_callback.py index 53c54cfb54..1e397d20b6 100644 --- a/lib/iris/tests/test_uri_callback.py +++ b/lib/iris/tests/test_uri_callback.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/tests/test_util.py b/lib/iris/tests/test_util.py index a79e9964fc..805c5b39d4 100644 --- a/lib/iris/tests/test_util.py +++ b/lib/iris/tests/test_util.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/unit.py b/lib/iris/unit.py index f66769b80a..9cd1cc1cf7 100644 --- a/lib/iris/unit.py +++ b/lib/iris/unit.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/lib/iris/util.py b/lib/iris/util.py index ff6119defb..3d1ea24c59 100644 --- a/lib/iris/util.py +++ b/lib/iris/util.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. # diff --git a/tools/generate_std_names.py b/tools/generate_std_names.py index 85406ce688..87b8e8ed47 100644 --- a/tools/generate_std_names.py +++ b/tools/generate_std_names.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2012, Met Office +# (C) British Crown Copyright 2010 - 2013, Met Office # # This file is part of Iris. #