Skip to content

Write job-specific subsampling config files - #91

Merged
victorlin merged 0 commit into
victorlin/augur-subsample-resolves-filepathsfrom
victorlin/dump-subsample-configs
Feb 4, 2026
Merged

Write job-specific subsampling config files#91
victorlin merged 0 commit into
victorlin/augur-subsample-resolves-filepathsfrom
victorlin/dump-subsample-configs

Conversation

@victorlin

@victorlin victorlin commented Oct 28, 2025

Copy link
Copy Markdown
Member

Note

These changes are now part of #90 (efe1483...c4ecba6) – see #91 (comment)

Description of proposed changes

This prevents unrelated config changes from triggering a re-run of augur subsample.

Related issue(s)

Checklist

  • Checks pass
  • Update changelog

@victorlin victorlin self-assigned this Oct 28, 2025
@victorlin
victorlin force-pushed the victorlin/dump-subsample-configs branch from 60da2c3 to 5ea23e9 Compare October 29, 2025 22:08
@victorlin
victorlin force-pushed the victorlin/augur-subsample-resolves-filepaths branch from e751070 to 8c07397 Compare October 29, 2025 22:17
@victorlin
victorlin force-pushed the victorlin/dump-subsample-configs branch from 5ea23e9 to be0930b Compare October 29, 2025 22:17
@victorlin
victorlin marked this pull request as ready for review October 29, 2025 23:00
@victorlin
victorlin force-pushed the victorlin/dump-subsample-configs branch from be0930b to e62cea2 Compare January 27, 2026 19:58
@victorlin
victorlin force-pushed the victorlin/augur-subsample-resolves-filepaths branch 2 times, most recently from 2e547d7 to e3a2110 Compare January 27, 2026 20:08
@victorlin
victorlin force-pushed the victorlin/dump-subsample-configs branch from e62cea2 to 6015973 Compare January 27, 2026 20:08

@joverlee521 joverlee521 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Overall changes LGTM, small comment about invalid build errors.

Comment thread phylogenetic/rules/config.smk Outdated
Comment thread CHANGELOG.md
@victorlin
victorlin force-pushed the victorlin/augur-subsample-resolves-filepaths branch from e3a2110 to de3e323 Compare January 29, 2026 23:58
@victorlin
victorlin force-pushed the victorlin/dump-subsample-configs branch from 6015973 to 75a08a2 Compare January 29, 2026 23:58
Comment thread phylogenetic/rules/config.smk Outdated
Comment on lines +29 to +38
print(dedent(f"""\
ERROR: The following names in 'builds' are not valid:

{indented_list(invalid_builds, " ")}

Valid builds are:

{indented_list(VALID_BUILDS, " ")}
"""), file=sys.stderr)
exit(1)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

non-blocking nit

Should we start standardizing the use of InvalidConfigError that is included in the vendored config.smk?

Suggested change
print(dedent(f"""\
ERROR: The following names in 'builds' are not valid:
{indented_list(invalid_builds, " ")}
Valid builds are:
{indented_list(VALID_BUILDS, " ")}
"""), file=sys.stderr)
exit(1)
raise InvalidConfigError(dedent(f"""\
The following names in 'builds' are not valid:
{indented_list(invalid_builds, " ")}
Valid builds are:
{indented_list(VALID_BUILDS, " ")}
"""))

Changes output to

$ nextstrain build phylogenetic/ --config builds='["foo"]'
InvalidConfigError in file "/nextstrain/build/phylogenetic/rules/config.smk", line 30:
The following names in 'builds' are not valid:

    foo

Valid builds are:

    genome
    N450

  File "/nextstrain/build/phylogenetic/rules/config.smk", line 54, in <module>
  File "/nextstrain/build/phylogenetic/rules/config.smk", line 15, in main
  File "/nextstrain/build/phylogenetic/rules/config.smk", line 30, in validate_config

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

+1 for standardizing, but I prefer the simpler error without stack trace at the bottom. How about catching InvalidConfigError from main()? I've done this in force-push.

@victorlin
victorlin force-pushed the victorlin/dump-subsample-configs branch from 75a08a2 to 7a5c779 Compare January 30, 2026 22:50
@victorlin victorlin closed this Feb 4, 2026
@victorlin
victorlin force-pushed the victorlin/dump-subsample-configs branch from 7a5c779 to c4ecba6 Compare February 4, 2026 18:45
@victorlin
victorlin merged commit c4ecba6 into victorlin/augur-subsample-resolves-filepaths Feb 4, 2026
@victorlin
victorlin force-pushed the victorlin/augur-subsample-resolves-filepaths branch from de3e323 to a062d7d Compare February 4, 2026 18:45
@victorlin
victorlin deleted the victorlin/dump-subsample-configs branch February 4, 2026 18:45
@victorlin

Copy link
Copy Markdown
Member Author

GitHub did something weird here. I wanted to swap the order of #90 and #91 since it makes more sense, so I rebased locally and force-pushed. It looks like GitHub detected this as #91 being "merged" into #90, so I'll just roll with it... it aligns more with nextstrain/WNV#116 anyways.

@victorlin victorlin mentioned this pull request Feb 4, 2026
5 tasks
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.

3 participants