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

fix nested CWL enum in array and single-value combined + CWL Workflow step output chaining with glob #566

Merged
merged 12 commits into from
Sep 25, 2023

Conversation

fmigneault
Copy link
Collaborator

@fmigneault fmigneault commented Sep 22, 2023

Changes

  • Remove attribute WpsProcessInterface.stage_output_id_nested and enforce the behavior of nesting output by ID
    under corresponding directories for all remote Process execution when resolving CWL Workflow steps. This
    ensures a more consistent file and directory resolution between steps of different nature (CWL, WPS, OGC based)
    using multiple combinations of glob patterns and expected media-types.

Fixes

References

@github-actions github-actions bot added ci/doc Issue related to documentation of the package ci/operations Related to CI operations (actions, execution, install, builds, etc.) ci/tests Tests of the package and features feature/CWL Issue related to CWL support feature/oas Issues related to OpenAPI specifications. feature/providers Issue related to providers convertion to WPS-REST processes. process/workflow Related to a Workflow process. process/wps1 Issue related to WPS 1.x processes support process/wps3 Issue related to WPS 3.x (REST-JSON) processes support labels Sep 22, 2023
@fmigneault
Copy link
Collaborator Author

@perronld
Assuming bird-house/finch#302 is fixed (which I commented out duplicates in my local XML WPS definition to test), combined with this PR, your ensemble_grid_point_wetdays process should work 🤞

@codecov
Copy link

codecov bot commented Sep 23, 2023

Codecov Report

Merging #566 (5f8962c) into master (f0abcd1) will increase coverage by 0.07%.
The diff coverage is 91.11%.

@@            Coverage Diff             @@
##           master     #566      +/-   ##
==========================================
+ Coverage   84.47%   84.55%   +0.07%     
==========================================
  Files          79       79              
  Lines       17732    17788      +56     
  Branches     2688     2708      +20     
==========================================
+ Hits        14979    15040      +61     
+ Misses       2024     2020       -4     
+ Partials      729      728       -1     
Files Changed Coverage Δ
weaver/processes/wps1_process.py 75.20% <ø> (+2.25%) ⬆️
weaver/processes/wps_workflow.py 87.36% <83.33%> (-1.14%) ⬇️
weaver/processes/wps_package.py 84.15% <88.88%> (+0.09%) ⬆️
weaver/processes/convert.py 84.60% <93.02%> (+0.40%) ⬆️
weaver/processes/wps_process_base.py 85.20% <100.00%> (+0.68%) ⬆️
weaver/wps_restapi/swagger_definitions.py 99.82% <100.00%> (+<0.01%) ⬆️

... and 1 file with indirect coverage changes

@fmigneault fmigneault merged commit 54659bf into master Sep 25, 2023
@fmigneault fmigneault deleted the fix-cwl-enum-schema-name branch September 25, 2023 15:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci/doc Issue related to documentation of the package ci/operations Related to CI operations (actions, execution, install, builds, etc.) ci/tests Tests of the package and features feature/CWL Issue related to CWL support feature/oas Issues related to OpenAPI specifications. feature/providers Issue related to providers convertion to WPS-REST processes. process/workflow Related to a Workflow process. process/wps1 Issue related to WPS 1.x processes support process/wps3 Issue related to WPS 3.x (REST-JSON) processes support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant