Skip to content

Fix to copyright licence check logic #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pelson merged 2 commits into from
May 1, 2013
Merged

Fix to copyright licence check logic #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b871a7
Fix to license check logic
esc24 May 1, 2013
5d5e0bc
Updates to erroneous copyright years based on git history.
esc24 May 1, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/iris/example_tests/test_COP_1d_plot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion docs/iris/example_tests/test_COP_maps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion docs/iris/example_tests/test_TEC.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion docs/iris/example_tests/test_cross_section.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion docs/iris/example_tests/test_custom_file_loading.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion docs/iris/example_tests/test_deriving_phenomena.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion docs/iris/example_tests/test_global_map.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion docs/iris/example_tests/test_hovmoller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion docs/iris/example_tests/test_lagged_ensemble.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion docs/iris/example_tests/test_lineplot_with_legend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion docs/iris/example_tests/test_rotated_pole_mapping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion docs/iris/src/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion docs/iris/src/sphinxext/gen_example_directory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/_constraints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/_cube_coord_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/_merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/analysis/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/analysis/calculus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/analysis/cartography.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/analysis/geometry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/analysis/maths.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/analysis/trajectory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/aux_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/coord_categorisation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/coords.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/cube.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/fileformats/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/fileformats/cf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/fileformats/dot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/fileformats/ff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/fileformats/grib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/fileformats/grib_save_rules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/fileformats/manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/fileformats/nimrod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/fileformats/pp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/fileformats/rules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/io/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/io/format_picker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/iterate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/palette.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/plot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/quickplot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/stock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/system_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/test_aggregate_by.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/test_analysis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/test_analysis_calculus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/test_basic_maths.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/test_cdm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/test_cell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
8 changes: 6 additions & 2 deletions lib/iris/tests/test_coding_standards.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/test_coord_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/test_cube.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/test_cube_to_pp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/test_ff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/test_file_load.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/test_grib_load.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/test_grib_save.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/test_grib_save_rules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/test_hybrid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/test_interpolation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
2 changes: 1 addition & 1 deletion lib/iris/tests/test_intersect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
Loading