Skip to content

Commit

Permalink
Fixed some typos
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisdev committed Aug 5, 2013
1 parent d59c230 commit 3ecb028
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
File renamed without changes.
7 changes: 0 additions & 7 deletions MANIFEST.in
@@ -1,10 +1,3 @@
include AUTHORS.rst
include CHANGES.rst
include LICENSE.txt
include MANIFEST.in
include README.rst
include TODO.rst

# added by check_manifest.py
include *.py
include *.rst
Expand Down
21 changes: 14 additions & 7 deletions README.rst
Expand Up @@ -15,15 +15,22 @@ Contributors

Dependencies
=============
``django-pandas`` supports `Django`_ 1.4.5 or later and
requires `django-model-utils`_. You will also have to
install ``Pandas`` and its dependencies such as ``Numpy`` and optionally the
other parts of the Scipy stack. You may wish to consult
http://www.scipy.org/install.html for more information on installing the
``Scipy`` stack.
``django-pandas`` supports `Django`_ (>=1.4.5) or later
and requires `django-model-utils`_ (>= 1.4.0) and `Pandas`_ (0.12.0).
**Note** because of problems with the ``requires`` directive of setup tools
you probably need to install ``numpy`` in your virtualenv especially
if you want to run the test suite ::

pip install numpy
python setup.py test

Some ``pandas`` functionality requires parts of the Scipy stack.
You may wish to consult http://www.scipy.org/install.html
for more information on installing the ``Scipy`` stack.

.. _Django: http://djangoproject.com/
.. _django-model-utils: http://pypi.python.org/pypi/django-model-utils
.. _Pandas: http://pandas.pydata.org

Contributing
============
Expand Down Expand Up @@ -251,7 +258,7 @@ A convenience method for creating a pivot table from a QuerySet

**Parameters**

- fields: The model fields to utilise in creating the frame.
- fields: The model fields to utilise in creating the frame.
to span a relationship, just use the field name of related
fields across models, separated by double underscores,
- values : column to aggregate, optional
Expand Down

0 comments on commit 3ecb028

Please sign in to comment.