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

Remove export v1 #1754

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
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
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

* Updated default latitudes and longitudes for geography traits that includes location name changes. See the pull request for more details. [#1744][] (@joverlee521)
* curate apply-geolocation-rules: Augur's standard geolocation rules are used by default and rules provided via `--geolocation-rules` are considered custom rules that have precedence over the default rules. The `--no-default-rules` flag can be used to ignore the default rules. See the pull request for more details. [#1745][] (@joverlee521)
* export v1 has been removed (deprecated in v22.2.0, July 2023). `augur export v2` was introduced in Augur version 6.0.0. Migrate by following the [official guide](https://docs.nextstrain.org/projects/augur/page/releases/migrating-v5-v6.html).

### Features

Expand Down
3 changes: 1 addition & 2 deletions DEPRECATED.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ We recognize the existing usage of this function, so it has been moved to

## `augur export v1`

*Deprecated in version 22.2.0 (July 2023). Planned for [removal](https://github.com/nextstrain/augur/issues/1266)
January 2024 or after.*
*Deprecated in version 22.2.0 (July 2023). Removed in version TKTK (TKTK 2025)*
Copy link
Member Author

Choose a reason for hiding this comment

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

[todo]


`augur export v2` was introduced in Augur version 6.0.0. Migrate by following
the [official guide](https://docs.nextstrain.org/projects/augur/page/releases/migrating-v5-v6.html).
Expand Down
2 changes: 1 addition & 1 deletion augur/data/schema-auspice-config-v2.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"$id": "https://nextstrain.org/schemas/auspice/config/v2",
"type": "object",
"title": "Auspice config file to be supplied to `augur export v2`",
"$comment": "This schema includes deprecated-but-handled-by-augur-export-v1 properties, but their schema definitions are somewhat incomplete",
"$comment": "This schema includes properties which were used in `augur export v1` as these are still handled by `augur export v2`. The should all be considered deprecated.",
"additionalProperties": false,
"required": [],
"properties" : {
Expand Down
42 changes: 15 additions & 27 deletions augur/data/schema-export-root-sequence.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,20 @@
"$schema": "http://json-schema.org/draft-06/schema#",
"$id": "https://nextstrain.org/schemas/dataset/root-sequence",
"title": "Nextstrain root-sequence sidecar for datasets",
"description": "Typically produced by Augur and consumed by Auspice. Applicable to the `--root-sequence` output of `augur export v2` as well as the `--output-sequence` option of `augur export v1`.",
"oneOf": [
{
"$comment": "This is sort of weird, but `augur export v1` can explicitly produce an empty object.",
"description": "An empty object",
"type": "object",
"properties": {},
"additionalProperties": false
},
{
"description": "An object containing at least a \"nuc\" key and optionally additional keys for genome annotations (e.g. genes)",
"type": "object",
"required": ["nuc"],
"properties": {
"nuc": {
"description": "Nucleotide sequence of whole genome (from the output of `augur ancestral`)",
"type": "string"
}
},
"patternProperties": {
"^[a-zA-Z0-9*_-]+$": {
"$comment": "This pattern is the same pattern used in the corresponding parts of schema-export-v2.json.",
"description": "Amino acid sequence of genome annotation (e.g. gene) identified by this key (from the output of `augur translate`)",
"type": "string"
}
}
"description": "Typically produced by Augur and consumed by Auspice. Applicable to the `--root-sequence` output of `augur export v2`. An object containing at least a \"nuc\" key and optionally additional keys for genome annotations (CDSs / genes)",
"type": "object",
"required": ["nuc"],
"properties": {
"nuc": {
"description": "Nucleotide sequence of whole genome (from the output of `augur ancestral`)",
"type": "string"
}
]
},
"patternProperties": {
"^[a-zA-Z0-9*_-]+$": {
"$comment": "This pattern is the same pattern used in the corresponding parts of schema-export-v2.json.",
"description": "Amino acid sequence of genome annotation (e.g. gene) identified by this key (from the output of `augur translate`)",
"type": "string"
}
}
}
251 changes: 0 additions & 251 deletions augur/data/schema-export-v1-meta.json
Copy link
Contributor

Choose a reason for hiding this comment

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

FYI, we still link to the v1 schemas in nextstrain.org and auspice (GH search). We should update those links to point to a specific tag instead of the default/master branch.

This file was deleted.

Loading
Loading