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

Add V3.0.0 hotfixes #79

Merged
merged 4 commits into from
Jun 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

* Breaking change: introduction of new `sample` output type id schema specification in `tasks.json`. The main breaking change is the removal of the `output_type_id` property in `sample`. Instead, the collection of samples is defined through a new `output_type_id_params` object (#70).
* Breaking change: The `repository_url` and `repository_host` properties in `admin.json` have been deprecated in favour of a sigle `repository` object with separate `host`, `owner` and `name` properties (#67).
* Breaking change: The optional `hub_models` property in `admin.json` has been removed as it's schema could create conflicts with the `model_abbr` and `team_abbr` schema specification in the hub administered `model-metadata-schema.json (#77).
* Additional properties are now allowed at the round item property level (#74).

# v2.0.1

Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,4 @@ After making a new release to the schema repository, ensure `hubDocs` are also a
- Merging into `main` should be accompanied by creating an associated formal release in the repository.
- Update `HubDocs` site with any additional relevant information associated with the new schema release.
- Create a new release on `hubDocs` using the same version number but without the `v` (e.g. `v0.0.1` would be released as `0.0.1` on `hubDocs`).



- Update the [`hubTemplate`](https://github.com/Infectious-Disease-Modeling-Hubs/hubTemplate) config to reflect the most up to date schema. Create a new release using the same version#
33 changes: 2 additions & 31 deletions v3.0.0/admin-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,35 +61,6 @@
"type": "integer",
"examples": [44]
},
"hub_models": {
"description": "Array of ensemble and baseline models produced by the hub",
"type": "array",
"items": {
"type": "object",
"properties": {
"team_abbr": {
"description": "Abbreviated team name of the hub",
"type": "string",
"pattern": "^[a-zA-Z0-9_+]+$",
"maxLength": 16
},
"model_abbr": {
"description": "Abbreviated name of the model",
"type": "string",
"pattern": "^[a-zA-Z0-9_+]+$",
"maxLength": 16
},
"model_type": {
"description": "The type of model: baseline or ensemble",
"type": "string",
"enum": [
"baseline",
"ensemble"
]
}
}
}
},
"citation": {
"description": "One or more citations for the hub.",
"type": "string",
Expand Down Expand Up @@ -641,8 +612,8 @@
]
},
"model_output_dir": {
"description": "Relative path, with respect to the root of hub, to directory containing model output data. If property not supplied, the default path `model_output/` assumed",
"default": "model_output",
"description": "Relative path, with respect to the root of hub, to directory containing model output data. If property not supplied, the default path `model-output` assumed",
"default": "model-output",
"examples": [
"forecasts",
"data/model_output"
Expand Down
2 changes: 1 addition & 1 deletion v3.0.0/tasks-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -1437,7 +1437,7 @@
"model_tasks",
"submissions_due"
],
"additionalProperties": false
"additionalProperties": true
}
}
},
Expand Down
Loading