Skip to content

Conversation

@jthielen
Copy link
Collaborator

Description Of Changes

Fix some mixing of quantified and units-on-attribute DataArrays which breaks xr.testing.assert_allclose in xarray 0.16.0. This allows us to bump the current CI build to xarray 0.16.0.

Checklist

@jthielen jthielen added Type: Maintenance Updates and clean ups (but not wrong) Area: Xarray Pertains to xarray integration labels Jul 28, 2020
@jthielen jthielen added this to the 0.12.2 milestone Jul 28, 2020
@jthielen jthielen requested review from dcamron and dopplershift July 28, 2020 15:49
@CLAassistant
Copy link

CLAassistant commented Jul 28, 2020

CLA assistant check
All committers have signed the CLA.

@dopplershift
Copy link
Member

Looks like CLA is hung up because dependabot is the author of the commit. No worries, but for ease in the future might be easier to just duplicate the change.

Does this really belong in 0.12.2? I guess I just wasn't expecting unit-containing behavior to work on 0.12.2.

Copy link
Member

@dopplershift dopplershift left a comment

Choose a reason for hiding this comment

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

Regardless of whether this goes on 0.12.2, this looks good and can certainly merge to master.

@dopplershift
Copy link
Member

I think coverage is slightly down because we removed covered lines.

@dopplershift dopplershift merged commit bddcb1f into Unidata:master Jul 28, 2020
@jthielen
Copy link
Collaborator Author

jthielen commented Jul 28, 2020

@dopplershift I tagged it as 0.12.2 based on your comment here #1419 (comment), but yes, I think this is more based on 1.0 features so may be more appropriate there. I'm not sure where or how these changes affect the 0.12.x branch.

And that sounds good about just duplicating the version bump in the future rather than incorporating dependabot's commit.

@dopplershift
Copy link
Member

Ah, now I understand. Ok, we can leave it, then I'll see if I need to cherry-pick the code change to actually get tests to pass on the 0.12.x branch.

@dopplershift dopplershift modified the milestones: 0.12.2, 1.0 Aug 5, 2020
@dopplershift
Copy link
Member

For the record, the only change from this PR in 0.12.2 is the change to allow xarray 0.16.0 for CI. No code changes needed on the 0.12.x branch.

@jthielen jthielen deleted the xarray-0-16 branch January 18, 2021 02:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: Xarray Pertains to xarray integration Type: Maintenance Updates and clean ups (but not wrong)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants