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

Methods doc categories #1146

Merged
merged 1 commit into from
Nov 28, 2023
Merged

Methods doc categories #1146

merged 1 commit into from
Nov 28, 2023

Conversation

benjeffery
Copy link
Collaborator

@benjeffery benjeffery commented Nov 27, 2023

I've had a go at subsections in the method list as it was getting unwieldy.

Copy link
Collaborator

@jeromekelleher jeromekelleher left a comment

Choose a reason for hiding this comment

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

LGTM, minor reshuffle suggested

docs/api.rst Outdated Show resolved Hide resolved
docs/api.rst Outdated Show resolved Hide resolved
docs/api.rst Outdated Show resolved Hide resolved
docs/api.rst Outdated Show resolved Hide resolved
docs/api.rst Outdated Show resolved Hide resolved
Copy link
Contributor

mergify bot commented Nov 27, 2023

This PR has conflicts, @benjeffery please rebase and push updated version 🙏

@mergify mergify bot added the conflict PR conflict label Nov 27, 2023
@benjeffery benjeffery force-pushed the methods-org branch 2 times, most recently from 409c94a to 383bcef Compare November 27, 2023 12:49
@mergify mergify bot removed the conflict PR conflict label Nov 27, 2023
@benjeffery
Copy link
Collaborator Author

Good suggestions - fixed and rebased.

@benjeffery benjeffery marked this pull request as ready for review November 27, 2023 12:50
Copy link
Collaborator

@jeromekelleher jeromekelleher left a comment

Choose a reason for hiding this comment

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

LGTM

@jeromekelleher
Copy link
Collaborator

Looks great - @timothymillar, @tomwhite what do you think of this sectioning?

@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (090b133) 100.00% compared to head (d8cf4fa) 100.00%.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@            Coverage Diff            @@
##              main     #1146   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files           50        50           
  Lines         5102      5102           
=========================================
  Hits          5102      5102           

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

@tomwhite
Copy link
Collaborator

LGTM

docs/api.rst Outdated
@@ -95,34 +98,69 @@ Methods
count_cohort_alleles
count_variant_alleles
count_variant_genotypes
individual_heterozygosity
observed_heterozygosity
Copy link
Collaborator

@timothymillar timothymillar Nov 27, 2023

Choose a reason for hiding this comment

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

observed_heterozygosity should really be in the pop-gen section.

Choose a reason for hiding this comment

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

Probably also individual heterozygosity?

Copy link
Collaborator

Choose a reason for hiding this comment

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

It really depends how widely you want to cast the net. Currently, the pop-gen section only includes methods that generalize over 'cohorts' (and 'windows'). individual_heterozygosity is only for individuals and, in the diploid case, it just marks heterozygous and homozygous calls as 1 or 0 respectively.

@timothymillar
Copy link
Collaborator

LGTM aside from the above suggestion. The "Pedigree and Relatedness" section fells a little awkward, but I can't think of a better suggestion. I would almost suggest renaming it to just "Relatedness" or "Kinship and Relatedness". But it's not clear where pedigree_contribution would go.

@gregorgorjanc
Copy link

LGTM aside from the above suggestion. The "Pedigree and Relatedness" section fells a little awkward, but I can't think of a better suggestion. I would almost suggest renaming it to just "Relatedness" or "Kinship and Relatedness". But it's not clear where pedigree_contribution would go.

Just “Relatedness” should cover it well - there are many facets behind that word

@jeromekelleher
Copy link
Collaborator

OK, let's move heterozygosity to popgen for now, and rename the "pedigree.. " section to "Relatedness" and we're good to go I think.

@benjeffery
Copy link
Collaborator Author

Suggestions applied!

@jeromekelleher jeromekelleher added the auto-merge Auto merge label for mergify test flight label Nov 28, 2023
@mergify mergify bot merged commit 298fbbc into sgkit-dev:main Nov 28, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-merge Auto merge label for mergify test flight
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants