Conversation
lib/iris/analysis/__init__.py
Outdated
| @@ -1,4 +1,4 @@ | |||
| # (C) British Crown Copyright 2010 - 2016, Met Office | |||
| # (C) British Crown Copyright 2010 - 2017, Met Office | |||
There was a problem hiding this comment.
Are you sure you need to make this change
The build that fails only has two files that have the wrong headers
======================================================================
ERROR: test_license_headers (iris.tests.test_coding_standards.TestLicenseHeaders)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/travis/build/SciTools/iris/lib/iris/tests/test_coding_standards.py", line 345, in test_license_headers
raise ValueError('There were license header failures. See stdout.')
ValueError: There were license header failures. See stdout.
-------------------- >> begin captured stdout << ---------------------
The file header at lib/iris/analysis/_interpolate_backdoor.py is out of date. The last commit was in 2017, but the copyright states it was 2016.
The file header at lib/iris/analysis/interpolate.py is out of date. The last commit was in 2017, but the copyright states it was 2016.
And the PR that introduced this change only modified two files
https://github.com/SciTools/iris/pull/2272/files
Am I missing something?
There was a problem hiding this comment.
Now I'm confused the travis build from #2290 includes lib/iris/analysis/__init__.py as one of it's failures
======================================================================
ERROR: test_license_headers (iris.tests.test_coding_standards.TestLicenseHeaders)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/travis/build/SciTools/iris/lib/iris/tests/test_coding_standards.py", line 345, in test_license_headers
raise ValueError('There were license header failures. See stdout.')
ValueError: There were license header failures. See stdout.
-------------------- >> begin captured stdout << ---------------------
The file header at lib/iris/analysis/__init__.py is out of date. The last commit was in 2017, but the copyright states it was 2016.
The file header at lib/iris/analysis/_interpolate_backdoor.py is out of date. The last commit was in 2017, but the copyright states it was 2016.
The file header at lib/iris/analysis/interpolate.py is out of date. The last commit was in 2017, but the copyright states it was 2016.
--------------------- >> end captured stdout << ----------------------
but that file hasn't been touched since #2273 which was merged before the new year
https://github.com/SciTools/iris/commits/v1.12.x/lib/iris/analysis/__init__.py
There was a problem hiding this comment.
Oooh, I see now that #2290 is actually touching analysis/__init__.py but doesn't update the header, so that fix really belongs there.
I will remove that change from here -- it should still fix the v1.12.x branch.
8df2460 to
291e202
Compare
Done that now :
|
|
Hi @bjlittle Once done, the other three #2290 #2292 #2294 should just need respins to fix. Then we will have all we need to get on with making RC1. |
|
👍 |
Introduced by merge of #2272