Skip to content

Commit

Permalink
Merge pull request #2267 from mdboom/mention-six-in-install
Browse files Browse the repository at this point in the history
Mention `six` in what's new and install docs
  • Loading branch information
pelson committed Aug 1, 2013
2 parents a1921d6 + 50e9fae commit 4c9efcd
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
5 changes: 4 additions & 1 deletion INSTALL
Expand Up @@ -199,7 +199,10 @@ libpng 1.2 (or later)
:term:`dateutil` 1.1 or later
Provides extensions to python datetime handling. If using pip,
easy_install or installing from source, the installer will attempt
to download and install `python_dateutil` from PyPI.
to download and install `python_dateutil` from PyPI. Note that
`python_dateutil` also depends on `six`. `pip` and other package
managers should handle installing that secondary dependency
automatically.

`pyparsing`
Required for matplotlib's mathtext math rendering support. If
Expand Down
11 changes: 6 additions & 5 deletions doc/users/whats_new.rst
Expand Up @@ -279,11 +279,12 @@ New setup script
````````````````
matplotlib 1.3 includes an entirely rewritten setup script. We now
ship fewer dependencies with the tarballs and installers themselves.
Notably, `pytz`, `dateutil` and `pyparsing` are no longer included
with matplotlib. You can either install them manually first, or let
`pip` install them as dependencies along with matplotlib. It is now
possible to not include certain subcomponents, such as the unit test
data, in the install. See `setup.cfg.template` for more information.
Notably, `pytz`, `dateutil`, `pyparsing` and `six` are no longer
included with matplotlib. You can either install them manually first,
or let `pip` install them as dependencies along with matplotlib. It
is now possible to not include certain subcomponents, such as the unit
test data, in the install. See `setup.cfg.template` for more
information.

XDG base directory support
``````````````````````````
Expand Down

0 comments on commit 4c9efcd

Please sign in to comment.