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

ENH: allow fetching 16S DBs by build-kraken-db #134

Merged

Conversation

DorielaGrabocka
Copy link
Contributor

@DorielaGrabocka DorielaGrabocka commented Feb 14, 2024

Added support for 4 16S databases.

Closes #92.

@DorielaGrabocka DorielaGrabocka changed the title Issue 92 16sdb fetching ENH: Issue 92 16sdb fetching Feb 14, 2024
Copy link
Contributor

@misialq misialq left a comment

Choose a reason for hiding this comment

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

Hey @DorielaGrabocka, I tried it and all seems to work - see some suggestions below though 😄

.gitignore Outdated
**/*.ipynb

# Ignore parsl dir
# Byte-compiled / optimized / DLL files
Copy link
Contributor

Choose a reason for hiding this comment

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

The contents of this file seems the same so I'm guessing the line separators must have changed... Could you please revert that?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is a bit weird, locally I cannot see any changes. It does not detect anything. maybe after my commit it will be ok?

Copy link
Contributor

Choose a reason for hiding this comment

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

Hey @DorielaGrabocka, please just revert that file to what it was before - you can do so e.g. by checking out that single file from the main branch and then re-commiting.

q2_moshpit/kraken2/database.py Outdated Show resolved Hide resolved
q2_moshpit/kraken2/tests/test_database.py Outdated Show resolved Hide resolved
@misialq misialq changed the title ENH: Issue 92 16sdb fetching ENH: allow fetching 16S DBs by build-kraken-db Mar 14, 2024
@misialq misialq marked this pull request as ready for review March 14, 2024 11:04
@misialq misialq linked an issue Mar 14, 2024 that may be closed by this pull request
Copy link

codecov bot commented Mar 15, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.77%. Comparing base (9c5e435) to head (9678f71).
Report is 9 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #134      +/-   ##
==========================================
+ Coverage   97.74%   97.77%   +0.02%     
==========================================
  Files          45       53       +8     
  Lines        2799     3141     +342     
==========================================
+ Hits         2736     3071     +335     
- Misses         63       70       +7     

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

@DorielaGrabocka DorielaGrabocka requested a review from misialq March 15, 2024 16:07
Copy link
Contributor

@misialq misialq left a comment

Choose a reason for hiding this comment

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

Hey @DorielaGrabocka, that looks good! I gave it a final try and all worked as expected. Please just see one small comment about that gitignore file. Otherwise, feel free to merge afterwards :)

.gitignore Outdated
**/*.ipynb

# Ignore parsl dir
# Byte-compiled / optimized / DLL files
Copy link
Contributor

Choose a reason for hiding this comment

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

Hey @DorielaGrabocka, please just revert that file to what it was before - you can do so e.g. by checking out that single file from the main branch and then re-commiting.

Comment on lines +353 to +375
@parameterized.expand([
("kraken/tmp/16S_Greengenes13.5.tgz",
"16S_Greengenes13.5.tgz",
"16S_Greengenes13.5",
"/tmp/16S_Greengenes13.5/",
"greengenes"),
("kraken/tmp/16S_RDP11.5_20200326.tgz",
"16S_RDP11.5_20200326.tgz",
"16S_RDP_k2db",
"/tmp/16S_RDP_k2db/",
"rdp"),
("kraken/tmp/16S_Silva132_20200326.tgz",
"16S_Silva132_20200326.tgz",
"16S_SILVA132_k2db",
"/tmp/16S_SILVA132_k2db/",
"silva132"),
("kraken/tmp/16S_Silva138_20200326.tgz",
"16S_Silva138_20200326.tgz",
"16S_SILVA138_k2db",
"/tmp/16S_SILVA138_k2db/",
"silva138"
),
])
Copy link
Contributor

Choose a reason for hiding this comment

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

Woooow, that's what I was talking about! 🚀

@DorielaGrabocka DorielaGrabocka merged commit a081b35 into bokulich-lab:main Mar 28, 2024
9 checks passed
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.

ENH: enable fetching of kraken2's 16S databases
2 participants