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

Mirror of Picard metrics documentation generation changes. #7749

Merged
merged 8 commits into from
Mar 21, 2023

Conversation

cmnbroad
Copy link
Collaborator

@cmnbroad cmnbroad commented Apr 4, 2022

Reflect the changes from broadinstitute/picard#1782 in the GATK doc build.

Note that this requires a new version of Picard that is not yet released. Also, I suppressed deprecation warnings caused by the use of obsolete Java 8 javadoc classes (FieldDoc) for now, since it causes the Java 11 build to fail.

A new metrics category shows up in the doc now, with all of the Picard and GATK metrics:

Screen Shot 2022-10-18 at 4 42 37 PM

@cmnbroad cmnbroad marked this pull request as draft April 4, 2022 21:07
@droazen droazen self-requested a review April 29, 2022 18:23
@droazen
Copy link
Contributor

droazen commented Apr 29, 2022

@cmnbroad Could you rebase this branch when you get a chance, and un-mark it as a draft?

@cmnbroad cmnbroad marked this pull request as ready for review May 2, 2022 14:05
@codecov
Copy link

codecov bot commented May 2, 2022

Codecov Report

Merging #7749 (b0c095c) into master (330c59a) will increase coverage by 0.283%.
The diff coverage is 13.333%.

❗ Current head b0c095c differs from pull request most recent head 4cffeec. Consider uploading reports for the commit 4cffeec to get more accurate results

Additional details and impacted files
@@               Coverage Diff               @@
##              master     #7749       +/-   ##
===============================================
+ Coverage     86.352%   86.635%   +0.283%     
+ Complexity     39055     38927      -128     
===============================================
  Files           2343      2334        -9     
  Lines         183577    182629      -948     
  Branches       20084     20052       -32     
===============================================
- Hits          158522    158220      -302     
+ Misses         17982     17372      -610     
+ Partials        7073      7037       -36     
Impacted Files Coverage Δ
...nstitute/hellbender/metrics/InsertSizeMetrics.java 100.000% <ø> (ø)
...titute/hellbender/metrics/QualityYieldMetrics.java 84.906% <ø> (ø)
...nder/metrics/analysis/AlleleFrequencyQCMetric.java 100.000% <ø> (ø)
...trics/analysis/BaseDistributionByCycleMetrics.java 100.000% <ø> (ø)
...r/tools/spark/pathseq/loggers/PSFilterMetrics.java 77.778% <ø> (ø)
...er/tools/spark/pathseq/loggers/PSScoreMetrics.java 100.000% <ø> (ø)
...lbender/utils/help/GATKHelpDocWorkUnitHandler.java 33.333% <13.333%> (-36.667%) ⬇️
...ender/tools/spark/sv/utils/GATKSVVCFConstants.java 66.667% <0.000%> (-29.487%) ⬇️
...ute/hellbender/tools/walkers/fasta/ShiftFasta.java 58.586% <0.000%> (-17.172%) ⬇️
...nder/utils/runtime/ProcessControllerAckResult.java 86.364% <0.000%> (-8.373%) ⬇️
... and 235 more

Copy link
Member

@lbergelson lbergelson left a comment

Choose a reason for hiding this comment

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

@cmnbroad Looks good to me. A few minor questions.

@@ -46,6 +65,7 @@ public GATKHelpDocWorkUnitHandler(final HelpDoclet doclet) {
* @param currentWorkUnit the work unit for the feature being documented
*/
@Override
@SuppressWarnings({"deprecation","removal"})
Copy link
Member

Choose a reason for hiding this comment

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

Is this something that's going to need to be updated as soon as we go to 17?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, since I've now rebased this branch on the Java 17 code, I've removed these.

currentWorkUnit.setProperty(WORK_UNIT_SUMMARY_KEY, currentWorkUnit.getSummary());
final List<Map<String, String>> workUnitMetricsList = new ArrayList<>();
currentWorkUnit.setProperty(METRICS_MAP_ENTRY_KEY, workUnitMetricsList);
final com.sun.javadoc.FieldDoc[] fieldDocs = currentWorkUnit.getClassDoc().fields(false);
Copy link
Member

Choose a reason for hiding this comment

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

Why fully qualify this instead of importing it?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Not sure why this was like this, but this code has now been replaced with the Java 17 version since I rebase on that, so its gone anyway.

@@ -0,0 +1,69 @@
<?php
Copy link
Member

Choose a reason for hiding this comment

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

This is just copied from picard I assume?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Its copied from the Picard one that I made up when I added the metrics ;-). I removed the group in from it though, since thats not usually included in the detail pages and for some reason I left it in the Picard one (which is not really used anyway).


include '../../../common/include/common.php';
include_once '../../config.php';
$module = modules::GATK;
Copy link
Member

Choose a reason for hiding this comment

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

With some minor changes it looks like.

@cmnbroad cmnbroad force-pushed the cn_metrics_doc branch 2 times, most recently from 4cffeec to 402fae2 Compare March 13, 2023 19:14
@cmnbroad cmnbroad merged commit b370c06 into master Mar 21, 2023
@cmnbroad cmnbroad deleted the cn_metrics_doc branch March 21, 2023 19:54
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