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

Update main branch #249

Merged
merged 842 commits into from
Sep 10, 2023
Merged

Update main branch #249

merged 842 commits into from
Sep 10, 2023

Conversation

duncandewhurst
Copy link
Contributor

This PR merges dev into main. Once merged, the documentation at https://docs.riskdatalibrary.org/en/latest/ will be updated.

duncandewhurst and others added 30 commits August 9, 2023 08:31
@duncandewhurst
Merge branch 'dev' into spreadsheet-fixes
92b716a
@duncandewhurst
rdls_schema: Make version of type string, per description
85dbaae
@duncandewhurst
rdls_schema.json: Correct required fields for in Event_set
7f88a68
@duncandewhurst
rdls_schema: Replace identifier with id
ad67c47
@duncandewhurst
rlds_schema: Correct required fields for Hazard
cbd1363
@duncandewhurst
rdls_schema: Correct required fields for Footprint
cfda35b
@duncandewhurst
rdls_schema: Fix markdown syntax in Attribution.role description
b73bd04
@odscjen
add code to frequency_distribution and location_gazetteers
31e6c87
@odscjen
update changelog.md
67b39cd
@odscjen
rdls_schema.json: remove type key from properties with other than arrays
75c47f4
@odscjen
update changelog.md
d8b1aa5
@duncandewhurst
Update changelog
3ece5e0
@duncandewhurst
manage.py: Update pre-commit for new codelist directory location
3b3cf12
@duncandewhurst
Run ./manage.py pre-commit
aad0ab2
@odscjen
Merge pull request #190 from GFDRR/182-duplicates-in-schema-browser
0b2c6f4 
rdls_schema.json: remove type key from properties with  other than ar…
@odscjen
Merge branch 'dev' into 186-185-codelist-additions
3cbe752
@odscjen
Merge pull request #189 from GFDRR/186-185-codelist-additions
ceefbf7 
add code to frequency_distribution and location_gazetteers
@duncandewhurst
Merge branch 'dev' into spreadsheet-fixes
153935b
@duncandewhurst
Merge pull request #181 from GFDRR/spreadsheet-fixes
48f3df2 
Spreadsheet fixes
@duncandewhurst
docs/reference/schema.md: Fix sub-schema references and collapse options
29b95f0
@duncandewhurst
docs/conf.py: Fix build error after interrupted build
f22fb0d
@duncandewhurst
docs/reference/codelists.md: Fix codelist references
80c1953
@duncandewhurst
Update changelog
5c02d0e
@odscjen
Merge pull request #193 from GFDRR/151-references
ccb6942 
Schema reference: Fix sub-schema and codelists references
@duncandewhurst
schema/rdls_schema.json: Consistently prefix identifier titles
39cfaad
@duncandewhurst
schema/rdls_schema.json: Shorten component titles
e3c4dd8
@duncandewhurst
docs/reference/schema.md: Add Fathom hazard example
f2f34e2
@duncandewhurst
manage.py: Generate flattened, transposed CSVs for examples
5b4c3e0
@duncandewhurst
docs/reference/schema.md: Format markdown
8eed537
@duncandewhurst
requirements: Remove local Flatten Tool directory
254ed0d
@duncandewhurst
schema/rdls_package_schema.json: Update schema URL
aeebd47
@duncandewhurst
Merge pull request #241 from GFDRR/227-schema-urls
0aea54a 
Update schema URLs
@duncandewhurst
Merge branch 'dev' into 149-docs-guides-pages
a00b33a
@duncandewhurst
Merge pull request #239 from GFDRR/149-docs-guides-pages
e328870 
Add guidance, update schema descriptions, add taxonomy mappings, replace normative keywords
@duncandewhurst
rdls_schema.json: Remove redundant and add missing validation keywords
cede3f1
@duncandewhurst
Update changelog
b3f03c4
@duncandewhurst
Merge pull request #242 from GFDRR/validation-keywords
e9db6fc 
rdls_schema.json: Remove redundant and add missing validation keywords
@duncandewhurst
docs: Add link to RDLS Convertor in navigation menu
605215f
@duncandewhurst
Update changelog
c6ffc77
@duncandewhurst
Merge pull request #243 from GFDRR/add-convertor-link
271b024 
docs: Add link to RDLS Convertor in navigation menu
@duncandewhurst
rdls_schema.json: Allow multiple losses per dataset
02cd371
@duncandewhurst
rdls_schema: Make Losses.cost an object rather than array
69c9ad4
@duncandewhurst
rdls_schema: Fix codelist links
b23c3f9
@duncandewhurst
Update changelog
31cb597
@duncandewhurst
Update changelog
3a851e9
@duncandewhurst
Merge pull request #244 from GFDRR/fix-codelist-links
df74f92 
rdls_schema: Fix codelist links
@duncandewhurst
Merge branch 'dev' into loss-updates
ca88677
@duncandewhurst
rdls_schema: Resolve merge error
9b5458b
@duncandewhurst
Merge pull request #246 from GFDRR/loss-updates
a69c6a6 
Loss updates
@duncandewhurst
Update schema URLs and changelog date for 0.2.0 release
14c635e
@duncandewhurst
Merge pull request #248 from GFDRR/release-updates
6897209 
Update schema URLs and changelog date for 0.2 release
@duncandewhurst
Merge branch 'main' into dev
dbba156
@duncandewhurst duncandewhurst marked this pull request as ready for review September 7, 2023 22:27
@duncandewhurst
Copy link
Contributor Author

There were merge conflicts in https://github.com/GFDRR/rdl-standard/blob/main/SteeringCommittee/Minutes%20Steering%20Committee%20No.4%20-%209%20March%202023.md, I resolved them by keeping the changes from the main branch so as not to lose the updates from c142b52

@duncandewhurst
Copy link
Contributor Author

Tests are only failing because the 0__2__0 tag doesn't exist yet so once this PR is approved we can bypass branch protections and merge it.

@duncandewhurst duncandewhurst mentioned this pull request Sep 7, 2023
Closed
@duncandewhurst duncandewhurst merged commit 3f7db70 into main Sep 10, 2023
2 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matamadio matamadio matamadio approved these changes

@stufraser1 stufraser1 Awaiting requested review from stufraser1

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

Successfully merging this pull request may close these issues.
4 participants
@duncandewhurst @matamadio @odscjen @stufraser1