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

Bump version number to 1.2.0-development; fix ordering and formatting of spec entries in schema table; adjust format of dataTypes appendix table #165

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

sstucker
Copy link
Collaborator

@sstucker sstucker commented Dec 27, 2024

Schema table order did not match the table of contents of the spec. Also bumping the vnum in the beginning of the document to reflect the new version number

The measurementList/measurementLists are much like 2D/3D probe geometries in that only one is required--I have edited the schema to reflect this.

Edit: I see #147 also bumps version. I think both of these are ready for merge.

@sstucker sstucker changed the title Bump version number to 1.2-draft, fix ordering of spec entries relative to schema table Bump version number to 1.2.0-development, fix ordering of spec entries relative to schema table Dec 27, 2024
@sstucker sstucker requested a review from rob-luke December 27, 2024 15:12
@sstucker sstucker changed the title Bump version number to 1.2.0-development, fix ordering of spec entries relative to schema table Bump version number to 1.2.0-development, fix ordering and formatting of spec entries in schema table Dec 27, 2024
@sstucker sstucker changed the title Bump version number to 1.2.0-development, fix ordering and formatting of spec entries in schema table Bump version number to 1.2.0-development; fix ordering and formatting of spec entries in schema table; adjust format of dataTypes appendix table Dec 31, 2024
@dboas
Copy link
Collaborator

dboas commented Jan 14, 2025

@samuelpowell
This looks good to me. Stephen's changes to the measurementList and measurementLists all looks good. It doesn't capture clearly that the requirement is that only one should be present. But we are still discussing the best solution for that in #155.
Should we get that all resolved in this PR? Or accept this PR and then further clarify it later.
Seems best to resolve it all in this first PR.

Also, we just bumped the version number in PR #147. But I see under file changes for this PR that it still reflects the old version number, which was there when this PR was first made. Seems odd to me that the file changes is not reflecting the current state of the master branch.

@samuelpowell
Copy link
Collaborator

@dboas this PR is specifically to fix the schema table, so I think it's fine to merge and then deal with the specifics of the content in #155 as required.

(Regarding the version number, that is normal - the work in this PR was banched from master before those changes were made, and unless they are merged into this branch, or this branch is rebased onto the latest master commit, the new changes will not be seen. It will all be resolved, or not, when this is merged)

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