Travis ci separate compilation

[cournape]

Fix for separate compilation (distutils only).

This should fix #315. It includes an update to the travis file so that we test the separate build option on 2.7 and 3.2

[cournape]

The travis output can be found there: http://travis-ci.org/#!/cournape/numpy

[travisbot]

This pull request passes (merged 465c2f4 into 699c2f3).

[teoliphant]

Is there anyway you could rebase this into 1 commit? using git rebase -i

[njsmith]

The merge basically does that :-) See the merge diff:
6a06466

[teoliphant]

Did you just click on the green button or did you type some git commands at the prompt?

[njsmith]

I clicked the green button, which is equivalent to running the commands 'git checkout master && git merge --no-ff courenape/travis_ci_separate_compilation'. The --no-ff is the trick here, since it forces git to create a merge node, and the first parent of this merge node is always the previous state of the branch being merged into. So the diff between the merged tree and the first parent tree is the collapsed patch, and what github shows in its commit view.

If the point of your request was to ease cherry-picking, then try 'git cherry-pick -x -m1 6a06466'? The '-m1' means 'I want the change between this merge node and its first parent'.

[njsmith]

Err, 'cournape', not 'courenape', of course -- sorry David!

[teoliphant]

Very good. Thanks for the education. I like the pattern of just pressing the merge button where possible which Fernado Perez promotes. Your explanation gives me even more confidence.

Travis Oliphant
(on a mobile)
512-826-7480

On Jun 25, 2012, at 7:14 AM, njsmithreply@reply.github.com wrote:

Err, 'cournape', not 'courenape', of course -- sorry David!

---

Reply to this email directly or view it on GitHub:
#317 (comment)