Skip to content

REF: make invocations of python and pytest consistent with the one used/desired python #3208

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 4 commits into from
Apr 20, 2020

Conversation

yarikoptic
Copy link
Member

It is largely based on patches which are now in debian packaging of nipype. In an effort to upgrade debian distribution from python 2 to 3, there should be better control over which python is actually invoked by the processes. E.g. there could be python and python3 executables, and nipype imported in python3. Then all underlying calls should also use python3 and not just plain python. Also Makefile already had provision ($(PYTHON) variable) to define which python to use but it was not uniformly used. This PR should address those.

See individual commits for possibly more comments

this would allow to consistently use the same python (which might be
python3 with python corresponding to python v 2)
…rocess

May be basename is not desired? but it might not exist exactly the
same on execution box, so decided to go with basename
To assure use of consistent with chosen python pytest.  py-test might
correspond to python2 whenever python3 is used.
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.

LGTM.

@codecov
Copy link

codecov bot commented Apr 20, 2020

Codecov Report

Merging #3208 into master will increase coverage by 0.00%.
The diff coverage is 50.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3208   +/-   ##
=======================================
  Coverage   64.89%   64.90%           
=======================================
  Files         301      301           
  Lines       39717    39718    +1     
  Branches     5268     5268           
=======================================
+ Hits        25776    25777    +1     
  Misses      12884    12884           
  Partials     1057     1057           
Flag Coverage Δ
#unittests 64.90% <50.00%> (+<0.01%) ⬆️
Impacted Files Coverage Δ
nipype/interfaces/freesurfer/preprocess.py 65.97% <50.00%> (+0.03%) ⬆️

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 3bfd2f2...c7efd5b. Read the comment docs.

@effigies effigies merged commit 24375b2 into nipy:master Apr 20, 2020
@effigies effigies added this to the 1.5.0 milestone May 19, 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
Development

Successfully merging this pull request may close these issues.

2 participants