Skip to content

Enh/wait #3089

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

Merged
merged 7 commits into from
Nov 8, 2019
Merged

Enh/wait #3089

merged 7 commits into from
Nov 8, 2019

Conversation

satra
Copy link
Member

@satra satra commented Nov 5, 2019

Summary

Continuation of #3083

this adds an explicit timeout in reading the results file that may be missing due to file system delays.

Closes #3076

Hopefully:

Fixes #3014
Fixes #3081

List of changes proposed in this PR (pull-request)

  • Add waiting for result in reading pickled files.

Acknowledgment

  • (Mandatory) I acknowledge that this contribution will be available under the Apache 2 license.

@codecov
Copy link

codecov bot commented Nov 6, 2019

Codecov Report

Merging #3089 into master will increase coverage by 0.02%.
The diff coverage is 71.09%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #3089      +/-   ##
=========================================
+ Coverage   68.17%   68.2%   +0.02%     
=========================================
  Files         297     297              
  Lines       39793   39808      +15     
  Branches     5212    5215       +3     
=========================================
+ Hits        27130   27152      +22     
+ Misses      11952   11946       -6     
+ Partials      711     710       -1
Flag Coverage Δ
#smoketests 51.79% <53.48%> (ø) ⬆️
#unittests 65.48% <62.12%> (+0.05%) ⬆️
Impacted Files Coverage Δ
nipype/pipeline/engine/utils.py 80.76% <69.1%> (ø) ⬆️
nipype/utils/filemanip.py 78.9% <73.98%> (-0.17%) ⬇️
nipype/__init__.py 61.9% <0%> (-3.18%) ⬇️
nipype/interfaces/dcm2nii.py 65.11% <0%> (+6.04%) ⬆️

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 536c57d...e572991. Read the comment docs.

@satra satra requested review from oesteban and effigies November 6, 2019 03:07
@satra
Copy link
Member Author

satra commented Nov 6, 2019

@oesteban @dPys - could you try this branch? this only handles any results file issue, not resource management.

Copy link
Member

@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.

Seems fine, AFAICT.

@dPys
Copy link

dPys commented Nov 6, 2019

Thanks @satra -- this patch appears to fix #3076!

Copy link
Contributor

@oesteban oesteban left a comment

Choose a reason for hiding this comment

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

Looks good to me, made a minimal suggestion (will post a code proposal shortly).

On another topic - do we really want to add all the stylistic changes in this particular PR?

@satra
Copy link
Member Author

satra commented Nov 7, 2019

i refactored savepkl. and yes there are more stylistic changes, since i have pre-commit turned on.

@satra
Copy link
Member Author

satra commented Nov 7, 2019

here is the direct pointer to the function: https://github.com/nipy/nipype/pull/3089/files#diff-7d84fc0957a520f25bb02479beb87c51R825

@satra
Copy link
Member Author

satra commented Nov 7, 2019

@effigies @oesteban - can we merge this and cut a new release/release candidate?

@effigies
Copy link
Member

effigies commented Nov 7, 2019

No objections.

@satra
Copy link
Member Author

satra commented Nov 8, 2019

@oesteban - can i merge this?

@oesteban oesteban merged commit 5058ab7 into nipy:master Nov 8, 2019
@oesteban
Copy link
Contributor

oesteban commented Nov 8, 2019

Sorry for holding this up

@effigies effigies added this to the 1.3.0 milestone Jan 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants