[Python-modules-commits] [matplotlib] 01/17: Import matplotlib_2.0.0.orig.tar.gz
Sandro Tosi
morph at moszumanska.debian.org
Thu Jan 19 04:40:23 UTC 2017
This is an automated email from the git hooks/post-receive script.
morph pushed a commit to branch master
in repository matplotlib.
commit e56d16e832c34e4e84834585724e4b192f36cfd8
Author: Sandro Tosi <morph at debian.org>
Date: Tue Jan 17 22:48:58 2017 -0500
Import matplotlib_2.0.0.orig.tar.gz
---
.travis.yml | 5 +-
INSTALL | 39 +-
doc/README.txt | 14 +-
doc/_static/.gitignore | 5 +
doc/_static/contour_frontpage.png | Bin 4015 -> 0 bytes
doc/_static/histogram_frontpage.png | Bin 3195 -> 0 bytes
doc/_static/membrane_frontpage.png | Bin 5230 -> 0 bytes
doc/_static/mpl.css | 4 +-
doc/_static/surface3d_frontpage.png | Bin 8755 -> 0 bytes
doc/_templates/citing.html | 6 +-
doc/_templates/index.html | 84 +--
doc/api/api_changes.rst | 47 +-
doc/api/index.rst | 1 +
doc/api/rcsetup_api.rst | 12 +
doc/conf.py | 10 +-
doc/devel/MEP/MEP11.rst | 2 +-
doc/devel/MEP/MEP12.rst | 15 +-
doc/devel/MEP/MEP13.rst | 2 +-
doc/devel/MEP/MEP14.rst | 14 +-
doc/devel/MEP/MEP25.rst | 2 +-
doc/devel/coding_guide.rst | 4 +-
doc/devel/contributing.rst | 113 ++--
doc/devel/documenting_mpl.rst | 10 +-
doc/devel/gitwash/development_workflow.rst | 4 +-
doc/devel/gitwash/forking_hell.rst | 2 +-
doc/devel/gitwash/git_install.rst | 2 +-
doc/devel/gitwash/git_links.inc | 56 +-
doc/devel/gitwash/known_projects.inc | 16 +-
doc/devel/gitwash/this_project.inc | 2 +-
doc/devel/license.rst | 4 +-
doc/devel/release_guide.rst | 316 ++++++----
doc/devel/testing.rst | 13 +-
doc/faq/howto_faq.rst | 68 +-
doc/faq/installing_faq.rst | 14 +-
doc/faq/osx_framework.rst | 10 +-
doc/faq/troubleshooting_faq.rst | 16 +-
doc/faq/usage_faq.rst | 32 +-
doc/glossary/index.rst | 34 +-
doc/make.py | 94 ++-
doc/mpl_toolkits/index.rst | 6 +-
doc/resources/index.rst | 10 +-
doc/users/artists.rst | 2 +-
doc/users/colormaps.rst | 17 +-
doc/users/colors.rst | 4 +
doc/users/credits.rst | 695 ++++++++++++++-------
doc/users/dflt_style_changes.rst | 222 ++++---
doc/users/event_handling.rst | 4 +-
doc/users/github_stats.rst | 196 +++++-
doc/users/image_tutorial.rst | 14 +-
doc/users/intro.rst | 28 +-
doc/users/license.rst | 4 +-
doc/users/navigation_toolbar.rst | 2 +-
doc/users/path_tutorial.rst | 2 +-
doc/users/pgf.rst | 18 +-
doc/users/prev_whats_new/whats_new_1.0.rst | 2 +-
doc/users/pyplot_tutorial.rst | 2 +-
doc/users/screenshots.rst | 4 +-
doc/users/shell.rst | 2 +-
doc/users/text_intro.rst | 2 +-
doc/users/text_props.rst | 2 +-
doc/users/tight_layout_guide.rst | 14 +-
doc/users/transforms_tutorial.rst | 3 +-
doc/users/usetex.rst | 4 +-
doc/users/whats_new.rst | 81 +++
doc/users/whats_new/boxplot_zorder_kwarg.rst | 11 -
doc/users/whats_new/filled_plus_and_x_markers.rst | 7 -
doc/users/whats_new/plot_surface.rst | 15 -
doc/users/whats_new/streamplot_zorder.rst | 7 -
examples/frontpage/plot_3D.py | 4 +-
examples/frontpage/plot_contour.py | 4 +-
examples/frontpage/plot_histogram.py | 4 +-
examples/frontpage/plot_membrane.py | 4 +-
examples/pie_and_polar_charts/pie_demo_features.py | 37 +-
examples/pylab_examples/image_masked.py | 43 +-
examples/pylab_examples/polar_demo.py | 6 +-
examples/pylab_examples/scatter_demo2.py | 4 +-
examples/pylab_examples/simple_plot.py | 2 +-
lib/matplotlib/__init__.py | 15 +-
lib/matplotlib/_color_data.py | 21 +-
lib/matplotlib/_version.py | 4 +-
lib/matplotlib/animation.py | 2 +-
lib/matplotlib/axes/_axes.py | 41 +-
lib/matplotlib/axes/_base.py | 6 +-
lib/matplotlib/backend_bases.py | 4 +-
lib/matplotlib/backends/backend_pgf.py | 16 +-
lib/matplotlib/backends/backend_qt5.py | 44 +-
lib/matplotlib/backends/backend_qt5agg.py | 33 +-
lib/matplotlib/cbook.py | 18 +-
lib/matplotlib/collections.py | 1 +
lib/matplotlib/colors.py | 14 +-
lib/matplotlib/dates.py | 6 +-
lib/matplotlib/dviread.py | 2 +-
lib/matplotlib/figure.py | 5 +-
lib/matplotlib/finance.py | 8 +-
lib/matplotlib/font_manager.py | 14 +-
lib/matplotlib/fontconfig_pattern.py | 8 +-
lib/matplotlib/image.py | 9 +-
lib/matplotlib/legend_handler.py | 7 +-
lib/matplotlib/lines.py | 2 +
lib/matplotlib/mlab.py | 6 +-
lib/matplotlib/patches.py | 6 +-
lib/matplotlib/pyplot.py | 11 +-
lib/matplotlib/rcsetup.py | 14 +-
lib/matplotlib/sankey.py | 2 +-
lib/matplotlib/sphinxext/tests/test_tinypages.py | 2 +-
lib/matplotlib/stackplot.py | 2 +-
lib/matplotlib/testing/compare.py | 4 +-
lib/matplotlib/testing/decorators.py | 2 +-
.../test_axes/specgram_angle_freqs.png | Bin 132788 -> 132870 bytes
.../test_axes/specgram_angle_noise.png | Bin 51705 -> 51787 bytes
.../baseline_images/test_axes/specgram_freqs.png | Bin 59969 -> 60039 bytes
.../test_axes/specgram_freqs_linear.png | Bin 59969 -> 60039 bytes
.../test_axes/specgram_magnitude_freqs.png | Bin 25560 -> 25653 bytes
.../test_axes/specgram_magnitude_freqs_linear.png | Bin 25560 -> 25653 bytes
.../test_axes/specgram_magnitude_noise.png | Bin 53017 -> 53101 bytes
.../test_axes/specgram_magnitude_noise_linear.png | Bin 53017 -> 53101 bytes
.../baseline_images/test_axes/specgram_noise.png | Bin 53093 -> 53174 bytes
.../test_axes/specgram_noise_linear.png | Bin 53093 -> 53174 bytes
.../test_axes/specgram_phase_freqs.png | Bin 43647 -> 43715 bytes
.../test_axes/specgram_phase_noise.png | Bin 40271 -> 40356 bytes
lib/matplotlib/tests/test_axes.py | 6 +
lib/matplotlib/tests/test_backend_pgf.py | 2 +-
lib/matplotlib/tests/test_coding_standards.py | 1 -
lib/matplotlib/tests/test_colors.py | 32 +-
lib/matplotlib/tests/test_dates.py | 5 +
lib/matplotlib/tests/test_image.py | 9 +
lib/matplotlib/tests/test_legend.py | 40 +-
lib/matplotlib/tests/test_ticker.py | 6 +-
lib/matplotlib/texmanager.py | 2 +-
lib/matplotlib/ticker.py | 13 +-
matplotlibrc.template | 10 +-
setup.cfg.template | 16 +-
setup.py | 1 +
setupext.py | 4 +-
src/_backend_agg.h | 8 +-
src/_backend_agg_wrapper.cpp | 4 +-
src/_png.cpp | 2 +
src/ft2font.cpp | 8 +-
src/ft2font.h | 8 +-
src/ft2font_wrapper.cpp | 48 +-
tests.py | 9 +-
tools/github_stats.py | 38 +-
142 files changed, 2039 insertions(+), 1122 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 0354378..e2bf8ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,6 +69,9 @@ before_install:
- pip install --upgrade virtualenv
- virtualenv --python=python venv
- source venv/bin/activate
+ # test with non-ascii in path
+ - mkdir /tmp/λ
+ - export PATH=$PATH:/tmp/λ
- export PATH=/usr/lib/ccache:$PATH
install:
@@ -113,7 +116,7 @@ install:
cp .travis/setup.cfg .
fi;
- - python setup.py install
+ - pip install -ve ./
- |
script:
diff --git a/INSTALL b/INSTALL
index 28f1caa..74dd8f6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -57,7 +57,7 @@ one of the `scipy-stack compatible Python distributions
Enthought Canopy, or Continuum Anaconda, which have matplotlib and many
of its dependencies, plus other useful packages, preinstalled.
-For `standard Python <https://www.python.org/download/>`_ installations,
+For `standard Python <https://www.python.org/downloads/>`_ installations,
install matplotlib using pip_::
python -m pip install -U pip setuptools
@@ -65,23 +65,23 @@ install matplotlib using pip_::
In case Python 2.7 or 3.4 are not installed for all users,
the Microsoft Visual C++ 2008 (
-`64 bit <http://www.microsoft.com/download/en/details.aspx?id=15336>`__
+`64 bit <https://www.microsoft.com/en-us/download/details.aspx?id=15336>`__
or
-`32 bit <http://www.microsoft.com/download/en/details.aspx?id=29>`__
+`32 bit <https://www.microsoft.com/en-us/download/details.aspx?id=29>`__
for Python 2.7) or Microsoft Visual C++ 2010 (
-`64 bit <http://www.microsoft.com/en-us/download/details.aspx?id=14632>`__
+`64 bit <https://www.microsoft.com/en-us/download/details.aspx?id=14632>`__
or
-`32 bit <http://www.microsoft.com/en-us/download/details.aspx?id=5555>`__
+`32 bit <https://www.microsoft.com/en-us/download/details.aspx?id=5555>`__
for Python 3.4) redistributable packages need to be installed.
Matplotlib depends on `Pillow <https://pypi.python.org/pypi/Pillow>`_
for reading and saving JPEG, BMP, and TIFF image files.
-Matplotlib requires `MiKTeX <http://miktex.org/>`_ and
-`GhostScript <http://www.ghostscript.com/download/>`_ for rendering text
+Matplotlib requires `MiKTeX <https://miktex.org/>`_ and
+`GhostScript <https://ghostscript.com/download/>`_ for rendering text
with LaTeX.
`FFmpeg <https://www.ffmpeg.org/>`_, `avconv <https://libav.org/>`_,
`mencoder <http://www.mplayerhq.hu>`_, or
-`ImageMagick <http://www.imagemagick.org/>`_ are required for the
+`ImageMagick <http://www.imagemagick.org/script/index.php>`_ are required for the
animation module.
The following backends should work out of the box: agg, tkagg, ps,
@@ -146,7 +146,7 @@ python, numpy, libpng and freetype), you can build matplotlib::
python setup.py install
We provide a `setup.cfg
-<https://github.com/matplotlib/matplotlib/raw/master/setup.cfg.template>`_
+<https://raw.githubusercontent.com/matplotlib/matplotlib/master/setup.cfg.template>`_
file that goes with :file:`setup.py` which you can use to customize
the build process. For example, which default backend to use, whether
some of the optional libraries that matplotlib ships with are
@@ -177,13 +177,13 @@ themselves.
Required Dependencies
^^^^^^^^^^^^^^^^^^^^^
-:term:`python` 2.7, 3.4, or 3.5
- `Download python <http://www.python.org/download/>`_.
+:term:`python` 2.7, 3.4, 3.5 or 3.6
+ `Download python <https://www.python.org/downloads/>`_.
:term:`numpy` |minimum_numpy_version| (or later)
- array support for python (`download numpy <http://numpy.org>`_)
+ array support for python (`download numpy <http://www.numpy.org>`_)
-`setuptools <http://pythonhosted.org/setuptools/>`__
+`setuptools <https://setuptools.readthedocs.io/en/latest/>`__
Setuptools provides extensions for python package installation.
:term:`dateutil` 1.1 or later
@@ -202,7 +202,8 @@ Required Dependencies
zlib.
`pytz <http://pytz.sourceforge.net/>`__
- Used to manipulate time-zone aware datetimes. http://pypi.python.org/pypi/pytz
+ Used to manipulate time-zone aware datetimes.
+ https://pypi.python.org/pypi/pytz
:term:`FreeType` 2.3 or later
Library for reading true type font files. If using pip, easy_install or
@@ -260,17 +261,17 @@ Optional external programs
Required for the animation module to be save out put to movie
formats.
-`ImageMagick <http://www.imagemagick.org/>`__
+`ImageMagick <http://www.imagemagick.org/script/index.php>`__
Required for the animation module to be able to save to animated gif.
Optional dependencies
^^^^^^^^^^^^^^^^^^^^^
-`Pillow <http://python-pillow.github.io/>`__
+`Pillow <http://python-pillow.org/>`__
If Pillow is installed, matplotlib can read and write a larger
selection of image file formats.
-`pkg-config <http://www.freedesktop.org/wiki/Software/pkg-config/>`__
+`pkg-config <https://www.freedesktop.org/wiki/Software/pkg-config/>`__
A tool used to find required non-python libraries. This is not strictly
required, but can make installation go more smoothly if the libraries and
headers are not in the expected locations.
@@ -330,9 +331,9 @@ git repository and follow the instruction in :file:`README.osx`.
Building on Windows
-------------------
-The Python shipped from http://www.python.org is compiled with Visual Studio
+The Python shipped from https://www.python.org is compiled with Visual Studio
2008 for versions before 3.3, Visual Studio 2010 for 3.3 and 3.4, and
-Visual Studio 2015 for 3.5. Python extensions are recommended to be compiled
+Visual Studio 2015 for 3.5 and 3.6. Python extensions are recommended to be compiled
with the same compiler.
Since there is no canonical Windows package manager, the methods for building
diff --git a/doc/README.txt b/doc/README.txt
index 5a9f818..b7c66c8 100644
--- a/doc/README.txt
+++ b/doc/README.txt
@@ -1,4 +1,4 @@
-maptlotlib documentation
+Matplotlib documentation
========================
@@ -19,7 +19,7 @@ To build the HTML documentation, type ``python make.py html`` in this
directory. The top file of the results will be ./build/html/index.html
**Note that Sphinx uses the installed version of the package to build the
-documentation**: matplotlib must be installed *before* the docs can be
+documentation**: Matplotlib must be installed *before* the docs can be
generated.
You can build the documentation with several options:
@@ -31,25 +31,25 @@ You can build the documentation with several options:
Organization
-------------
-This is the top level build directory for the matplotlib
+This is the top level build directory for the Matplotlib
documentation. All of the documentation is written using sphinx, a
python documentation system built on top of ReST. This directory contains
* users - the user documentation, e.g., plotting tutorials, configuration
tips, etc.
-* devel - documentation for matplotlib developers
+* devel - documentation for Matplotlib developers
* faq - frequently asked questions
* api - placeholders to automatically generate the api documentation
* mpl_toolkits - documentation of individual toolkits that ship with
- matplotlib
+ Matplotlib
* make.py - the build script to build the html or PDF docs
-* index.rst - the top level include document for matplotlib docs
+* index.rst - the top level include document for Matplotlib docs
* conf.py - the sphinx configuration
@@ -59,6 +59,6 @@ python documentation system built on top of ReST. This directory contains
* sphinxext - Sphinx extensions for the mpl docs
-* mpl_examples - a link to the matplotlib examples in case any
+* mpl_examples - a link to the Matplotlib examples in case any
documentation wants to literal include them
diff --git a/doc/_static/.gitignore b/doc/_static/.gitignore
new file mode 100644
index 0000000..bbdc344
--- /dev/null
+++ b/doc/_static/.gitignore
@@ -0,0 +1,5 @@
+contour_frontpage.png
+histogram_frontpage.png
+membrane_frontpage.png
+surface3d_frontpage.png
+
diff --git a/doc/_static/contour_frontpage.png b/doc/_static/contour_frontpage.png
deleted file mode 100644
index dfa518a..0000000
Binary files a/doc/_static/contour_frontpage.png and /dev/null differ
diff --git a/doc/_static/histogram_frontpage.png b/doc/_static/histogram_frontpage.png
deleted file mode 100644
index a4ff5ed..0000000
Binary files a/doc/_static/histogram_frontpage.png and /dev/null differ
diff --git a/doc/_static/membrane_frontpage.png b/doc/_static/membrane_frontpage.png
deleted file mode 100644
index d1119b7..0000000
Binary files a/doc/_static/membrane_frontpage.png and /dev/null differ
diff --git a/doc/_static/mpl.css b/doc/_static/mpl.css
index 0b5bce4..bf571bc 100644
--- a/doc/_static/mpl.css
+++ b/doc/_static/mpl.css
@@ -738,8 +738,8 @@ div.responsive_screenshots {
margin: auto;
/* Do not go beyond 1:1 scale (and ensure a 1x4 tight layout) */
- max-width: 648px; /* at most 4 x 1:1 subfig width */
- max-height: 139px; /* at most 1 x 1:1 subfig height */
+ max-width: 640px; /* at most 4 x 1:1 subfig width */
+ max-height: 120px; /* at most 1 x 1:1 subfig height */
}
/* To avoid subfigure parts outside of the responsive_screenshots */
diff --git a/doc/_static/surface3d_frontpage.png b/doc/_static/surface3d_frontpage.png
deleted file mode 100644
index 065c6f1..0000000
Binary files a/doc/_static/surface3d_frontpage.png and /dev/null differ
diff --git a/doc/_templates/citing.html b/doc/_templates/citing.html
index 74f8af8..51f08bc 100644
--- a/doc/_templates/citing.html
+++ b/doc/_templates/citing.html
@@ -1,10 +1,10 @@
{% extends "layout.html" %}
-{% set title = "Citing matplotlib" %}
+{% set title = "Citing Matplotlib" %}
{% block body %}
-<h1>Citing matplotlib</h1>
+<h1>Citing Matplotlib</h1>
<p>
-If matplotlib contributes to a project that leads to a scientific publication,
+If Matplotlib contributes to a project that leads to a scientific publication,
please acknowledge this fact by citing the project. You can use this
BibTeX entry:
</p>
diff --git a/doc/_templates/index.html b/doc/_templates/index.html
index fd2db55..2b8c644 100644
--- a/doc/_templates/index.html
+++ b/doc/_templates/index.html
@@ -1,5 +1,5 @@
{% extends "layout.html" %}
-{% set title = 'matplotlib: python plotting' %}
+{% set title = 'Matplotlib: Python plotting' %}
{% block extrahead %}
<script>
@@ -41,16 +41,13 @@ function getSnippet(id, url) {
<h1>Introduction</h1>
- <p>matplotlib is a python 2D plotting library which produces
+ <p>Matplotlib is a Python 2D plotting library which produces
publication quality figures in a variety of hardcopy formats and
- interactive environments across platforms. matplotlib can be used
- in python scripts, the python and <a
- href="http://ipython.org">ipython</a> shell (ala
- MATLAB<sup>®<a name="matlab" href="#ftn.matlab">*</a></sup>
- or
- Mathematica<sup>®<a name="mathematica"
- href="#ftn.mathematica">†</a></sup>),
- web application servers, and six graphical user
+ interactive environments across platforms. Matplotlib can be used
+ in Python scripts, the Python and <a
+ href="http://ipython.org">IPython</a> shell,
+ the <a href="http://jupyter.org/index.html">jupyter</a> notebook,
+ web application servers, and four graphical user
interface toolkits.</p>
<div class="responsive_screenshots">
@@ -71,52 +68,26 @@ function getSnippet(id, url) {
</div>
<span class="clear_screenshots"></span>
- <p>matplotlib tries to make easy things easy and hard things possible.
+ <p>Matplotlib tries to make easy things easy and hard things possible.
You can generate plots, histograms, power spectra, bar charts,
- errorcharts, scatterplots, etc, with just a few lines of code.
+ errorcharts, scatterplots, etc., with just a few lines of code.
For a sampling, see the <a href="{{ pathto('users/screenshots') }}">screenshots</a>, <a href="{{ pathto('gallery') }}">thumbnail</a> gallery, and
<a href="{{ pathto('examples/index') }}">examples</a> directory</p>
-<p>For simple plotting the <tt>pyplot</tt> interface provides a
+<p>For simple plotting the <tt>pyplot</tt> module provides a
MATLAB-like interface, particularly when combined
with <tt>IPython</tt>. For the power user, you have full control
of line styles, font properties, axes properties, etc, via an object
oriented interface or via a set of functions familiar to MATLAB
users.</p>
-<div style="float: right; min-width: 450px; width: 50%; padding-left: 5%;">
- <h1>John Hunter (1968-2012)</h1>
- <table bgcolor="#ddddff">
- <tr>
- <td>
- <img src="_static/John-hunter-crop-2.jpg" align="left" />
- </td>
- <td>
- <p>
- On August 28 2012, John D. Hunter, the creator of matplotlib, died
- from complications arising from cancer treatment, after a brief but
- intense battle with this terrible illness. John is survived by his
- wife Miriam, his three daughters Rahel, Ava and Clara, his sisters
- Layne and Mary, and his mother Sarah.</p>
-
- <p>
- If you have benefited from John's many contributions, please say
- thanks in the way that would matter most to him. Please consider
- making a donation to
- the <a href="http://numfocus.org/johnhunter/">John Hunter Technology
- Fellowship</a>.</p>
- </td>
- </tr>
- </table>
-</div>
-
<h1>Installation</h1>
- Visit the <a href="{{ pathto('users/installing') }}">matplotlib installation instructions</a>.
+ Visit the <a href="{{ pathto('users/installing') }}">Matplotlib installation instructions</a>.
<h1>Documentation</h1>
- This is the documentation for matplotlib version {{ version }}.
+ This is the documentation for Matplotlib version {{ version }}.
<p id="other_versions"></p>
<script>
@@ -135,29 +106,28 @@ function getSnippet(id, url) {
<h4>Need help?</h4>
-<p>matplotlib is a welcoming, inclusive project, and we try to follow
+<p>Matplotlib is a welcoming, inclusive project, and we try to follow
the <a href="http://www.python.org/psf/codeofconduct/">Python Software
Foundation Code of Conduct</a> in everything we do.</p>
<p>Check the <a href="{{ pathto('faq/index') }}">faq</a>,
-the <a href="{{ pathto('api/index') }}">api</a> docs,
-<a href="http://matplotlib.1069221.n5.nabble.com/matplotlib-users-f3.html">mailing
-list archives</a>, and join the matplotlib
-mailing lists <a href="https://mail.python.org/mailman/listinfo/matplotlib-users">Users</a>,
+the <a href="{{ pathto('api/index') }}">api</a> docs and
+<a href="http://matplotlib.1069221.n5.nabble.com/matplotlib-users-f3.html">mailing list archives</a> for resources.
+Join the <a href="https://gitter.im/matplotlib/matplotlib">gitter</a> and the mailing lists: <a href="https://mail.python.org/mailman/listinfo/matplotlib-users">Users</a>,
<a href="https://mail.python.org/mailman/listinfo/matplotlib-announce">Announce</a> and
<a href="https://mail.python.org/mailman/listinfo/matplotlib-devel">Devel</a>.
-Check out the matplotlib questions
+Check out the Matplotlib questions
on <a href="http://stackoverflow.com/questions/tagged/matplotlib">stackoverflow</a>.
The <a href="{{ pathto('search') }}">search</a> tool searches all of
the documentation, including full text search of over 350 complete
-examples which exercise almost every corner of matplotlib.</p>
+examples which exercise almost every corner of Matplotlib.</p>
<p>You can file bugs, patches and feature requests on the
github
<a href="https://github.com/matplotlib/matplotlib/issues?sort=created&direction=desc&state=open">tracker</a>,
but it is a good idea to ping us on the mailing list too.</p>
-<p>To keep up to date with what's going on in matplotlib, see
+<p>To keep up to date with what's going on in Matplotlib, see
the <a href="{{ pathto('users/whats_new.html', 1) }}">what's new
page</a> or browse the <a href="https://github.com/matplotlib/matplotlib">source
code</a>. Anything that could require changes to your existing code
@@ -166,7 +136,7 @@ changes</a> file.</p>
<h1>Toolkits</h1>
-<p>There are several matplotlib add-on <a href="{{ pathto('mpl_toolkits/index') }}">toolkits</a>,
+<p>There are several Matplotlib add-on <a href="{{ pathto('mpl_toolkits/index') }}">toolkits</a>,
including a choice of two projection and mapping toolkits <a href="http://matplotlib.org/basemap">basemap</a> and
<a href="http://scitools.org.uk/cartopy/docs/latest">cartopy</a>,
3d plotting with <a href="{{ pathto('mpl_toolkits/mplot3d/index') }}">mplot3d</a>,
@@ -177,14 +147,14 @@ several higher-level plotting interfaces
<a href="http://ggplot.yhathq.com">ggplot</a>, and more.
</p>
-<h1>Citing matplotlib</h1>
+<h1>Citing Matplotlib</h1>
<p>
- matplotlib is the brainchild of John Hunter (1968-2012), who, along with its many
+ Matplotlib is the brainchild of John Hunter (1968-2012), who, along with its many
contributors, have put an immeasurable amount of time and effort into producing a
piece of software utilized by thousands of scientists worldwide.
- If matplotlib contributes to a project that leads to a scientific publication,
+ If Matplotlib contributes to a project that leads to a scientific publication,
please acknowledge this work by citing the project. You can use this
<a href="{{ pathto('citing') }}">ready-made citation entry</a>.
</p>
@@ -195,12 +165,12 @@ several higher-level plotting interfaces
<p>
Please
consider <a href="https://www.flipcause.com/widget/MjI1OA==">donating
-to the matplotlib project</a> through the Numfocus organization or to
+to the Matplotlib project</a> through the Numfocus organization or to
the <a href="http://numfocus.org/johnhunter/">John Hunter Technology Fellowship</a>.
</p>
<p>
-The matplotlib <a href="{{ pathto('users/license') }}">license</a> is based on the Python Software Foundation
+The Matplotlib <a href="{{ pathto('users/license') }}">license</a> is based on the Python Software Foundation
<a href="http://www.python.org/psf/license">(PSF)</a> license.
</p>
@@ -221,9 +191,5 @@ are tracked at Github too.
<sup><a name="ftn.matlab" href="#matlab">*</a></sup>
MATLAB is a registered trademark of The MathWorks, Inc.
</p>
-<p>
-<sup><a name="ftn.mathematica" href="#mathematica">†</a></sup>
-Mathematica is a registered trademark of Wolfram Research, Inc.
-</p>
{% endblock %}
diff --git a/doc/api/api_changes.rst b/doc/api/api_changes.rst
index 7ec2236..50fd30a 100644
--- a/doc/api/api_changes.rst
+++ b/doc/api/api_changes.rst
@@ -3,11 +3,11 @@
API Changes
=============
-Log of changes to matplotlib that affect the outward-facing API. If
-updating matplotlib breaks your scripts, this list may help you figure
+Log of changes to Matplotlib that affect the outward-facing API. If
+updating Matplotlib breaks your scripts, this list may help you figure
out what caused the breakage and how to fix it by updating your code.
-For new features that were added to matplotlib, please see
+For new features that were added to Matplotlib, please see
:ref:`whats-new`.
@@ -192,6 +192,29 @@ figure which is raising an error on draw. The previous behavior would only mark
a figure as not stale after a full re-draw succeeded.
+The spectral colormap is now nipy_spectral
+------------------------------------------
+
+The colormaps formerly known as ``spectral`` and ``spectral_r`` have been
+replaced by ``nipy_spectral`` and ``nipy_spectral_r`` since Matplotlib
+1.3.0. Even though the colormap was deprecated in Matplotlib 1.3.0, it never
+raised a warning. As of Matplotlib 2.0.0, using the old names raises a
+deprecation warning. In the future, using the old names will raise an error.
+
+Default install no longer includes test images
+----------------------------------------------
+
+To reduce the size of wheels and source installs, the tests and
+baseline images are no longer included by default.
+
+To restore installing the tests and images, use a `setup.cfg` with ::
+
+ [packages]
+ tests = True
+ toolkits_tests = True
+
+in the source directory at build/install time.
+
Changes in 1.5.3
================
@@ -305,7 +328,7 @@ demonstrates the difference. Use of the old contouring algorithm, which is
obtained with `corner_mask='legacy'`, is now deprecated.
Contour labels may now appear in different places than in earlier versions of
-matplotlib.
+Matplotlib.
In addition, the keyword argument `nchunk` now applies to
:func:`~matplotlib.pyplot.contour` as well as
@@ -536,7 +559,7 @@ Removed `Lena` images from sample_data
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The ``lena.png`` and ``lena.jpg`` images have been removed from
-matplotlib's sample_data directory. The images are also no longer
+Matplotlib's sample_data directory. The images are also no longer
available from `matplotlib.cbook.get_sample_data`. We suggest using
`matplotlib.cbook.get_sample_data('grace_hopper.png')` or
`matplotlib.cbook.get_sample_data('grace_hopper.jpg')` instead.
@@ -706,7 +729,7 @@ original location:
* The Sphinx extensions `ipython_directive` and
`ipython_console_highlighting` have been moved to the IPython
- project itself. While they remain in matplotlib for this release,
+ project itself. While they remain in Matplotlib for this release,
they have been deprecated. Update your extensions in `conf.py` to
point to `IPython.sphinxext.ipython_directive` instead of
`matplotlib.sphinxext.ipython_directive`.
@@ -841,7 +864,7 @@ original location:
* Clipping is now off by default on offset boxes.
-* matplotlib now uses a less-aggressive call to ``gc.collect(1)`` when
+* Matplotlib now uses a less-aggressive call to ``gc.collect(1)`` when
closing figures to avoid major delays with large numbers of user objects
in memory.
@@ -955,7 +978,7 @@ Code deprecation
* The `ScalarMappable` class' `set_colorbar` is now
deprecated. Instead, the
:attr:`matplotlib.cm.ScalarMappable.colorbar` attribute should be
- used. In previous matplotlib versions this attribute was an
+ used. In previous Matplotlib versions this attribute was an
undocumented tuple of ``(colorbar_instance, colorbar_axes)`` but is
now just ``colorbar_instance``. To get the colorbar axes it is
possible to just use the
@@ -1062,7 +1085,7 @@ Configuration and rcParams
* On Linux, the user-specific `matplotlibrc` configuration file is now
located in `~/.config/matplotlib/matplotlibrc` to conform to the
`XDG Base Directory Specification
- <http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html>`_.
+ <https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html>`_.
* The `font.*` rcParams now affect only text objects created after the
rcParam has been set, and will not retroactively affect already
@@ -1141,7 +1164,7 @@ Changes in 1.2.x
ax = projection_class(self, rect, **kwargs)
This change means that third party objects can expose themselves as
- matplotlib axes by providing a ``_as_mpl_axes`` method. See
+ Matplotlib axes by providing a ``_as_mpl_axes`` method. See
:ref:`adding-new-scales` for more detail.
* A new keyword *extendfrac* in :meth:`~matplotlib.pyplot.colorbar` and
@@ -1396,7 +1419,7 @@ Changes in 0.99
* Polar plots no longer accept a resolution kwarg. Instead, each Path
must specify its own number of interpolation steps. This is
unlikely to be a user-visible change -- if interpolation of data is
- required, that should be done before passing it to matplotlib.
+ required, that should be done before passing it to Matplotlib.
Changes for 0.98.x
==================
@@ -1533,7 +1556,7 @@ Changes for 0.98.0
color cycle: :func:`matplotlib.axes.set_default_color_cycle` and
:meth:`matplotlib.axes.Axes.set_color_cycle`.
-* matplotlib now requires Python 2.4, so :mod:`matplotlib.cbook` will
+* Matplotlib now requires Python 2.4, so :mod:`matplotlib.cbook` will
no longer provide :class:`set`, :func:`enumerate`, :func:`reversed`
or :func:`izip` compatibility functions.
diff --git a/doc/api/index.rst b/doc/api/index.rst
index 23a5e41..7fb728f 100644
--- a/doc/api/index.rst
+++ b/doc/api/index.rst
@@ -44,6 +44,7 @@
patheffects_api.rst
projections_api.rst
pyplot_api.rst
+ rcsetup_api.rst
sankey_api.rst
scale_api.rst
spines_api.rst
diff --git a/doc/api/rcsetup_api.rst b/doc/api/rcsetup_api.rst
new file mode 100644
index 0000000..b0c30d8
--- /dev/null
+++ b/doc/api/rcsetup_api.rst
@@ -0,0 +1,12 @@
+*******
+rcsetup
+*******
+
+
+:mod:`matplotlib.rcsetup`
+=========================
+
+.. automodule:: matplotlib.rcsetup
+ :members:
+ :undoc-members:
+ :show-inheritance:
diff --git a/doc/conf.py b/doc/conf.py
index 849ac11..7cfb4d2 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -41,7 +41,7 @@ try:
from IPython.sphinxext import ipython_console_highlighting
except ImportError:
raise ImportError(
- "IPython must be installed to build the matplotlib docs")
+ "IPython must be installed to build the Matplotlib docs")
else:
extensions.append('IPython.sphinxext.ipython_console_highlighting')
extensions.append('IPython.sphinxext.ipython_directive')
@@ -70,7 +70,7 @@ except ImportError:
try:
import matplotlib
except ImportError:
- msg = "Error: matplotlib must be installed before building the documentation"
+ msg = "Error: Matplotlib must be installed before building the documentation"
sys.exit(msg)
@@ -93,8 +93,8 @@ master_doc = 'contents'
# General substitutions.
project = 'Matplotlib'
copyright = ('2002 - 2012 John Hunter, Darren Dale, Eric Firing, '
- 'Michael Droettboom and the matplotlib development '
- 'team; 2012 - 2016 The matplotlib development team')
+ 'Michael Droettboom and the Matplotlib development '
+ 'team; 2012 - 2016 The Matplotlib development team')
# The default replacements for |version| and |release|, also used in various
# other places throughout the built documents.
@@ -162,7 +162,7 @@ mpl_example_sections = [
# Github extension
-github_project_url = "http://github.com/matplotlib/matplotlib/"
+github_project_url = "https://github.com/matplotlib/matplotlib/"
# Options for HTML output
# -----------------------
diff --git a/doc/devel/MEP/MEP11.rst b/doc/devel/MEP/MEP11.rst
index 6727403..4a76d56 100644
--- a/doc/devel/MEP/MEP11.rst
+++ b/doc/devel/MEP/MEP11.rst
@@ -117,7 +117,7 @@ Implementation
For installing from source, and assuming the user has all of the
C-level compilers and dependencies, this can be accomplished fairly
easily using `distribute` and following the instructions `here
-<http://packages.python.org/distribute/>`_. The only anticipated
+<https://pypi.python.org/pypi/distribute>`_. The only anticipated
change to the matplotlib library code will be to import `pyparsing`
from the top-level namespace rather than from within matplotlib. Note
that `distribute` will also allow us to remove the direct dependency
diff --git a/doc/devel/MEP/MEP12.rst b/doc/devel/MEP/MEP12.rst
index d66929c..a01e451 100644
--- a/doc/devel/MEP/MEP12.rst
+++ b/doc/devel/MEP/MEP12.rst
@@ -87,6 +87,7 @@ the gallery would remain in those directories until they are cleaned
up. After clean-up, they would be moved to one of the new gallery
sections described above. "Clean-up" should involve:
+
* PEP8_ clean-ups (running `flake8
<https://pypi.python.org/pypi/flake8>`_, or a similar checker, is
highly recommended)
@@ -127,8 +128,8 @@ page instead of the gallery examples.
references to that example. For example, the API documentation for
`axes.py` and `pyplot.py` may use these examples to generate
plots. Use your favorite search tool (e.g., grep, ack, `grin
-<http://pypi.python.org/pypi/grin>`_, `pss
-<http://pypi.python.org/pypi/pss>`_) to search the matplotlib
+<https://pypi.python.org/pypi/grin>`_, `pss
+<https://pypi.python.org/pypi/pss>`_) to search the matplotlib
package. See `2dc9a46
<https://github.com/tonysyu/matplotlib/commit/2dc9a4651e5e566afc0866c603aa8d06aaf32b71>`_
and `aa6b410
@@ -178,10 +179,10 @@ the entry point to these examples, and sections could really help users
navigate the gallery. Thus, tags are complementary to this reorganization.
-.. _PEP8: http://www.python.org/dev/peps/pep-0008/
+.. _PEP8: https://www.python.org/dev/peps/pep-0008/
-.. [1] http://github.com/matplotlib/matplotlib/pull/714
-.. [2] http://github.com/matplotlib/matplotlib/issues/524
+.. [1] https://github.com/matplotlib/matplotlib/pull/714
+.. [2] https://github.com/matplotlib/matplotlib/issues/524
.. [3] http://matplotlib.1069221.n5.nabble.com/Matplotlib-gallery-td762.html#a33379091
-.. [4] http://www.loria.fr/~rougier/teaching/matplotlib/
-.. [5] http://www.loria.fr/~rougier/coding/gallery/
+.. [4] http://www.labri.fr/perso/nrougier/teaching/matplotlib/
+.. [5] http://www.labri.fr/perso/nrougier/coding/gallery/
diff --git a/doc/devel/MEP/MEP13.rst b/doc/devel/MEP/MEP13.rst
index 3200a1b..db2f8b1 100644
--- a/doc/devel/MEP/MEP13.rst
+++ b/doc/devel/MEP/MEP13.rst
@@ -20,7 +20,7 @@ Abstract
Wrap all of the matplotlib getter and setter methods with python
`properties
-<http://docs.python.org/2/library/functions.html#property>`_, allowing
+<https://docs.python.org/3/library/functions.html#property>`_, allowing
them to be read and written like class attributes.
Detailed description
diff --git a/doc/devel/MEP/MEP14.rst b/doc/devel/MEP/MEP14.rst
index 9542b68..b40a3f5 100644
--- a/doc/devel/MEP/MEP14.rst
+++ b/doc/devel/MEP/MEP14.rst
@@ -74,20 +74,20 @@ Supporting these things is difficult, and is the "full-time job" of a
number of other projects:
- `pango <http://www.pango.org/>`_/`harfbuzz
- <http://www.harfbuzz.org/>`_
+ <https://www.freedesktop.org/wiki/Software/HarfBuzz/>`_
- `QtTextLayout
- <http://qt-project.org/doc/qt-4.8/qtextlayout.html>`_
+ <http://doc.qt.io/qt-4.8/qtextlayout.html>`_
- `Microsoft DirectWrite
- <http://msdn.microsoft.com/en-us/library/windows/desktop/dd371554(v=vs.85).aspx>`_
+ <https://msdn.microsoft.com/en-us/library/windows/desktop/dd371554(v=vs.85).aspx>`_
- `Apple Core Text
- <https://developer.apple.com/library/mac/#documentation/StringsTextFonts/Conceptual/CoreText_Programming/Overview/Overview.html>`_
+ <https://developer.apple.com/library/content/documentation/StringsTextFonts/Conceptual/CoreText_Programming/Overview/Overview.html>`_
Of the above options, it should be noted that `harfbuzz` is designed
from the start as a cross platform option with minimal dependencies,
so therefore is a good candidate for a single option to support.
Additionally, for supporting rich text, we could consider using
-`WebKit <http://www.webkit.org/>`_, and possibly whether than
+`WebKit <https://webkit.org/>`_, and possibly whether than
represents a good single cross-platform option. Again, however, rich
text formatting is outside of the scope of this project.
@@ -133,7 +133,7 @@ which matches fonts using our own algorithm based on the `CSS font
matching algorithm <http://www.w3.org/TR/CSS2/fonts.html#algorithm>`_.
It doesn't always do the same thing as the native font selection
algorithms on Linux (`fontconfig
-<http://www.freedesktop.org/wiki/Software/fontconfig/>`_), Mac and
+<https://www.freedesktop.org/wiki/Software/fontconfig/>`_), Mac and
Windows, and it doesn't always find all of the fonts on the system
that the OS would normally pick up. However, it is cross-platform,
and always finds the fonts that ship with matplotlib. The Cairo and
@@ -152,7 +152,7 @@ lookup mechanism must only match against those fonts. It is unclear
whether the OS-native font lookup systems can handle this case.
There is also experimental support for using `fontconfig
-<http://www.freedesktop.org/wiki/Software/fontconfig/>`_ for font
+<https://www.freedesktop.org/wiki/Software/fontconfig/>`_ for font
selection in matplotlib, turned off by default. fontconfig is the
native font selection algorithm on Linux, but is also cross platform
and works well on the other platforms (though obviously is an
diff --git a/doc/devel/MEP/MEP25.rst b/doc/devel/MEP/MEP25.rst
index 0c41348..f4974bd 100644
--- a/doc/devel/MEP/MEP25.rst
+++ b/doc/devel/MEP/MEP25.rst
@@ -126,7 +126,7 @@ Implementation
* A simple NB demonstrating some functionality for
``Line2DController`` objects:
- http://nbviewer.ipython.org/gist/theengineear/f0aa8d79f64325e767c0
+ https://nbviewer.jupyter.org/gist/theengineear/f0aa8d79f64325e767c0
2. Write in protocols for the ``Controller`` to *update* the model.
diff --git a/doc/devel/coding_guide.rst b/doc/devel/coding_guide.rst
index 8ff8508..dbf6856 100644
--- a/doc/devel/coding_guide.rst
+++ b/doc/devel/coding_guide.rst
@@ -64,8 +64,8 @@ PR Review guidelines
* Make sure the Travis tests are passing before merging.
- The Travis tests automatically test on all of the Python versions
- matplotlib supports whenever a pull request is created or updated.
- The `tox` support in matplotlib may be useful for testing locally.
+ Matplotlib supports whenever a pull request is created or updated.
+ The `tox` support in Matplotlib may be useful for testing locally.
* Do not self merge, except for 'small' patches to un-break the CI.
diff --git a/doc/devel/contributing.rst b/doc/devel/contributing.rst
index 83a6fba..d9d1112 100644
--- a/doc/devel/contributing.rst
+++ b/doc/devel/contributing.rst
@@ -21,47 +21,74 @@ also welcome to post feature requests or pull requests.
Retrieving and installing the latest version of the code
========================================================
+When working on the Matplotlib source, setting up a `virtual
+environment
+<http://docs.python-guide.org/en/latest/dev/virtualenvs/>`_ or a
+`conda environment <http://conda.pydata.org/docs/using/envs.html>`_ is
+recommended.
+
+.. warning::
+
+ If you already have a version of Matplotlib installed, use an
+ virtual environment or uninstall using the same method you used
+ to install it. Installing multiple versions of Matplotlib via different
+ methods into the same environment may not always work as expected.
We use `Git <https://git-scm.com/>`_ for version control and
`GitHub <https://github.com/>`_ for hosting our main repository.
-You can check out the latest sources with the command::
+You can check out the latest sources with the command (see
+:ref:`set-up-fork` for more details)::
git clone git at github.com:matplotlib/matplotlib.git
+and navigate to the :file:`matplotlib` directory.
-After obtaining a local copy of the matplotlib source code (:ref:`set-up-fork`),
-navigate to the matplotlib directory and run the following in the shell::
-
- python setup.py develop
+To make sure the tests run locally you must build against the correct version
+of freetype. To configure the build system to fetch and build it either export
+the env ``MPLLOCALFREETYPE`` as::
-or::
-
- pip install -v -e .
+ export MPLLOCALFREETYPE=1
+or copy :file:`setup.cfg.template` to :file:`setup.cfg` and edit it to contain ::
-This installs matplotlib for development (i.e., builds everything and places the
-symbolic links back to the source code).
+ [test]
+ local_freetype = True
-.. warning::
- If you already have a version of matplotlib installed, you will need to
- uninstall it.
+To install Matplotlib (and compile the c-extensions) run the following
+command from the top-level directory ::
+ pip install -v -e ./
-.. note::
-
- If you decide to do install with ``python setup.py develop`` or ``pip
- install -v -e``, you will have to rerun::
-
- python setup.py build
+This installs Matplotlib in 'editable/develop mode', i.e., builds
+everything and places the correct link entries in the install
+directory so that python will be able to import Matplotlib from the
+source directory. Thus, any changes to the ``*.py`` files will be
+reflected the next time you import the library. If you change the
... 5911 lines suppressed ...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/matplotlib.git
More information about the Python-modules-commits
mailing list