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

Provide odd length kernels #343

Merged
merged 3 commits into from
Feb 23, 2021

Conversation

NicolasGensollen
Copy link
Contributor

In release 1.6 of Scipy, the function sepfir2d only accepts odd length arrays for hrow and hcol (see this PR).

@NicolasGensollen NicolasGensollen force-pushed the fix-test_coreg-scipy-1.6 branch from 1f3f212 to 89e98aa Compare February 9, 2021 15:41
pypreprocess/coreg.py Outdated Show resolved Hide resolved
pypreprocess/coreg.py Outdated Show resolved Hide resolved
@bthirion
Copy link
Member

bthirion commented Feb 9, 2021

The Travis failure seems unrelated...

@NicolasGensollen
Copy link
Contributor Author

The Travis failure seems unrelated...

Yes it is unrelated and is also currently breaking #342
I can't reproduce this failure on my machine yet, I'll have to look a little bit more into it

@man-shu
Copy link
Contributor

man-shu commented Feb 9, 2021

Yes, this is indeed a separate issue. On #342 it only comes up with the continuous-integration/travis-ci/pr check but not with continuous-integration/travis-ci/push check. Here also it is on continuous-integration/travis-ci/pr.

Based on Travis docs (see the section on 'Double builds') it seems to me that the PR check is done on the merge of the PR and the main branch. So maybe something is up with the main branch? Not very sure...

@NicolasGensollen
Copy link
Contributor Author

Is there something preventing this to be merged?

@man-shu
Copy link
Contributor

man-shu commented Feb 23, 2021

The fix has passed all the checks on this PR, but I just committed the same fix on #342 and one of the checks failed again.

On the other hand, on #342 only, without having made these changes (in commit 9378e0d) the same check passed!

@swaythe
Copy link
Contributor

swaythe commented Feb 23, 2021

@man-shu I think it was a Travis issue. I restarted the failed check and it passes now.

@bthirion
Copy link
Member

Merging, then !

@bthirion bthirion merged commit 5502a6e into neurospin:master Feb 23, 2021
@bthirion
Copy link
Member

thx to all of you !

@man-shu
Copy link
Contributor

man-shu commented Feb 24, 2021

Great!

@NicolasGensollen NicolasGensollen deleted the fix-test_coreg-scipy-1.6 branch February 24, 2021 08:30
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.

4 participants