Skip to content
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.

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

Relicense from LGPL-3 to BSD-3 #331

Merged
merged 2 commits into from
Jan 11, 2023
Merged

Relicense from LGPL-3 to BSD-3 #331

merged 2 commits into from
Jan 11, 2023

Conversation

lbdreyer
Copy link
Member

@lbdreyer lbdreyer commented Jan 5, 2023

All the code in this repo comes from contributors who have now either signed the new CLA or are employees of the Met Office.

The new CLA enables us to relicense to BSD-3.

This PR:

  • adds a BSD-3 LICENSE file (to replace the old COPYING* files)
  • Updates the pypi classifiers/metadata etc
  • Updates the file license headers

@bjlittle
Copy link
Member

bjlittle commented Jan 6, 2023

@lbdreyer Test failure to investigate, but not your doing... 🤔

@rcomer
Copy link
Member

rcomer commented Jan 6, 2023

I think that test failure is just a method that shouldn't start with "test".

def test_gregorian_calendar_conversion_setup(self):
# Reproduces a situation where a unit's gregorian calendar would not
# match (using the `is` operator) to the literal string 'gregorian',
# causing an `is not` test to return a false negative.
cal_str = cf_units.CALENDAR_GREGORIAN
calendar = self.MyStr(cal_str)
assert calendar is not cal_str
u1 = Unit("hours since 1970-01-01 00:00:00", calendar=calendar)
u2 = Unit("hours since 1969-11-30 00:00:00", calendar=calendar)
u1point = np.array([8.0], dtype=np.float32)
expected = np.array([776.0], dtype=np.float32)
result = u1.convert(u1point, u2)
return expected, result

Edit: nope, that's just a warning I'm looking at. I'll open a PR to fix the warning anyway....

Copy link
Member

@pp-mo pp-mo left a comment

Choose a reason for hiding this comment

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

@bjlittle not your doing

Not so sure.

I think the two files mentioned did get missed in updating the licence header.
So, I think these tweaks may fix what was wrong?
Haven't really checked anything else yet, but I'm sure it's right in spirit.

cf_units/tests/__init__.py Outdated Show resolved Hide resolved
cf_units/tests/integration/test_num2date.py Outdated Show resolved Hide resolved
Co-authored-by: Patrick Peglar <patrick.peglar@metoffice.gov.uk>
@lbdreyer
Copy link
Member Author

lbdreyer commented Jan 6, 2023

Thanks for catching the problem @pp-mo !

The changes should now be correct

@bjlittle bjlittle self-requested a review January 7, 2023 01:08
Copy link
Member

@bjlittle bjlittle left a comment

Choose a reason for hiding this comment

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

👍

Copy link
Member

@pp-mo pp-mo left a comment

Choose a reason for hiding this comment

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

Re-reviewing this to approve.
But I can't understand why this is necessary, since it lists no unresolved conversations.
Seen this before, I think it is possibly a GitHub bug ??

@pp-mo pp-mo merged commit e993a9b into SciTools:main Jan 11, 2023
@lbdreyer
Copy link
Member Author

Thanks @pp-mo !

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.

4 participants