Skip to content

Commit ce1b3cd

Browse files
author
Yi Wei
committed
Merge branch 'main' into bugfix-for-issue-25896
2 parents e06b857 + 811c2a4 commit ce1b3cd

File tree

134 files changed

+2987
-1209
lines changed

Some content is hidden

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

134 files changed

+2987
-1209
lines changed

‎.github/workflows/cibuildwheel.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,31 +136,31 @@ jobs:
136136
path: dist/
137137

138138
- name: Build wheels for CPython 3.11
139-
uses: pypa/cibuildwheel@0ecddd92b62987d7a2ae8911f4bb8ec9e2e4496a # v2.13.1
139+
uses: pypa/cibuildwheel@f21bb8376a051ffb6cb5604b28ccaef7b90e8ab7 # v2.14.1
140140
with:
141141
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
142142
env:
143143
CIBW_BUILD: "cp311-*"
144144
CIBW_ARCHS: ${{ matrix.cibw_archs }}
145145

146146
- name: Build wheels for CPython 3.10
147-
uses: pypa/cibuildwheel@0ecddd92b62987d7a2ae8911f4bb8ec9e2e4496a # v2.13.1
147+
uses: pypa/cibuildwheel@f21bb8376a051ffb6cb5604b28ccaef7b90e8ab7 # v2.14.1
148148
with:
149149
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
150150
env:
151151
CIBW_BUILD: "cp310-*"
152152
CIBW_ARCHS: ${{ matrix.cibw_archs }}
153153

154154
- name: Build wheels for CPython 3.9
155-
uses: pypa/cibuildwheel@0ecddd92b62987d7a2ae8911f4bb8ec9e2e4496a # v2.13.1
155+
uses: pypa/cibuildwheel@f21bb8376a051ffb6cb5604b28ccaef7b90e8ab7 # v2.14.1
156156
with:
157157
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
158158
env:
159159
CIBW_BUILD: "cp39-*"
160160
CIBW_ARCHS: ${{ matrix.cibw_archs }}
161161

162162
- name: Build wheels for PyPy
163-
uses: pypa/cibuildwheel@0ecddd92b62987d7a2ae8911f4bb8ec9e2e4496a # v2.13.1
163+
uses: pypa/cibuildwheel@f21bb8376a051ffb6cb5604b28ccaef7b90e8ab7 # v2.14.1
164164
with:
165165
package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
166166
env:

‎CITATION.cff

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
cff-version: 1.2.0
2+
message: 'If Matplotlib contributes to a project that leads to a scientific publication, please acknowledge this fact by citing J. D. Hunter, "Matplotlib: A 2D Graphics Environment", Computing in Science & Engineering, vol. 9, no. 3, pp. 90-95, 2007.'
3+
title: 'Matplotlib: Visualization with Python'
4+
authors:
5+
- name: The Matplotlib Development Team
6+
website: https://matplotlib.org/
7+
type: software
8+
url: 'https://matplotlib.org/'
9+
repository-code: 'https://github.com/matplotlib/matplotlib/'
10+
preferred-citation:
11+
type: article
12+
authors:
13+
- family-names: Hunter
14+
given-names: John D.
15+
title: "Matplotlib: A 2D graphics environment"
16+
year: 2007
17+
date-published: 2007-06-18
18+
journal: Computing in Science & Engineering
19+
volume: 9
20+
issue: 3
21+
start: 90
22+
end: 95
23+
doi: 10.1109/MCSE.2007.55
24+
publisher:
25+
name: IEEE Computer Society
26+
website: 'https://www.computer.org/'
27+
abstract: Matplotlib is a 2D graphics package used for Python for application development, interactive scripting, and publication-quality image generation across user interfaces and operating systems.

‎LICENSE/LICENSE_COLORBREWER

Lines changed: 9 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,13 @@
1-
Apache-Style Software License for ColorBrewer Color Schemes
1+
Apache-Style Software License for ColorBrewer software and ColorBrewer Color Schemes
22

3-
Version 1.1
3+
Copyright (c) 2002 Cynthia Brewer, Mark Harrower, and The Pennsylvania State University.
44

5-
Copyright (c) 2002 Cynthia Brewer, Mark Harrower, and The Pennsylvania
6-
State University. All rights reserved. Redistribution and use in source
7-
and binary forms, with or without modification, are permitted provided
8-
that the following conditions are met:
5+
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
97

10-
1. Redistributions as source code must retain the above copyright notice,
11-
this list of conditions and the following disclaimer.
8+
http://www.apache.org/licenses/LICENSE-2.0
129

