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.

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

Jump to bottom

Merge "default_units" feature branch #3795

Merged
merged 6 commits into from
Aug 20, 2020
Merged

Merge "default_units" feature branch #3795

merged 6 commits into from
Aug 20, 2020

Conversation

abooton
Copy link
Contributor

@abooton abooton commented Aug 20, 2020 •
edited
Loading

Merge updated feature branch (see #3794) to master.
(Supersedes #3731)

These changes address the features in (parent issue) #3708

stephenworsley and others added 6 commits June 1, 2020 12:27
@stephenworsley
Change default units to "unknown" for all DimensionalMetadata (SciToo…
3fdccac 
…ls#3713)
@stephenworsley
Change default loading unit from "1" to "unknown" (correct branch) (S…
3171b95 
…ciTools#3709)
@stephenworsley
Unify saving behaviour of "unknown" and "no_unit" (SciTools#3711)
912f500
@stephenworsley
fix test (SciTools#3732)
94d5619
@abooton
Merge remote-tracking branch 'upstream/default_units' into default_un…
c3a3163 
…its_merge

* upstream/default_units:
  fix test (SciTools#3732)
  Unify saving behaviour of "unknown" and "no_unit" (SciTools#3711)
  Change default loading unit from "1" to "unknown" (correct branch) (SciTools#3709)
  Change default units to "unknown" for all DimensionalMetadata (SciTools#3713)
@abooton
Merge pull request SciTools#3794 from abooton/default_units_base1873ce14
ca7ac7f 
[FB] default_units: Update merge-base to commit 1873ce1
@abooton abooton changed the title Default units merge Merge "default_units" feature branch Aug 20, 2020
This was referenced Aug 20, 2020
Closed
Closed
@abooton
Copy link
Contributor Author

abooton commented Aug 20, 2020

These changes address the features in (parent issue) #3708

stephenworsley
stephenworsley approved these changes Aug 20, 2020
View reviewed changes
Copy link
Contributor

@stephenworsley stephenworsley left a comment

Choose a reason for hiding this comment

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

I'm satisfied that this covers all the criteria mentioned in #3708 with the exception of testing for the behaviour of CellMeasure and AncillaryVariable on NetCDF load, which will have to be added after the feature branch launch_ancils is merged (to be addressed with #3474).

@stephenworsley stephenworsley merged commit 42a1964 into SciTools:master Aug 20, 2020
tkknight added a commit to tkknight/iris that referenced this pull request Aug 20, 2020
@tkknight
Merge branch 'master' into contribution_overhaul
61d304e 
* master:
  Merge "default_units" feature branch (SciTools#3795)
  set third party default logging level (SciTools#3787)
@abooton abooton deleted the default_units_merge branch August 20, 2020 13:52
@bjlittle bjlittle mentioned this pull request Sep 5, 2020
Merged
This was referenced Jan 27, 2021
Closed
Merged
@trexfeathers trexfeathers mentioned this pull request Oct 6, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stephenworsley stephenworsley stephenworsley approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@abooton @stephenworsley