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

Generate parser from cwltool extensions #337

Merged
merged 3 commits into from
Dec 9, 2024
Merged

Generate parser from cwltool extensions #337

merged 3 commits into from
Dec 9, 2024

Conversation

GlassOfWhiskey
Copy link
Collaborator

This commit fixes #309 by generating the Python CWL parsers directly from the codegen branch of cwltool, including all the cwltool extensions in the parsers logic.

Copy link

codecov bot commented Dec 3, 2024

Codecov Report

Attention: Patch coverage is 84.21053% with 3 lines in your changes missing coverage. Please review.

Project coverage is 33.30%. Comparing base (70fbcd9) to head (5cb0a70).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
cwl_utils/parser/cwl_v1_2_utils.py 81.25% 2 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #337      +/-   ##
==========================================
+ Coverage   32.70%   33.30%   +0.60%     
==========================================
  Files          29       29              
  Lines       31867    34864    +2997     
  Branches     8672     9396     +724     
==========================================
+ Hits        10421    11613    +1192     
- Misses      19024    20615    +1591     
- Partials     2422     2636     +214     

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

README.rst Outdated Show resolved Hide resolved
@GlassOfWhiskey GlassOfWhiskey marked this pull request as draft December 4, 2024 13:00
@GlassOfWhiskey GlassOfWhiskey force-pushed the cwltool-ext branch 18 times, most recently from 6622170 to 453e14d Compare December 4, 2024 21:53
@GlassOfWhiskey GlassOfWhiskey force-pushed the cwltool-ext branch 4 times, most recently from ba5d6db to 794b93d Compare December 4, 2024 22:27
@GlassOfWhiskey GlassOfWhiskey marked this pull request as ready for review December 4, 2024 22:32
@GlassOfWhiskey GlassOfWhiskey requested a review from mr-c December 4, 2024 22:32
@GlassOfWhiskey
Copy link
Collaborator Author

This version works with cwltool:Loop extension in StreamFlow

Copy link
Member

@mr-c mr-c left a comment

Choose a reason for hiding this comment

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

Thanks for this! Can you open PRs to the codegen branches of https://github.com/common-workflow-language/cwl-v1.2 etc. to add the extensions there?

@GlassOfWhiskey GlassOfWhiskey requested a review from mr-c December 5, 2024 17:37
@GlassOfWhiskey
Copy link
Collaborator Author

GlassOfWhiskey commented Dec 5, 2024

Thanks for this! Can you open PRs to the codegen branches of https://github.com/common-workflow-language/cwl-v1.2 etc. to add the extensions there?

Hi @mr-c, I just did it. Would you like to release schema_salad, in order to fix the dependency?

This commit fixes #309 by generating the Python CWL parsers directly
from the `codegen` branch of cwltool, including all the cwltool
extensions in the parsers logic.
@GlassOfWhiskey GlassOfWhiskey force-pushed the cwltool-ext branch 6 times, most recently from 604574c to eadbda1 Compare December 6, 2024 18:52
README.rst Show resolved Hide resolved
requirements.txt Outdated Show resolved Hide resolved
@GlassOfWhiskey GlassOfWhiskey force-pushed the cwltool-ext branch 2 times, most recently from 1f9362d to 65d4b81 Compare December 9, 2024 11:31
@GlassOfWhiskey GlassOfWhiskey requested a review from mr-c December 9, 2024 11:31
@mr-c mr-c merged commit a3f3221 into main Dec 9, 2024
29 checks passed
@mr-c mr-c deleted the cwltool-ext branch December 9, 2024 12:17
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.

Parser does not support cwltool extensions
2 participants