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

ingest: use new augur curate commands #263

Merged
merged 4 commits into from
Jul 16, 2024
Merged

ingest: use new augur curate commands #263

merged 4 commits into from
Jul 16, 2024

Conversation

joverlee521
Copy link
Contributor

@joverlee521 joverlee521 commented Jul 15, 2024

Description of proposed changes

Updates the curate rule to use the new augur curate commands.
Updates ingest/vendored to pull in latest changes including nextstrain/ingest#45.

Includes additional change to remove reverse column. See #209 for more context.

Related issue(s)

Mirroring changes in nextstrain/pathogen-repo-guide#53
Resolves #262
Resolves #209

Checklist

  • Checks pass
  • Confirmed only diff is the added period to <first author> et al. and the removal of the reverse column.

Vendored scripts for the curate rule have been ported to `augur curate`
and are available starting from Augur 25.0.0.¹

Includes minor file path renaming to match the pathogen-repo-guide.

¹ <https://github.com/nextstrain/augur/releases/tag/25.0.0>
Previously this was filled in with empty strings by the custom
`ndjson-to-tsv-and-fasta` script. We've replaced vendored scripts
with `augur curate` commands, so we no longer need this script, but now
the workflow errors on this unexpected column.

As discussed in #209, this
column is not used anyways so just remove it.
subrepo:
  subdir:   "ingest/vendored"
  merged:   "258ab8c"
upstream:
  origin:   "https://github.com/nextstrain/ingest"
  branch:   "main"
  commit:   "258ab8c"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"
@joverlee521 joverlee521 requested a review from a team July 15, 2024 23:58
@joverlee521 joverlee521 merged commit 1889dff into master Jul 16, 2024
5 checks passed
@joverlee521 joverlee521 deleted the update-curate branch July 16, 2024 16:43
Copy link
Contributor

@j23414 j23414 left a comment

Choose a reason for hiding this comment

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

Looks good from a dry-run nextstrain build ingest -np

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.

ingest: use new augur curate commands Ingest: remove reverse column from metadata TSV
3 participants