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

Update hazard #121

Merged
merged 46 commits into from
Jul 11, 2023
Merged

Update hazard #121

merged 46 commits into from
Jul 11, 2023

Conversation

@odscrachel odscrachel marked this pull request as draft July 4, 2023 12:48
@duncandewhurst
Copy link
Contributor

Reminder to update the changelog.

@odscrachel odscrachel marked this pull request as ready for review July 5, 2023 15:34
@odscrachel odscrachel requested a review from duncandewhurst July 5, 2023 15:59
@duncandewhurst
Copy link
Contributor

I've resolved merge conflicts and merged dev into this branch. At the same time, I made a few minor updates related to the new structure of the schema reference documentation.

Copy link
Contributor

@duncandewhurst duncandewhurst left a comment

Choose a reason for hiding this comment

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

Many properties of Event still reference definitions for common codelists. The codelists need to be moved to CSV files and the references replaced with titles, descriptions and codelist keywords. I haven't commented on them individually as I think most will be addressed by the resolution of #59 and #91

Before merging, need to run ocdskit schema-strict to add missing validation keywords.

schema/rdl_schema_0.1.json Outdated Show resolved Hide resolved
schema/rdl_schema_0.1.json Outdated Show resolved Hide resolved
schema/rdl_schema_0.1.json Outdated Show resolved Hide resolved
schema/rdl_schema_0.1.json Outdated Show resolved Hide resolved
schema/rdl_schema_0.1.json Outdated Show resolved Hide resolved
schema/rdl_schema_0.1.json Outdated Show resolved Hide resolved
schema/rdl_schema_0.1.json Outdated Show resolved Hide resolved
schema/rdl_schema_0.1.json Show resolved Hide resolved
schema/rdl_schema_0.1.json Outdated Show resolved Hide resolved
schema/rdl_schema_0.1.json Outdated Show resolved Hide resolved
@odscjen
Copy link
Contributor

odscjen commented Jul 7, 2023

I've merged in the Vulnerability changes, I think this is all now fine, just waiting on the decisions in #59 and #91

@duncandewhurst
Copy link
Contributor

I've made the changes discussed in #91

@odscjen odscjen requested review from stufraser1 and matamadio July 10, 2023 10:09
stufraser1
stufraser1 previously approved these changes Jul 10, 2023
matamadio
matamadio previously approved these changes Jul 10, 2023
@odscjen odscjen dismissed stale reviews from matamadio and stufraser1 via 747c46d July 10, 2023 11:25
@odscjen odscjen requested a review from duncandewhurst July 10, 2023 11:28
@odscjen
Copy link
Contributor

odscjen commented Jul 10, 2023

@duncandewhurst just requesting one final review. Stu and Mattia approved this prior to me merging in the Loss PR so if you're happy you can just merge this in. Once this is done it's just the double check of final things that needs doing.

docs/about/changelog.md Outdated Show resolved Hide resolved
schema/rdl_schema_0.1.json Outdated Show resolved Hide resolved
schema/rdl_schema_0.1.json Outdated Show resolved Hide resolved
schema/rdl_schema_0.1.json Outdated Show resolved Hide resolved
@duncandewhurst
Copy link
Contributor

I fixed a few typos and made one copy edit.

@duncandewhurst duncandewhurst self-requested a review July 11, 2023 02:27
@duncandewhurst duncandewhurst merged commit 3fbe0e9 into dev Jul 11, 2023
@duncandewhurst duncandewhurst deleted the hazard branch July 11, 2023 02:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment