Skip to content

Commit 9ba94a7

Browse files
ImportanceOfBeingErnestImportanceOfBeingErnest
authored
Merge branch 'master' into fix-inset_axes
2 parents cbc956a + 213f399 commit 9ba94a7

File tree

216 files changed

+2144
-2066
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

216 files changed

+2144
-2066
lines changed

‎.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ examples/*/*.eps
7474
examples/*/*.svgz
7575
examples/tests/*
7676
!examples/tests/backend_driver.py
77-
texput.log
78-
texput.aux
7977
result_images
8078

8179
# Nose/Pytest generated files #

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ env:
4747
- ARTIFACTS_BUCKET=matplotlib-test-results
4848
- secure: RgJI7BBL8aX5FTOQe7xiXqWHMxWokd6GNUWp1NUV2mRLXPb9dI0RXqZt3UJwKTAzf1z/OtlHDmEkBoTVK81E9iUxK5npwyyjhJ8yTJmwfQtQF2n51Q1Ww9p+XSLORrOzZc7kAo6Kw6FIXN1pfctgYq2bQkrwJPRx/oPR8f6hcbY=
4949
- secure: E7OCdqhZ+PlwJcn+Hd6ns9TDJgEUXiUNEI0wu7xjxB2vBRRIKtZMbuaZjd+iKDqCKuVOJKu0ClBUYxmgmpLicTwi34CfTUYt6D4uhrU+8hBBOn1iiK51cl/aBvlUUrqaRLVhukNEBGZcyqAjXSA/Qsnp2iELEmAfOUa92ZYo1sk=
50-
- secure: "dfjNqGKzQG5bu3FnDNwLG8H/C4QoieFo4PfFmZPdM2RY7WIzukwKFNT6kiDfOrpwt+2bR7FhzjOGlDECGtlGOtYPN8XuXGjhcP4a4IfakdbDfF+D3NPIpf5VlE6776k0VpvcZBTMYJKNFIMc7QPkOwjvNJ2aXyfe3hBuGlKJzQU="
50+
- secure: dfjNqGKzQG5bu3FnDNwLG8H/C4QoieFo4PfFmZPdM2RY7WIzukwKFNT6kiDfOrpwt+2bR7FhzjOGlDECGtlGOtYPN8XuXGjhcP4a4IfakdbDfF+D3NPIpf5VlE6776k0VpvcZBTMYJKNFIMc7QPkOwjvNJ2aXyfe3hBuGlKJzQU=
5151
# Variables controlling Python dependencies.
5252
- CYCLER=cycler
5353
- DATEUTIL=python-dateutil
@@ -156,7 +156,7 @@ install:
156156
python -c 'import pgi as gi; gi.require_version("Gtk", "3.0"); from pgi.repository import Gtk' &&
157157
echo 'pgi is available' ||
158158
echo 'pgi is not available'
159-
python -mpip install pyqt5==5.9 &&
159+
python -mpip install pyqt5 &&
160160
python -c 'import PyQt5.QtCore' &&
161161
echo 'PyQt5 is available' ||
162162
echo 'PyQt5 is not available'

‎INSTALL.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ Matplotlib requires the following dependencies:
142142
* `pytz <http://pytz.sourceforge.net/>`__
143143
* FreeType (>= 2.3)
144144
* `cycler <http://matplotlib.org/cycler/>`__ (>= 0.10.0)
145-
* `six <https://pypi.python.org/pypi/six>`_
145+
* `six <https://pypi.python.org/pypi/six>`_ (>= 1.10)
146146
* `kiwisolver <https://github.com/nucleic/kiwi>`__ (>= 1.0.0)
147147

148148
Optionally, you can also install a number of packages to enable better user
@@ -166,7 +166,7 @@ etc., you can install the following:
166166
<https://libav.org/avconv.html>`_: for saving movies;
167167
* `ImageMagick <https://www.imagemagick.org/script/index.php>`_: for saving
168168
animated gifs;
169-
* `Pillow <https://pillow.readthedocs.io/en/latest/>`_ (>=2.0): for a larger selection of
169+
* `Pillow <https://pillow.readthedocs.io/en/latest/>`_ (>=3.4): for a larger selection of
170170
image file formats: JPEG, BMP, and TIFF image files;
171171
* `LaTeX <https://miktex.org/>`_ and `GhostScript
172172
<https://ghostscript.com/download/>`_ (for rendering text with LaTeX).

‎doc-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Install the documentation requirements with:
77
# pip install -r doc-requirements.txt
88
#
9-
sphinx>=1.3,!=1.5.0,!=1.6.4
9+
sphinx>=1.3,!=1.5.0,!=1.6.4,!=1.7.3
1010
colorspacious
1111
ipython
1212
ipywidgets

‎doc/_static/mpl.css

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,26 @@ figcaption {
768768
text-align: center;
769769
}
770770

771+
772+
/* "Summer Fellowship" message. */
773+
#summer-fellowship {
774+
background: #11557C;
775+
box-sizing: border-box;
776+
color: #fffa;
777+
font-weight: bold;
778+
left: 0;
779+
min-height: 3em;
780+
padding: 0.5em;
781+
top: 0;
782+
width: 100%;
783+
z-index: 10000;
784+
}
785+
786+
#summer-fellowship a {
787+
color: #fff;
788+
text-decoration:underline;
789+
}
790+
771791
/* "Go to released version" message. */
772792
#unreleased-message {
773793
background: #d62728;
@@ -971,6 +991,24 @@ p.sphx-glr-signature a.reference.external {
971991
font-weight: 400;
972992
}
973993

