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

fix(tree): check for all synonyms of conflicting default args #1547

Merged
merged 5 commits into from
Nov 10, 2024

Conversation

corneliusroemer
Copy link
Member

@corneliusroemer corneliusroemer commented Jul 17, 2024

  • fix(tree): check for all synonyms of conflicting args
  • chore(tests): more robust test by adding -redo to iqtree args

Description of proposed changes

See commit messages for details.

Related issue(s)

Inspired by iqtree/iqtree2#273

Checklist

  • Automated checks pass
  • Check if you need to add a changelog message
  • Check if you need to add tests
  • Check if you need to update docs

Copy link

codecov bot commented Jul 17, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 72.30%. Comparing base (8731851) to head (c60a97e).
Report is 3 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1547      +/-   ##
==========================================
+ Coverage   72.27%   72.30%   +0.03%     
==========================================
  Files          79       79              
  Lines        8273     8273              
  Branches     1691     1691              
==========================================
+ Hits         5979     5982       +3     
+ Misses       2009     2006       -3     
  Partials      285      285              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@corneliusroemer
Copy link
Member Author

Would be nice if someone could look at this, e.g. @huddlej @victorlin @tsibley @genehack @joverlee521 @jameshadfield

augur/tree.py Show resolved Hide resolved
tests/functional/tree.t Outdated Show resolved Hide resolved
Copy link
Contributor

@huddlej huddlej left a comment

Choose a reason for hiding this comment

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

Thanks, @corneliusroemer! Nice to have the check for modern synonyms and also clearer to use those throughout the docs and tests (-czb has always confused me, for example, and --polytomy is much clearer).

tests/functional/tree.t Outdated Show resolved Hide resolved
IQtree2 has multiple synonyms for default args

We were only checking for one of the synonyms. This PR fixes that.

It also uses the currently preferred name for all IQtree options, where "preferred" is defined as the name shown in `iqtree2 -h`

List of changes:
`-nt` -> `-T`
`--ntmax` -> `--threads-max`
`-czb` -> `--polytomy`

List of synonyms:
`-ntmax`==`--threads-max`
`-s`==`--aln`==`--msa`
`-m`==`--model`
^ Conflicts:
^	CHANGES.md
@corneliusroemer corneliusroemer merged commit 00b9774 into master Nov 10, 2024
29 checks passed
@corneliusroemer corneliusroemer deleted the iqtree-args branch November 10, 2024 23:36
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.

4 participants