Merge branch 'master' into master

This commit is contained in:
Jean Jordaan
2019-03-03 13:29:21 +07:00
committed by GitHub
304 changed files with 782 additions and 102041 deletions
+2 -29
View File
@@ -3,9 +3,7 @@
Installation
============
This part of the documentation covers the installation of Tablib.
The first step to using any software package is getting it properly installed.
Please read this section carefully, or you may miss out on some nice :ref:`speed enhancements <speed-extensions>`.
This part of the documentation covers the installation of Tablib. The first step to using any software package is getting it properly installed.
.. _installing:
@@ -21,7 +19,7 @@ Of course, the recommended way to install Tablib is with `pip <http://www.pip-in
.. code-block:: console
$ pip install tablib
$ pip install tablib[pandas]
-------------------
@@ -51,31 +49,6 @@ To download the full source history from Git, see :ref:`Source Control <scm>`.
.. _zipball: http://github.com/kennethreitz/tablib/zipball/master
.. _speed-extensions:
Speed Extensions
----------------
.. versionadded:: 0.8.5
Tablib is partially dependent on the **pyyaml**, **simplejson**, and **xlwt** modules.
To reduce installation issues, fully integrated versions of all required libraries are included in Tablib.
However, if performance is important to you (and it should be), you can install **pyyaml** with C extensions from PyPi.
.. code-block:: console
$ pip install PyYAML
If you're using Python 2.5, you should also install the **simplejson** module (pip will do this for you).
If you're using Python 2.6+, the built-in **json** module is already optimized and in use.
.. code-block:: console
$ pip install simplejson
.. _updates:
Staying Updated