diff --git a/doc/source/release.rst b/doc/source/release.rst index da6c46ce37a94..fb2c24acff30d 100644 --- a/doc/source/release.rst +++ b/doc/source/release.rst @@ -55,10 +55,6 @@ performance improvements along with a large number of bug fixes. Highlights include: -Experimental Features -~~~~~~~~~~~~~~~~~~~~~ -- ``pandas.io.data.Options`` has a get_all_data method and now consistently returns a multi-indexed ''DataFrame'' (:issue:`5602`) - See the :ref:`v0.14.1 Whatsnew ` overview or the issue tracker on GitHub for an extensive list of all API changes, enhancements and bugs that have been fixed in 0.14.1. diff --git a/doc/source/remote_data.rst b/doc/source/remote_data.rst index aae36ee1d54b3..98d14b23e28bf 100644 --- a/doc/source/remote_data.rst +++ b/doc/source/remote_data.rst @@ -60,8 +60,8 @@ Yahoo! Finance Options The Options class allows the download of options data from Yahoo! Finance. -The ''get_all_data'' method downloads and caches option data for all expiry months -and provides a formatted ''DataFrame'' with a hierarchical index, so its easy to get +The ``get_all_data`` method downloads and caches option data for all expiry months +and provides a formatted ``DataFrame`` with a hierarchical index, so its easy to get to the specific option you want. .. ipython:: python @@ -69,13 +69,13 @@ to the specific option you want. from pandas.io.data import Options aapl = Options('aapl', 'yahoo') data = aapl.get_all_data() - data.head() + data.iloc[0:5:, 0:5] - #Show the $600 strike puts at all expiry dates: - data.loc[(600, slice(None), 'put'),:].head() + #Show the $100 strike puts at all expiry dates: + data.loc[(100, slice(None), 'put'),:].iloc[0:5:, 0:5] - #Show the volume traded of $600 strike puts at all expiry dates: - data.loc[(600, slice(None), 'put'),'Vol'].head() + #Show the volume traded of $100 strike puts at all expiry dates: + data.loc[(100, slice(None), 'put'),'Vol'].iloc[0:5:, 0:5] If you don't want to download all the data, more specific requests can be made. @@ -84,9 +84,9 @@ If you don't want to download all the data, more specific requests can be made. import datetime expiry = datetime.date(2016, 1, 1) data = aapl.get_call_data(expiry=expiry) - data.head() + data.iloc[0:5:, 0:5] -Note that if you call ''get_all_data'' first, this second call will happen much faster, as the data is cached. +Note that if you call ``get_all_data`` first, this second call will happen much faster, as the data is cached. .. _remote_data.google: diff --git a/doc/source/v0.14.1.txt b/doc/source/v0.14.1.txt index c0696ca45167a..2bd92953e2db7 100644 --- a/doc/source/v0.14.1.txt +++ b/doc/source/v0.14.1.txt @@ -148,7 +148,7 @@ Performance Experimental ~~~~~~~~~~~~ -``pandas.io.data.Options`` has a get_all_data method and now consistently returns a multi-indexed ''DataFrame'' (PR `#5602`) +``pandas.io.data.Options`` has a get_all_data method and now consistently returns a multi-indexed ``DataFrame`` (PR `#5602`) See :ref:`the docs` ***Experimental*** .. ipython:: python @@ -156,14 +156,15 @@ Experimental from pandas.io.data import Options aapl = Options('aapl', 'yahoo') data = aapl.get_all_data() - data.head() + data.iloc[0:5:, 0:5] + .. ipython:: python from pandas.io.data import Options aapl = Options('aapl', 'yahoo') data = aapl.get_all_data() - data.head() + data.iloc[0:5:, 0:5] .. _whatsnew_0141.bug_fixes: