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

Automate script installation #1254

Merged
merged 2 commits into from Jun 17, 2017
Merged

Automate script installation #1254

merged 2 commits into from Jun 17, 2017

Conversation

skoudoro
Copy link
Member

resolving #1253 : find files recursively instead of static files list for automating script installation

@arokem
Copy link
Contributor

arokem commented Jun 12, 2017

Yeah - this looks good to me. It seems to be in conflict with master. Could you please rebase?

@Garyfallidis
Copy link
Contributor

We just used the resolve conflict button. Which actually does a merge not a rebase.

@Garyfallidis
Copy link
Contributor

That was just a test. We were not sure what the resolve button was doing. Next time we rebase. For this time it will probably be okay as the conflict and commit history was small.

@coveralls
Copy link

Coverage Status

Coverage remained the same at 85.656% when pulling e890efa on skoudoro:script_automation into 599af3e on nipy:master.

1 similar comment
@coveralls
Copy link

Coverage Status

Coverage remained the same at 85.656% when pulling e890efa on skoudoro:script_automation into 599af3e on nipy:master.

@codecov-io
Copy link

codecov-io commented Jun 13, 2017

Codecov Report

Merging #1254 into master will increase coverage by <.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1254      +/-   ##
==========================================
+ Coverage   87.04%   87.05%   +<.01%     
==========================================
  Files         226      226              
  Lines       28262    28262              
  Branches     3026     3026              
==========================================
+ Hits        24602    24603       +1     
  Misses       2976     2976              
+ Partials      684      683       -1
Impacted Files Coverage Δ
dipy/core/graph.py 75% <0%> (+1.19%) ⬆️

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 599af3e...e890efa. Read the comment docs.

@Garyfallidis
Copy link
Contributor

This looks ready to me. Any objections?

@arokem arokem merged commit efb7170 into dipy:master Jun 17, 2017
@skoudoro skoudoro deleted the script_automation branch June 19, 2017 14:47
ShreyasFadnavis pushed a commit to ShreyasFadnavis/dipy that referenced this pull request Sep 20, 2018
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.

None yet

5 participants