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: Route all diversity calculations through diversity-lib #281

Merged
merged 57 commits into from
Aug 19, 2020

Conversation

ChrisKeefe
Copy link
Collaborator

@ChrisKeefe ChrisKeefe commented Jun 25, 2020

Closes #280.
See also qiime2/q2-diversity-lib#21

Closes #284.

Note: Renames "weighted_unifrac" to "weighted_unnormalized_unifrac", aligning q2-diversity with q2-diversity-lib and the underlying unifrac package. This is a breaking API change.

@ChrisKeefe
Copy link
Collaborator Author

This tests clean locally, but tests will continue to fail here until qiime2/q2-diversity-lib#21 is merged.

@ChrisKeefe ChrisKeefe marked this pull request as ready for review July 2, 2020 16:55
@ChrisKeefe

This comment has been minimized.

@ChrisKeefe ChrisKeefe marked this pull request as draft July 2, 2020 19:16
@ChrisKeefe

This comment has been minimized.

@ChrisKeefe ChrisKeefe marked this pull request as ready for review August 14, 2020 23:37
Copy link
Contributor

@thermokarst thermokarst left a comment

Choose a reason for hiding this comment

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

Looking good - some minor requests inline. So close!

q2_diversity/_alpha/_visualizer.py Outdated Show resolved Hide resolved
q2_diversity/_alpha/_visualizer.py Outdated Show resolved Hide resolved
q2_diversity/_alpha/_visualizer.py Outdated Show resolved Hide resolved
q2_diversity/_alpha/_visualizer.py Outdated Show resolved Hide resolved
q2_diversity/_beta/_pipeline.py Outdated Show resolved Hide resolved
q2_diversity/_beta/_pipeline.py Show resolved Hide resolved
q2_diversity/_beta/_pipeline.py Outdated Show resolved Hide resolved
q2_diversity/_alpha/_pipeline.py Outdated Show resolved Hide resolved
q2_diversity/_alpha/_visualizer.py Outdated Show resolved Hide resolved
q2_diversity/tests/test_alpha.py Outdated Show resolved Hide resolved
@ChrisKeefe ChrisKeefe requested a review from thermokarst August 18, 2020 18:18
@ChrisKeefe ChrisKeefe assigned thermokarst and unassigned ChrisKeefe Aug 19, 2020
Copy link
Collaborator Author

@ChrisKeefe ChrisKeefe left a comment

Choose a reason for hiding this comment

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

Solid. Thanks!

Copy link
Contributor

@thermokarst thermokarst left a comment

Choose a reason for hiding this comment

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

Woohoo! This is awesome, thanks @ChrisKeefe!

@thermokarst
Copy link
Contributor

Going to merge now - travis is failing because the staging env is missing the latest div-lib. I tested locally and all seems in order, no need to wait 2-3 hrs for the new env.

@thermokarst thermokarst merged commit dc43f1c into qiime2:master Aug 19, 2020
@ChrisKeefe ChrisKeefe deleted the pipeline2 branch August 26, 2020 22:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants