Skip to content

Backport NumPy 1.13.0 fixes to 0.18.X #9137

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
Jun 19, 2017

Conversation

jakirkham
Copy link
Contributor

@jakirkham jakirkham commented Jun 15, 2017

Backports some PRs (linked below) needed for NumPy 1.13.0 support in master to 0.18.X.

xref: #7946
xref: #8040
xref: #8355
xref: #9010

lesteve added 2 commits June 15, 2017 17:36
Until now we were in a edge case on assert_array_equal
numpy.apply_along_axis has changed behaviour when the function passed
in returns a 2d array
@jakirkham
Copy link
Contributor Author

Not sure why one Travis CI job failed. The others passed. There's no real indication in the failed job.

Also it looks like some assertion in docutils went off in CircleCI. Though I can't see why these changes would have caused that.

Maybe both of these could use a restart?

@jnothman
Copy link
Member

jnothman commented Jun 15, 2017 via email

@jakirkham
Copy link
Contributor Author

I see. Could backport that patch as well. Which patch would that be?

@jnothman
Copy link
Member

jnothman commented Jun 15, 2017 via email

…n#9010)

* DOC updated plot_stock_market.py to use Google Finance

The implementations is intentionally very basic not to distract the users
from the example. Specifically unlike ``quotes_historical_yahoo_ochl`` it
does not cache downloaded data.

I also had to remove some symbols because the have no data on Google for
the specified date interval. These are WBA, LMT, KFT and MTU.

Closes scikit-learn#8899

* DOC removed plot_stock_market.py from expected failing examples

* Addressed review comments

* Addressed another pass of review comments
@jakirkham
Copy link
Contributor Author

Thanks. Guessing you are referring to this PR ( #9010 )? Have cherry-picked it into here.

There was a conflict in doc/conf.py. Chose to leave that file unchanged as it doesn't seem to be relevant to fixing the failure. Also I'm not totally sure how (or if) that file should change in this branch.

@jakirkham
Copy link
Contributor Author

There's another failure cropping up on CircleCI.

________________________________________________________________________________
../examples/cross_decomposition/plot_compare_cross_decomposition.py is not compiling:
Traceback (most recent call last):
  File "/home/ubuntu/scikit-learn/doc/sphinxext/sphinx_gallery/gen_rst.py", line 467, in execute_script
    exec(code_block, example_globals)
  File "<string>", line 3, in <module>
NameError: name 'X_train' is not defined

________________________________________________________________________________

@lesteve
Copy link
Member

lesteve commented Jun 16, 2017

Maybe add 13cc121. There may be similar changes to examples in other commits ...

Note that because sphinx-gallery is quite old in the 0.18.X you need to look only at the first error in examples and ignore the following ones. In particular for #9137 (comment), the first error is:

../examples/cross_decomposition/plot_compare_cross_decomposition.py is not compiling:
Traceback (most recent call last):
  File "/home/ubuntu/scikit-learn/doc/sphinxext/sphinx_gallery/gen_rst.py", line 467, in execute_script
    exec(code_block, example_globals)
  File "<string>", line 11/home/ubuntu/scikit-learn/sklearn/decomposition/fastica_.py:116: UserWarning: FastICA did not converge. Consider increasing tolerance or the maximum number of iterations.
  warnings.warn('FastICA did not converge. Consider increasing '
/home/ubuntu/scikit-learn/sklearn/decomposition/factor_analysis.py:224: ConvergenceWarning: FactorAnalysis did not converge. You might want to increase the number of iterations.
  ConvergenceWarning)
, in <module>
TypeError: slice indices must be integers or None or have an __index__ method

@amueller
Copy link
Member

Failed on numpy master, possibly because array( 2.22045e-15).

@amueller
Copy link
Member

Same issue on our master, I think we should fix. I'll ask the numpy folks what's up.

@jakirkham
Copy link
Contributor Author

Thanks @lesteve. Have cherry-picked ( 13cc121 ).

@amueller
Copy link
Member

Ah, the test failure on dev is here numpy/numpy#9185 but seems they want to fix it.

@amueller
Copy link
Member

Why is flake8 run on the non-python files? Is that fixed in master? hm.... that seems really strange?

@amueller
Copy link
Member

We also need b185c4e and 25917ba right?

@amueller
Copy link
Member

(I think the circle ci failure is due to the second)

@amueller
Copy link
Member

Merging these, then cherry-picking the others.

@amueller amueller merged commit 8d9b58b into scikit-learn:0.18.X Jun 19, 2017
@amueller
Copy link
Member

Lol none of these has a whatsnew entry....

@amueller
Copy link
Member

see #9167 for release branch

@jakirkham jakirkham deleted the backport_fixes branch June 19, 2017 20:40
@jakirkham
Copy link
Contributor Author

Thanks for finishing this one out @amueller.

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.

6 participants