Skip to content

Commit 10bf721

Browse files
DOC: small update to install.rst page (#14115)
Move some content from the removed content on dependencies from the README (see GH13882)
1 parent a9c15d3 commit 10bf721

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ pip install pandas
148148
- [pytz](http://pytz.sourceforge.net)
149149
- Needed for time zone support with ``pandas.date_range``
150150

151-
See the [full installation instructions](http://pandas.pydata.org/pandas-docs/stable/install.html)
151+
See the [full installation instructions](http://pandas.pydata.org/pandas-docs/stable/install.html#dependencies)
152152
for recommended and optional dependencies.
153153

154154
## Installation from sources

doc/source/install.rst

+12-9
Original file line numberDiff line numberDiff line change
@@ -254,27 +254,30 @@ Optional Dependencies
254254
- `SQLite <https://docs.python.org/3.5/library/sqlite3.html>`__: for SQLite, this is included in Python's standard library by default.
255255

256256
* `matplotlib <http://matplotlib.org/>`__: for plotting
257-
* `openpyxl <http://packages.python.org/openpyxl/>`__, `xlrd/xlwt <http://www.python-excel.org/>`__: Needed for Excel I/O
258-
* `XlsxWriter <https://pypi.python.org/pypi/XlsxWriter>`__: Alternative Excel writer
257+
* For Excel I/O:
258+
* `xlrd/xlwt <http://www.python-excel.org/>`__: Excel reading (xlrd) and writing (xlwt)
259+
* `openpyxl <http://packages.python.org/openpyxl/>`__: openpyxl version 1.6.1
260+
or higher (but lower than 2.0.0), or version 2.2 or higher, for writing .xlsx files (xlrd >= 0.9.0)
261+
* `XlsxWriter <https://pypi.python.org/pypi/XlsxWriter>`__: Alternative Excel writer
262+
259263
* `Jinja2 <http://jinja.pocoo.org/>`__: Template engine for conditional HTML formatting.
260-
* `boto <https://pypi.python.org/pypi/boto>`__: necessary for Amazon S3
261-
access.
264+
* `boto <https://pypi.python.org/pypi/boto>`__: necessary for Amazon S3 access.
262265
* `blosc <https://pypi.python.org/pypi/blosc>`__: for msgpack compression using ``blosc``
263266
* One of `PyQt4
264267
<http://www.riverbankcomputing.com/software/pyqt/download>`__, `PySide
265268
<http://qt-project.org/wiki/Category:LanguageBindings::PySide>`__, `pygtk
266269
<http://www.pygtk.org/>`__, `xsel
267270
<http://www.vergenet.net/~conrad/software/xsel/>`__, or `xclip
268271
<https://github.com/astrand/xclip/>`__: necessary to use
269-
:func:`~pandas.io.clipboard.read_clipboard`. Most package managers on Linux distributions will have ``xclip`` and/or ``xsel`` immediately available for installation.
272+
:func:`~pandas.read_clipboard`. Most package managers on Linux distributions will have ``xclip`` and/or ``xsel`` immediately available for installation.
270273
* Google's `python-gflags <<https://github.com/google/python-gflags/>`__ ,
271274
`oauth2client <https://github.com/google/oauth2client>`__ ,
272275
`httplib2 <http://pypi.python.org/pypi/httplib2>`__
273276
and `google-api-python-client <http://github.com/google/google-api-python-client>`__
274277
: Needed for :mod:`~pandas.io.gbq`
275278
* `Backports.lzma <https://pypi.python.org/pypi/backports.lzma/>`__: Only for Python 2, for writing to and/or reading from an xz compressed DataFrame in CSV; Python 3 support is built into the standard library.
276279
* One of the following combinations of libraries is needed to use the
277-
top-level :func:`~pandas.io.html.read_html` function:
280+
top-level :func:`~pandas.read_html` function:
278281

279282
* `BeautifulSoup4`_ and `html5lib`_ (Any recent version of `html5lib`_ is
280283
okay.)
@@ -287,14 +290,14 @@ Optional Dependencies
287290

288291
* if you install `BeautifulSoup4`_ you must install either
289292
`lxml`_ or `html5lib`_ or both.
290-
:func:`~pandas.io.html.read_html` will **not** work with *only*
293+
:func:`~pandas.read_html` will **not** work with *only*
291294
`BeautifulSoup4`_ installed.
292295
* You are highly encouraged to read :ref:`HTML reading gotchas
293296
<html-gotchas>`. It explains issues surrounding the installation and
294297
usage of the above three libraries
295298
* You may need to install an older version of `BeautifulSoup4`_:
296-
- Versions 4.2.1, 4.1.3 and 4.0.2 have been confirmed for 64 and
297-
32-bit Ubuntu/Debian
299+
- Versions 4.2.1, 4.1.3 and 4.0.2 have been confirmed for 64 and
300+
32-bit Ubuntu/Debian
298301
* Additionally, if you're using `Anaconda`_ you should definitely
299302
read :ref:`the gotchas about HTML parsing libraries <html-gotchas>`
300303

0 commit comments

Comments
 (0)