Conversation
…t for scipy methods
4e61795 to
c52c310
Compare
Use what is in master. Later as a separate commit, we'll see if we can get the tagging sorted better.
|
I merged master in #1160, and on the top of this, I pass black and pyflakes. Then I took some lines from this PR correcting some errors. Then I compared it with this one. So, from the original branch I would keep:
|
|
@mmatera I am not sure I understand the details, but what to do is clearer: Please close one of the PR's and merge into master the other. One thing that keeps happening that confuses a lot of this is that there are changes outside of the stated intent. In particular Nintegrate incorporates compile function changes and this make tracking changes more difficult. Both PR's have updates to CHANGES.rst which go beyond what is in Nintegrate as well. |
|
|
Changes incorporated in #1160. |
A rebase of #1160
There were also some commits squashed, small revisions to
CHANGES.rst(e.g. make it consistent with prior formatting), some things that Python linting caught.@MMatura I generally merged HEAD over what was in master, although in some cases it looked like master had advanced.
The thing I am most unsure about is that tagging difference between compiled code and compled functions. So please review.