pydra icon indicating copy to clipboard operation
pydra copied to clipboard

WIP: adding task input info

Open rcali21 opened this issue 3 years ago • 11 comments

Working on adding task info for executables to be printed in the audit module. This includes software tool description and uuid for sys user.

rcali21 avatar Jul 18 '22 17:07 rcali21

Codecov Report

Base: 77.06% // Head: 77.13% // Increases project coverage by +0.07% :tada:

Coverage data is based on head (40200b3) compared to base (5f5044d). Patch coverage: 100.00% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #556      +/-   ##
==========================================
+ Coverage   77.06%   77.13%   +0.07%     
==========================================
  Files          20       20              
  Lines        4316     4330      +14     
  Branches     1212     1217       +5     
==========================================
+ Hits         3326     3340      +14     
  Misses        802      802              
  Partials      188      188              
Flag Coverage Δ
unittests 77.04% <100.00%> (+0.07%) :arrow_up:

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

Impacted Files Coverage Δ
pydra/engine/audit.py 90.32% <100.00%> (+1.43%) :arrow_up:
pydra/engine/core.py 89.07% <100.00%> (+0.10%) :arrow_up:

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

:umbrella: View full report at Codecov.
:loudspeaker: Do you have feedback about the report comment? Let us know in this issue.

codecov[bot] avatar Jul 18 '22 17:07 codecov[bot]

You have a git conflict that you haven't resolved, you either have to keep l. 55-56 or 59.

djarecka avatar Jul 21 '22 15:07 djarecka

This branch still have unresolved message from git conflict that I mentioned in my comments a month ago. It is important to fix it. There is no way that test can pass before fixing it

some resources: https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts

djarecka avatar Aug 29 '22 13:08 djarecka

@rcali21 - most of the tests are now passing after our yesterday changes. Please check the the report from windows - I've suggested removing one import that you're not using and leads to the error.

the pre-commit test should be fixed if you properly set your python environment and install and run pre-commit (see README)

djarecka avatar Aug 30 '22 13:08 djarecka

Hi @rcali21 - were you able to fix the environment and the tests?

djarecka avatar Sep 01 '22 22:09 djarecka

@rcali21 - we fixed the code last week and removed all the git additions due to conflicts, but I can see them again, you committed some yesterday (commit b25a84fce19d2ff383975f5710c5a29f524e48fd). They have to be removed again. In addition this commit include code that we improved last time, e.g. we agreed that the this test can't ever fail: https://github.com/nipype/pydra/pull/556/commits/b5e6c6d586115451f740abe0097e52d1fd5a62bc#diff-a11f03680cf3564d504176495bedcb6049de9c17cad825a6baa14bb7957685a9R1004

I'm really not sure why this code is here again here and why you had a new conflict, I thought that you will just work on this specific branch. Did you try to merge anything? Did you work on a different computer?

djarecka avatar Sep 04 '22 13:09 djarecka

Hi @djarecka,

Sorry about this, I tried to resolve the env issues I was having and this is not what I intended to commit. On my end, I have the fixes implemented and the test case is fixed as well. Everything was tested prior to committing and passed. I'm going to try to figure out what the issue is with my branch + env today and get back to you.

Ryan

rcali21 avatar Sep 04 '22 16:09 rcali21

@djarecka This looks to be sorted now, correct?

rcali21 avatar Sep 04 '22 23:09 rcali21

yes, this looks much better, all pytest test are passing now, but please check the pre-commit report - there is one line that is too long: https://results.pre-commit.ci/run/github/152126811/1662310974.aPQj1izcSX-yLFZRsy_MBQ

djarecka avatar Sep 05 '22 22:09 djarecka

yes, this looks much better, all pytest test are passing now, but please check the pre-commit report - there is one line that is too long: https://results.pre-commit.ci/run/github/152126811/1662310974.aPQj1izcSX-yLFZRsy_MBQ

Resolved by deleting verbose comment.

rcali21 avatar Sep 05 '22 23:09 rcali21

I left a couple of comments, once this is fixed we can merge it and start adding input, output or agent in new PR

djarecka avatar Sep 06 '22 13:09 djarecka

great, thank you! I will merge this PRs! other fields can be added in a separate PR.

Please be sure that you fetch/pull changes from the master branch and start new changes in a new branch!

djarecka avatar Sep 09 '22 15:09 djarecka

please also add your name to the zenodo file: https://github.com/nipype/pydra/blob/master/.zenodo.json (you can open a small PR with it)

djarecka avatar Sep 09 '22 15:09 djarecka