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

filter: Fix duplicates from force inclusions #986

Merged
merged 4 commits into from
Jun 30, 2022

Conversation

victorlin
Copy link
Member

@victorlin victorlin commented Jun 22, 2022

Description of proposed changes

This fixes double-writing of the same record in output files.

Related issue(s)

Testing

Tests added. See checks before and after fix.

@victorlin victorlin self-assigned this Jun 22, 2022
@victorlin victorlin marked this pull request as ready for review June 22, 2022 23:20
@victorlin victorlin requested a review from a team June 22, 2022 23:20
@codecov
Copy link

codecov bot commented Jun 22, 2022

Codecov Report

Merging #986 (d97611f) into master (f07cc5f) will decrease coverage by 0.02%.
The diff coverage is 100.00%.

❗ Current head d97611f differs from pull request most recent head 5def1a7. Consider uploading reports for the commit 5def1a7 to get more accurate results

@@            Coverage Diff             @@
##           master     #986      +/-   ##
==========================================
- Coverage   59.22%   59.20%   -0.03%     
==========================================
  Files          50       50              
  Lines        6259     6260       +1     
  Branches     1586     1586              
==========================================
- Hits         3707     3706       -1     
- Misses       2290     2292       +2     
  Partials      262      262              
Impacted Files Coverage Δ
augur/filter.py 95.74% <100.00%> (-0.37%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d431b72...5def1a7. Read the comment docs.

@victorlin victorlin changed the title Fix duplicates from force inclusions filter: Fix duplicates from force inclusions Jun 27, 2022
@victorlin victorlin force-pushed the filter/fix-force-inclusions branch from 6393aeb to 2187f78 Compare June 28, 2022 00:46
@victorlin victorlin requested a review from a team June 28, 2022 23:26
Copy link
Contributor

@joverlee521 joverlee521 left a comment

Choose a reason for hiding this comment

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

I haven't completely grasped what happens in augur filter but the test outputs and overall change makes sense to me. I only left a non-blocking question and comment.

@victorlin victorlin force-pushed the filter/fix-force-inclusions branch 2 times, most recently from f6836dc to d97611f Compare June 29, 2022 23:54
@victorlin victorlin requested a review from joverlee521 June 29, 2022 23:56
- strains_to_write -> force_included_strains_to_write
- distinct_sequences_to_include -> distinct_force_included_strains
This fixes double-writing of the same record.
@victorlin victorlin force-pushed the filter/fix-force-inclusions branch from d97611f to 5def1a7 Compare June 30, 2022 17:26
@victorlin victorlin merged commit 740518d into nextstrain:master Jun 30, 2022
@victorlin victorlin deleted the filter/fix-force-inclusions branch June 30, 2022 17:41
@victorlin victorlin added this to the Next release X.X.X milestone Jun 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

filter: --include/--include-where leads to duplicate entries in outputs
3 participants