994+
.viewcode-link {
995+
float: right;
996+
}
997+
998+
.viewcode-back {
999+
float: right;
1000+
font-family: "Helvetica Neue", Helvetica, 'Lucida Grande', 'Lucida Sans Unicode', 'Geneva', 'Verdana', sans-serif;
1001+
}
1002+
1003+
div.viewcode-block:target {
1004+
margin: -1px -13px;
1005+
padding: 0 10px;
1006+
border-top: 1px solid #ccc;
1007+
border-bottom: 1px solid #ccc;
1008+
background-color: #f4debf;
1009+
1010+
}
1011+
9741012
.sidebar-announcement {
9751013
border: 1px solid #11557C;
9761014
background: #eff9ff;

‎doc/_templates/layout.html

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,12 @@ <h3>{{ _('Navigation') }}</h3>
172172
</a>
173173
</div>
174174
{%- endif %}
175+
<div id="summer-fellowship">
176+
Applications are open for the 2018 John Hunter Matplotlib Summer Fellowship.
177+
<a href="https://www.numfocus.org/programs/john-hunter-technology-fellowship">
178+
Apply now!
179+
</a>
180+
</div>
175181
<div style="background-color: white; text-align: left; padding: 10px 10px 15px 15px; position: relative;">
176182
{%- if builder in ('htmlhelp', 'devhelp', 'latex') %}
177183
<a href="{{ pathto('index') }}">
@@ -231,13 +237,16 @@ <h3>{{ _('Navigation') }}</h3>
231237
endtrans %}
232238
{%- endif %}
233239
{%- endif %}
240+
<br />
234241
{%- if last_updated %}
235-
{% trans last_updated=last_updated|e %}Last updated on {{ last_updated
236-
}}.{% endtrans %}
242+
{% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
237243
{%- endif %}
238244
{%- if show_sphinx %}
239-
{% trans sphinx_version=sphinx_version|e %}Created using <a
240-
href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
245+
{% trans sphinx_version=sphinx_version|e %}Created using
246+
<ahref="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
247+
{%- endif %}
248+
{%- if sha %}
249+
Doc version {{ sha }}.
241250
{%- endif %}
242251
</div>
243252
{%- endblock %}

‎doc/api/api_changes.rst

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,22 @@ Both bindings are disabled if only a subset of the grid lines (in either
407407
direction) is visible, to avoid making irreversible changes to the figure.
408408

409409

410+
Ticklabels are turned off instead of being invisible
411+
----------------------------------------------------
412+
413+
Internally, the `Tick`'s :func:`~matplotlib.axis.Tick.label1On` attribute
414+
is now used to hide tick labels instead of setting the visibility on the tick
415+
label objects.
416+
This improves overall performance and fixes some issues.
417+
As a consequence, in case those labels ought to be shown,
418+
:func:`~matplotlib.axes.Axes.tick_params`
419+
needs to be used, e.g.
420+
421+
::
422+
423+
ax.tick_params(labelbottom=True)
424+
425+
410426
Removal of warning on empty legends
411427
-----------------------------------
412428

‎doc/api/next_api_changes/2018-02-15-AL-deprecations.rst

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,22 @@ The following modules are deprecated:
1111
The following classes, methods, functions, and attributes are deprecated:
1212

1313
- ``afm.parse_afm``,
14+
- ``backend_qt5.error_msg_qt``, ``backend_qt5.exception_handler``,
1415
- ``backend_wx.FigureCanvasWx.macros``,
1516
- ``cbook.GetRealpathAndStat``, ``cbook.Locked``,
1617
- ``cbook.is_numlike`` (use ``isinstance(..., numbers.Number)`` instead),
17-
``cbook.listFiles``, ``cbook.unicode_safe``
18+
``cbook.listFiles``, ``cbook.unicode_safe``,
1819
- ``container.Container.set_remove_method``,
20+
- ``contour.ContourLabeler.cl``, ``.cl_xy``, and ``.cl_cvalues``,
1921
- ``dates.DateFormatter.strftime_pre_1900``, ``dates.DateFormatter.strftime``,
2022
- ``font_manager.TempCache``,
2123
- ``mathtext.unichr_safe`` (use ``chr`` instead),
22-
- ``testing.ImageComparisonTest``,
24+
- ``table.Table.get_child_artists`` (use ``get_children`` instead),
25+
- ``testing.compare.ImageComparisonTest``, ``testing.compare.compare_float``,
26+
- ``testing.decorators.skip_if_command_unavailable``.
27+
- ``FigureCanvasQT.keyAutoRepeat`` (directly check
28+
``event.guiEvent.isAutoRepeat()`` in the event handler to decide whether to
29+
handle autorepeated key presses).
2330
- ``FigureCanvasWx.macros``,
2431
- ``_ImageBase.iterpnames``, use the ``interpolation_names`` property instead.
2532
(this affects classes that inherit from ``_ImageBase`` including

‎doc/api/next_api_changes/2018-02-16-AL-deprecations.rst

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎doc/api/next_api_changes/2018-04-20-AL.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
``bar``/``barh`` no longer accepts ``left``/``bottom`` as first named argument
2+
``````````````````````````````````````````````````````````````````````````````
3+
4+
These arguments were renamed in 2.0 to ``x``/``y`` following the change of the
5+
default alignment from ``edge`` to ``center``.

0 commit comments

Comments
 (0)