Skip to content

Conversation

@pp-mo
Copy link
Member

@pp-mo pp-mo commented Jan 9, 2017

Introduced by merge of #2272

@@ -1,4 +1,4 @@
# (C) British Crown Copyright 2010 - 2016, Met Office
# (C) British Crown Copyright 2010 - 2017, Met Office
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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?

Copy link
Member

@lbdreyer lbdreyer Jan 9, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@pp-mo pp-mo added this to the v1.12.x milestone Jan 9, 2017
@pp-mo
Copy link
Member Author

pp-mo commented Jan 10, 2017

I will remove that change from here -- it should still fix the v1.12.x branch.

Done that now :

@pp-mo
Copy link
Member Author

pp-mo commented Jan 10, 2017

Hi @bjlittle
I see @lbdreyer not available today
Can you expedite this ?

Once done, the other three #2290 #2292 #2294 should just need respins to fix.
I will quickly view those + assign to yourself and @marqh on pseudo-intelligent random basis ...

Then we will have all we need to get on with making RC1.

@bjlittle bjlittle self-assigned this Jan 10, 2017
@bjlittle
Copy link
Member

👍

@bjlittle bjlittle merged commit 8530257 into SciTools:v1.12.x Jan 10, 2017
@pp-mo pp-mo deleted the fix_header_dates branch April 28, 2023 13:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants