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

Poseidon v2.5 #152

Merged
merged 31 commits into from
Jan 28, 2022
Merged

Poseidon v2.5 #152

merged 31 commits into from
Jan 28, 2022

Conversation

nevrome
Copy link
Member

@nevrome nevrome commented Jan 7, 2022

Here I collect the necessary changes for Poseidon v2.5. This is work in progress.

See poseidon-framework/poseidon-schema#42 for the discussion surrounding this upcoming release.

The changes so far only concern the .janno file.

@codecov-commenter
Copy link

codecov-commenter commented Jan 12, 2022

Codecov Report

❗ No coverage uploaded for pull request base (master@baf4012). Click here to learn what that means.
The diff coverage is 70.62%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master     #152   +/-   ##
=========================================
  Coverage          ?   70.24%           
=========================================
  Files             ?       18           
  Lines             ?     2040           
  Branches          ?      141           
=========================================
  Hits              ?     1433           
  Misses            ?      466           
  Partials          ?      141           
Impacted Files Coverage Δ
src/Poseidon/Utils.hs 8.33% <ø> (ø)
src/Poseidon/CLI/List.hs 45.52% <11.76%> (ø)
src/Poseidon/CLI/Summarise.hs 66.66% <33.33%> (ø)
src/Poseidon/Janno.hs 73.25% <69.80%> (ø)
src/Poseidon/CLI/Forge.hs 78.61% <100.00%> (ø)
src/Poseidon/CLI/Survey.hs 90.32% <100.00%> (ø)
src/Poseidon/CLI/Update.hs 71.57% <100.00%> (ø)
src/Poseidon/Package.hs 79.06% <100.00%> (ø)
src/Poseidon/PoseidonVersion.hs 80.00% <100.00%> (ø)

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 baf4012...e728b07. Read the comment docs.

…ivated that by default for the update subcommand
Copy link
Member

@stschiff stschiff left a comment

Choose a reason for hiding this comment

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

Oooookay, many files, but I've looked at all the diffs. Looks good! I've left some comments. Neither of them are severe, but perhaps we can briefly discuss whether we'd like to adjust the field order in the Janno data structure (see several comments about that).

, jNrLibraries :: Maybe Int
, jDataType :: Maybe (JannoList JannoDataType)
, jCaptureType :: Maybe (JannoList JannoCaptureType)
, jGenotypePloidy :: Maybe JannoGenotypePloidy
, jGroupName :: JannoStringList
Copy link
Member

Choose a reason for hiding this comment

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

So I guess we could move these up. I think it wouldn't cause problems, since we don't match this gigantic data type by contractor anyway... right?

Copy link
Member Author

Choose a reason for hiding this comment

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

Move up?

Copy link
Member

Choose a reason for hiding this comment

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

Hmm, I guess I meant sex and group name

@nevrome
Copy link
Member Author

nevrome commented Jan 28, 2022

I opened issues for all contested points. But as I really want to move forward with this, I will merge now. I take the full responsibility.

@nevrome nevrome marked this pull request as ready for review January 28, 2022 16:10
@nevrome nevrome merged commit e032ca6 into master Jan 28, 2022
@nevrome nevrome deleted the poseidon25 branch January 28, 2022 16:10
@nevrome nevrome restored the poseidon25 branch January 28, 2022 16:11
@nevrome nevrome deleted the poseidon25 branch January 28, 2022 16:14
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.

3 participants