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

Feature/wdl launch and convert fix #1611

Merged
merged 9 commits into from
Jul 17, 2018

Conversation

denis-yuen
Copy link
Member

@denis-yuen denis-yuen commented Jul 16, 2018

Working on #1549 and #1474
Allow Cromwell to run from the working directory of the downloaded descriptors as opposed to the current working directory (as opposed to re-writing imports to match working directory).

@denis-yuen denis-yuen self-assigned this Jul 16, 2018
@codecov
Copy link

codecov bot commented Jul 16, 2018

Codecov Report

Merging #1611 into develop will decrease coverage by 3.9%.
The diff coverage is 75%.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #1611      +/-   ##
=============================================
- Coverage      68.26%   64.36%   -3.91%     
  Complexity        11       11              
=============================================
  Files            167      167              
  Lines          12201    12925     +724     
  Branches        1642     1844     +202     
=============================================
- Hits            8329     8319      -10     
- Misses          3155     3886     +731     
- Partials         717      720       +3
Flag Coverage Δ Complexity Δ
#integrationtests 11.16% <31.81%> (-0.64%) 11 <0> (ø)
#otherintegrationtests 35.04% <56.81%> (-0.04%) 0 <0> (ø)
#toilintegrationtests 0% <0%> (ø) 0 <0> (ø) ⬇️
#toolintegrationtests 38.8% <52.27%> (-2.4%) 0 <0> (ø)
#unittests 11.64% <2.27%> (-0.47%) 6 <0> (ø)
#workflowintegrationtests 34.88% <47.72%> (-2.42%) 0 <0> (ø)
Impacted Files Coverage Δ Complexity Δ
...on/src/main/scala/io/dockstore/common/Bridge.scala 0% <0%> (ø) 0 <0> (ø) ⬇️
...n/src/main/java/io/dockstore/common/Utilities.java 80.39% <100%> (+1.66%) 0 <0> (ø) ⬇️
...ckstore/client/cli/nested/AbstractEntryClient.java 80.44% <100%> (+0.05%) 0 <0> (ø) ⬇️
...in/java/io/github/collaboratory/wdl/WDLClient.java 79.06% <100%> (+2.5%) 0 <0> (ø) ⬇️
.../io/dockstore/webservice/languages/WDLHandler.java 81.34% <66.66%> (+0.74%) 0 <0> (ø) ⬇️
...java/io/github/collaboratory/wdl/BridgeHelper.java 58.82% <71.42%> (-4.82%) 0 <0> (ø)
...service/resources/AbstractHostedEntryResource.java 48.1% <0%> (-38.14%) 0% <0%> (ø)
...e/webservice/permissions/PermissionsInterface.java 52.94% <0%> (-37.06%) 0% <0%> (ø)
...e/webservice/resources/HostedWorkflowResource.java 47.88% <0%> (-36.21%) 0% <0%> (ø)
...re/webservice/helpers/SourceCodeRepoInterface.java 53.58% <0%> (-29.46%) 0% <0%> (ø)
... and 8 more

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 d2a7de4...7818143. Read the comment docs.

@coveralls
Copy link

coveralls commented Jul 16, 2018

Coverage Status

Coverage decreased (-5.7%) to 55.929% when pulling 7818143 on feature/wdl-launch-and-convert-fix into d2a7de4 on develop.

@denis-yuen denis-yuen requested review from garyluu and agduncan94 July 16, 2018 19:40
import org.junit.rules.ExpectedException;

/**
* Basic confidential integration tests, focusing on publishing/unpublishing both automatic and manually added tools
Copy link
Contributor

Choose a reason for hiding this comment

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

reword

out("");
out("Optional parameters:");
out(" --json <json file> Parameters to the entry in the dockstore, one map for one run, an array of maps for multiple runs");
out(" --yaml <yaml file> Parameters to the entry in the dockstore, one map for one run, an array of maps for multiple runs (Only for CWL)");
out(" --tsv <tsv file> One row corresponds to parameters for one run in the dockstore (Only for CWL)");
out(" --descriptor <descriptor type> Descriptor type used to launch workflow. Defaults to " + CWL_STRING);
out(" --local-entry Allows you to specify a full path to a local descriptor for --entry instead of an entry path");
if (!(this instanceof CheckerClient)) {
out(" --local-entry Allows you to specify a full path to a local descriptor for --entry instead of an entry path");
Copy link
Contributor

Choose a reason for hiding this comment

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

when this is not a checker client, does it display --local-entry as a possible required parameter (OR) and also an optional parameter?

Copy link
Member Author

@denis-yuen denis-yuen Jul 16, 2018

Choose a reason for hiding this comment

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

This just maintains the current behavior which is to display it in both places.
It does seem a bit odd, will create follow-up item to clean up these descriptions
#1612

@denis-yuen denis-yuen merged commit b9dc47f into develop Jul 17, 2018
@denis-yuen denis-yuen deleted the feature/wdl-launch-and-convert-fix branch July 17, 2018 15:40
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.

4 participants