13-
2. The end-user documentation included with the redistribution, if any,
14-
must include the following acknowledgment: "This product includes color
15-
specifications and designs developed by Cynthia Brewer
16-
(http://colorbrewer.org/)." Alternately, this acknowledgment may appear in
17-
the software itself, if and wherever such third-party acknowledgments
18-
normally appear.
19-
20-
3. The name "ColorBrewer" must not be used to endorse or promote products
21-
derived from this software without prior written permission. For written
22-
permission, please contact Cynthia Brewer at cbrewer@psu.edu.
23-
24-
4. Products derived from this software may not be called "ColorBrewer",
25-
nor may "ColorBrewer" appear in their name, without prior written
26-
permission of Cynthia Brewer.
27-
28-
THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES,
29-
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
30-
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
31-
CYNTHIA BREWER, MARK HARROWER, OR THE PENNSYLVANIA STATE UNIVERSITY BE
32-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
33-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
34-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
35-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
36-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
37-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
38-
POSSIBILITY OF SUCH DAMAGE.
10+
Unless required by applicable law or agreed to in writing, software distributed
11+
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
12+
CONDITIONS OF ANY KIND, either express or implied. See the License for the
13+
specific language governing permissions and limitations under the License.

‎doc/_static/image-rotator.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ function getRandomInt(max) {
77

88
var images_rotate = [
99
{"image": "sphx_glr_plot_001_2_00x.png", "caption": "plot(x, y)", "link": "plot_types/basic/plot.html"},
10-
{"image": "sphx_glr_step_001_2_00x.png", "caption": "step(x, y)", "link": "plot_types/basic/step.html"},
10+
{"image": "sphx_glr_fill_between_001_2_00x.png", "caption": "fill_between(x, y1, y2)", "link": "plot_types/basic/fill_between.html"},
1111
{"image": "sphx_glr_scatter_plot_001_2_00x.png", "caption": "scatter(x, y)", "link": "plot_types/basic/scatter_plot.html"},
1212
{"image": "sphx_glr_pcolormesh_001_2_00x.png", "caption": "pcolormesh(X, Y, Z)", "link": "plot_types/arrays/pcolormesh.html"},
1313
{"image": "sphx_glr_contourf_001_2_00x.png", "caption": "contourf(X, Y, Z)", "link": "plot_types/arrays/contourf.html"},
14-
{"image": "sphx_glr_step_001_2_00x.png", "caption": "step(x, y)", "link": "plot_types/basic/step.html"},
14+
{"image": "sphx_glr_stairs_001_2_00x.png", "caption": "stairs(y)", "link": "plot_types/basic/stairs.html"},
1515
{"image": "sphx_glr_streamplot_001_2_00x.png", "caption": "streamplot(X, Y, U, V)", "link": "plot_types/arrays/streamplot.html"},
1616
{"image": "sphx_glr_bar_001_2_00x.png", "caption": "bar(x, height) / barh(y, width)", "link": "plot_types/basic/bar.html"},
1717
{"image": "sphx_glr_hist_plot_001_2_00x.png", "caption": "hist(x)", "link": "plot_types/stats/hist_plot.html"},

‎doc/_static/mpl.css

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,29 @@
99
margin: 0;
1010
}
1111

12+
/* Make announcement an error colour for unreleased documentation, and sticky. */
13+
#unreleased-message.bd-header-announcement {
14+
border-bottom: solid var(--pst-color-danger-highlight);
15+
color: var(--pst-color-danger-text);
16+
font-weight: var(--pst-admonition-font-weight-heading);
17+
position: sticky;
18+
top: 0;
19+
z-index: 1050;
20+
}
21+
22+
#unreleased-message.bd-header-announcement:after {
23+
background-color: var(--pst-color-danger);
24+
opacity: 1;
25+
}
26+
27+
#unreleased-message.bd-header-announcement a {
28+
color: var(--pst-color-danger-text);
29+
}
30+
31+
#unreleased-message.bd-header-announcement + .bd-navbar {
32+
top: 3rem; /* Minimum height of announcement header. */
33+
}
34+
1235
/* multi column TOC */
1336
.contents ul {
1437
list-style-type: none;

‎doc/_static/zenodo_cache/8118151.svg

Lines changed: 35 additions & 0 deletions
Loading

‎doc/_templates/sections/announcement.html

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{%- if theme_announcement == "unreleased" -%}
2+
{% set header_classes = ["bd-header-announcement", "container-fluid"] %}
3+
<div class="{{ header_classes | join(' ') }}" id="unreleased-message">
4+
<div class="bd-header-announcement__content">
5+
You are reading documentation for the unreleased version of Matplotlib.
6+
<a href="https://matplotlib.org/search.html?q={{ title | striptags | urlencode }}&amp;check_keywords=yes&amp;area=default">
7+
Try searching for the released version of this page instead?
8+
</a>
9+
</div>
10+
</div>
11+
{%- else -%}
12+
{%- extends "!sections/announcement.html" -%}
13+
{%- endif %}

‎doc/api/font_manager_api.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
:undoc-members:
88
:show-inheritance:
99

10-
.. data:: fontManager
10+
.. data:: fontManager
1111

12-
The global instance of `FontManager`.
12+
The global instance of `FontManager`.
1313

1414
.. autoclass:: FontEntry
1515
:no-undoc-members:

‎doc/api/lines_api.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Classes
1717

1818
Line2D
1919
VertexSelector
20+
AxLine
2021

2122
Functions
2223
---------

‎doc/api/next_api_changes/behavior/25247-AL.rst

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
``ContourSet`` is now a single Collection
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
4+
Prior to this release, `.ContourSet` (the object returned by `~.Axes.contour`)
5+
was a custom object holding multiple `.Collection`\s (and not an `.Artist`)
6+
-- one collection per level, each connected component of that level's contour
7+
being an entry in the corresponding collection.
8+
9+
`.ContourSet` is now instead a plain `.Collection` (and thus an `.Artist`).
10+
The collection contains a single path per contour level; this path may be
11+
non-continuous in case there are multiple connected components.
12+
13+
Setting properties on the ContourSet can now usually be done using standard
14+
collection setters (``cset.set_linewidth(3)`` to use the same linewidth
15+
everywhere or ``cset.set_linewidth([1, 2, 3, ...])`` to set different
16+
linewidths on each level) instead of having to go through the individual
17+
sub-components (``cset.collections[0].set_linewidth(...)``). Note that
18+
during the transition period, it remains possible to access the (deprecated)
19+
``.collections`` attribute; this causes the ContourSet to modify itself to use
20+
the old-style multi-Collection representation.

0 commit comments

Comments
 (0)