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

Typing bugfixes #687

Merged
merged 20 commits into from
Sep 7, 2023
Merged

Typing bugfixes #687

merged 20 commits into from
Sep 7, 2023

Conversation

tclose
Copy link
Contributor

@tclose tclose commented Aug 17, 2023

Types of changes

  • Bug fix (non-breaking change which fixes an issue)

Summary

  • Fixes up the handling of typing of inputs with output_file_template defined
  • Allows output_file_template to define tuple/list templates for options with multiple files paths (e.g. mrconvert --export_grad_fsl BVEC BVAL)
  • More descriptive messages on typing errors: task and field provided along with type mismatch
  • Adds fileformats.field types to default coercions, e.g. fileformats.field.Integer -> int and vice versa

Checklist

  • I have added tests to cover my changes (if necessary)
  • I have updated documentation (if necessary)

@codecov
Copy link

codecov bot commented Aug 17, 2023

Codecov Report

Patch coverage: 96.00% and project coverage change: -0.35% ⚠️

Comparison is base (91c5a15) 83.23% compared to head (07ce62a) 82.88%.
Report is 2 commits behind head on master.

❗ Current head 07ce62a differs from pull request most recent head 103cefc. Consider uploading reports for the commit 103cefc to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #687      +/-   ##
==========================================
- Coverage   83.23%   82.88%   -0.35%     
==========================================
  Files          22       22              
  Lines        4848     4873      +25     
  Branches     1392        0    -1392     
==========================================
+ Hits         4035     4039       +4     
- Misses        809      834      +25     
+ Partials        4        0       -4     
Flag Coverage Δ
unittests 82.88% <96.00%> (-0.35%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
pydra/utils/typing.py 93.24% <90.00%> (+0.26%) ⬆️
pydra/engine/helpers.py 86.66% <100.00%> (+0.07%) ⬆️
pydra/engine/helpers_file.py 92.59% <100.00%> (+0.24%) ⬆️
pydra/engine/specs.py 94.75% <100.00%> (+0.03%) ⬆️

... and 4 files with indirect coverage changes

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

@tclose tclose force-pushed the typing-bugfixes branch 2 times, most recently from b26c22b to 64c5779 Compare August 31, 2023 03:15
@tclose tclose changed the title [WIP]: Typing bugfixes Typing bugfixes Sep 1, 2023
@tclose
Copy link
Contributor Author

tclose commented Sep 1, 2023

@djarecka I believe this is ready to merge now. The new SLURM test seems to be getting stuck somewhere

Copy link
Contributor

@effigies effigies left a comment

Choose a reason for hiding this comment

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

Small comments. Nothing objectionable here, though I also did not fully grasp the bugs being fixed.

pydra/engine/helpers_file.py Outdated Show resolved Hide resolved
pydra/utils/typing.py Outdated Show resolved Hide resolved
pydra/utils/typing.py Outdated Show resolved Hide resolved
tclose and others added 3 commits September 7, 2023 10:50
Co-authored-by: Chris Markiewicz <effigies@gmail.com>
Co-authored-by: Chris Markiewicz <effigies@gmail.com>
@effigies
Copy link
Contributor

effigies commented Sep 7, 2023

Merging so #684 can be rebased on master and reviewed more easily.

@effigies effigies merged commit 31aea01 into nipype:master Sep 7, 2023
26 of 29 checks passed
@tclose tclose deleted the typing-bugfixes branch September 11, 2023 22:18
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.

2 participants