From dfd2e5c13f19e78cf032a18e0c6d4b573958b117 Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Fri, 7 Sep 2018 16:17:16 +0200 Subject: [PATCH 1/2] Fix URL to conda-forge matplotlib recipe. --- INSTALL.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL.rst b/INSTALL.rst index 6f780bb9bbdf..5ac242c96d50 100644 --- a/INSTALL.rst +++ b/INSTALL.rst @@ -305,4 +305,4 @@ Conda packages ^^^^^^^^^^^^^^ The conda packaging scripts for Matplotlib are available at -https://github.com/conda-forge/python-feedstock. +https://github.com/conda-forge/matplotlib-feedstock. From e5e250077be8667e6d6c3d0689445cdbd14fc1f8 Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Fri, 7 Sep 2018 16:23:47 +0200 Subject: [PATCH 2/2] Minor fixes to INSTALL.rst. --- INSTALL.rst | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/INSTALL.rst b/INSTALL.rst index 5ac242c96d50..c70fd0a9b6ce 100644 --- a/INSTALL.rst +++ b/INSTALL.rst @@ -1,5 +1,3 @@ -.. _pip: https://pypi.python.org/pypi/pip/ - ========== Installing ========== @@ -42,7 +40,7 @@ Test data --------- The wheels (:file:`*.whl`) on the `PyPI download page -`_ do not contain test data +`_ do not contain test data or example code. If you want to try the many demos that come in the Matplotlib source @@ -53,7 +51,7 @@ To run the test suite: * extract the :file:`lib/matplotlib/tests` or :file:`lib/mpl_toolkits/tests` directories from the source distribution; -* install test dependencies: `pytest `_, +* install test dependencies: `pytest `_, Pillow, MiKTeX, GhostScript, ffmpeg, avconv, ImageMagick, and `Inkscape `_; * run ``python -mpytest``. @@ -94,9 +92,9 @@ If you are interested in contributing to Matplotlib development, running the latest source code, or just like to build everything yourself, it is not difficult to build Matplotlib from source. Grab the latest *tar.gz* release file from `the PyPI files page -`_, or if you want to +`_, or if you want to develop Matplotlib or just need the latest bugfixed version, grab the -latest git version :ref:`install-from-git`. +latest git version, and see :ref:`install-from-git`. The standard environment variables `CC`, `CXX`, `PKG_CONFIG` are respected. This means you can set them if your toolchain is prefixed. This may be used for @@ -141,7 +139,7 @@ Matplotlib requires the following dependencies: * `NumPy `_ (>= 1.10.0) * `setuptools `_ * `cycler `_ (>= 0.10.0) -* `dateutil `_ (>= 2.1) +* `dateutil `_ (>= 2.1) * `kiwisolver `_ (>= 1.0.0) * `pyparsing `_ @@ -150,18 +148,18 @@ interface toolkits. See :ref:`what-is-a-backend` for more details on the optional Matplotlib backends and the capabilities they provide. * :term:`tk` (>= 8.3, != 8.6.0 or 8.6.1): for the Tk-based backends; -* `PyQt4 `_ (>= 4.6) or - `PySide `_ (>= 1.0.3): for the Qt4-based +* `PyQt4 `_ (>= 4.6) or + `PySide `_ (>= 1.0.3): for the Qt4-based backends; -* `PyQt5 `_: for the Qt5-based backends; +* `PyQt5 `_: for the Qt5-based backends; * `PyGObject `_ or `pgi `_ (>= 0.0.11.2): for the GTK3-based backends; * :term:`wxpython` (>= 4): for the WX-based backends; * `cairocffi `_ (>= 0.8) or - `pycairo `_: for the cairo-based + `pycairo `_: for the cairo-based backends; -* `Tornado `_: for the WebAgg backend; +* `Tornado `_: for the WebAgg backend; For better support of animation output format and image file formats, LaTeX, etc., you can install the following: