8000 Merge branch 'matplotlib:main' into test_hlines · matplotlib/matplotlib@c81bbaf · GitHub
[go: up one dir, main page]
Skip to content

Commit c81bbaf

Browse files
CozyFrogCozyFrog
authored
Merge branch 'matplotlib:main' into test_hlines
2 parents e3abb2e + ea66786 commit c81bbaf

File tree

118 files changed

+3515
-1869
lines changed

Some content is hidden

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

118 files changed

+3515
-1869
lines changed

‎.github/ISSUE_TEMPLATE/tag_proposal.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Tag Proposal
2+
description: Suggest a new tag or subcategory for the gallery of examples
3+
title: "[Tag]: "
4+
labels: [Tag proposal]
5+
body:
6+
- type: markdown
7+
attributes:
8+
value: |
9+
Please search the [tag glossary]() for relevant tags before creating a new tag proposal.
10+
- type: textarea
11+
id: need
12+
attributes:
13+
label: Need
14+
description: Briefly describe the need this tag will fill. (1-4 sentences)
15+
placeholder: |
16+
* A tag is needed for examples that share [...]
17+
* Existing tags do not work because [...]
18+
* Current gallery examples that would use this tag include [...]
19+
* Indicate which subcategory this tag falls under, or whether a new subcategory is proposed.
20+
validations:
21+
required: true
22+
- type: textarea
23+
id: solution
24+
attributes:
25+
label: Proposed solution
26+
description: What should the tag be? All tags are in the format `subcategory: tag`

‎.github/workflows/cibuildwheel.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,20 @@ jobs:
9191
runs-on: ${{ matrix.os }}
9292
env:
9393
CIBW_BEFORE_BUILD: >-
94-
pip install numpy>=1.25 &&
9594
rm -rf {package}/build
9695
CIBW_BEFORE_BUILD_WINDOWS: >-
97-
pip install delvewheel numpy>=1.25 &&
96+
pip install delvewheel &&
9897
rm -rf {package}/build
98+
# Live on the edge when building on main or a PR against main since
99+
# these wheels are also used for nightlies and NumPy 2.0 transition
100+
# requires using the NumPy 2.0 nightlies for compatibility.
101+
# If using all `--pre` releases creates issues, the NumPy wheel can be
102+
# istalled more targeted.
103+
CIBW_BUILD_FRONTEND: >-
104+
${{ (((github.event_name == 'push' && github.ref == 'refs/heads/main') ||
105+
(github.event_name == 'pull_request' && github.base_ref == 'main')) &&
106+
'pip; args: --pre --extra-index-url "https://pypi.anaconda.org/scientific-python-nightly-wheels/simple"') ||
107+
'build' }}
99108
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: >-
100109
delvewheel repair -w {dest_dir} {wheel}
101110
CIBW_AFTER_BUILD: >-

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ galleries/examples/*/*.svgz
8282
result_images
8383
doc/_static/constrained_layout*.png
8484
doc/.mpl_skip_subdirs.yaml
85+
doc/_tags
8586

8687
# Nose/Pytest generated files #
8788
###############################

‎ci/mypy-stubtest-allowlist.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ matplotlib.figure.Figure.set_tight_layout
4141
matplotlib.cm.register_cmap
4242
matplotlib.cm.unregister_cmap
4343

44-
# 3.8 deprecations
45-
matplotlib.contour.ContourSet.allkinds
46-
matplotlib.contour.ContourSet.allsegs
47-
matplotlib.contour.ContourSet.tcolors
48-
matplotlib.contour.ContourSet.tlinewidths
49-
5044
# positional-only argument name lacking leading underscores
5145
matplotlib.axes._base._AxesBase.axis
5246

‎doc/_static/mpl.css

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
--pst-color-link-hover: var(--pst-color-secondary);
44
--sd-color-primary: var(--pst-color-primary);
55
--sd-color-primary-text: var(--pst-color-text-base);
6+
--sd-color-secondary: #ee9040;
7+
--sd-color-success: #28a745;
8+
--sd-color-dark: #323232;
9+
--sd-color-danger: #dc3545;
10+
--sd-color-light: #c9c9c9;
611
}
712

813
.simple li>p {
@@ -161,3 +166,41 @@ div.wide-table table th.stub {
161166
font-style: italic;
162167
font-size: large;
163168
}
169+
170+
171+
.checklist {
172+
list-style: none;
173+
padding: 0;
174+
margin: 0;
175+
}
176+
.checklist li {
177+
margin-left: 24px;
178+
padding-left: 23px;
179+
margin-right: 6px;
180+
}
181+
.checklist li:before {
182+
content: "\2610\2001";
183+
margin-left: -24px;
184+
}
185+
.checklist li p {
186+
display: inline;
187+
}
188+
189+
.sdd.sd-dropdown {
190+
box-shadow: none!important;
191+
}
192+
193+
.sdd.sd-dropdown.sd-card{
194+
border-style: solid !important;
195+
border-color: var(--pst-color-border) !important;
196+
border-width: thin !important;
197+
border-radius: .05
198+
}
199+
200+
.sdd.sd-dropdown .sd-card-header{
201+
--pst-sd-dropdown-color: none;
202+
}
203+
204+
.sdd.sd-dropdown .sd-card-header +.sd-card-body{
205+
--pst-sd-dropdown-color: none;
206+
}

‎doc/_static/zenodo_cache/10059757.svg

Lines changed: 35 additions & 0 deletions
Loading

‎doc/api/next_api_changes/README.rst

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,17 @@ author's initials. Typically, each change will get its own file, but you may
2222
also amend existing files when suitable. The overall goal is a comprehensible
2323
documentation of the changes.
2424

25-
Please avoid using references in section titles, as it causes links to be
26-
confusing in the table of contents. Instead, ensure that a reference is
27-
included in the descriptive text. A typical entry could look like this::
25+
A typical entry could look like this::
2826

2927
Locators
3028
~~~~~~~~
3129
The unused `Locator.autoscale()` method is deprecated (pass the axis
3230
limits to `Locator.view_limits()` instead).
31+
32+
Please avoid using references in section titles, as it causes links to be
33+
confusing in the table of contents. Instead, ensure that a reference is
34+
inclu 10000 ded in the descriptive text.
35+
36+
.. NOTE
37+
Lines 5-30 of this file are include in :ref:`api_whats_new`;
38+
therefore, please check the doc build after changing this file.

‎doc/api/next_api_changes/behavior/26696-SR.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
*loc* parameter of ``Cell`` doesn't accept ``None`` anymore
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
4+
The default value of the *loc* parameter has been changed from ``None`` to ``right``,
5+
which already was the default location. The behavior of `.Cell` didn't change when
6+
called without an explicit *loc* parameter.

‎doc/api/next_api_changes/behavior/27179-KS.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Default behavior of ``hexbin`` with *C* provided requires at least 1 point
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
4+
The behavior changed in 3.8.0 to be inclusive of *mincnt*. However that resulted in
5+
errors or warnings with some reduction functions, so now the default is to require at
6+
least 1 point to call the reduction function. This effectively restores the default
7+
behavior to match that of Matplotlib 3.7 and before.

‎doc/api/next_api_changes/deprecations/27088-JK.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Deprecations removed in ``contour``
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
4+
``contour.allsegs``, ``contour.allkinds``, and ``contour.find_nearest_contour`` are no
5+
longer marked for deprecation.

‎doc/api/next_api_changes/deprecations/27175-AL.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Mixing positional and keyword arguments for ``legend`` handles and labels
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
This previously only raised a warning, but is now formally deprecated. If
4+
passing *handles* and *labels*, they must be passed either both positionally or
5+
both as keyword.

‎doc/api/next_api_changes/removals/26900-jf.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
``passthru_pt``
2+
~~~~~~~~~~~~~~~
3+
4+
This attribute of ``AxisArtistHelper``\s has been removed.

‎doc/api/prev_api_changes/api_changes_3.8.0/behaviour.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,3 +165,9 @@ PostScript paper type adds option to use figure size
165165
The :rc:`ps.papertype` rcParam can now be set to ``'figure'``, which will use
166166
a paper size that corresponds exactly with the size of the figure that is being
167167
saved.
168+
169+
``hexbin`` *mincnt* parameter made consistently inclusive
170+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
171+
172+
Previously, *mincnt* was inclusive with no *C* provided but exclusive when *C* is provided.
173+
It is now inclusive of *mincnt* in both cases.

‎doc/api/prev_api_changes/api_changes_3.8.1.rst

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
API Changes for 3.8.1
2+
=====================
3+
4+
Behaviour
5+
---------
6+
7+
Default behaviour of ``hexbin`` with *C* provided requires at least 1 point
8+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
9+
10+
The behaviour changed in 3.8.0 to be inclusive of *mincnt*. However, that resulted in
11+
errors or warnings with some reduction functions, so now the default is to require at
12+
least 1 point to call the reduction function. This effectively restores the default
13+
behaviour to match that of Matplotlib 3.7 and before.
14+
15+
16+
Deprecations
17+
------------
18+
19+
Deprecations removed in ``contour``
20+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
21+
22+
``contour.allsegs``, ``contour.allkinds``, and ``contour.find_nearest_contour`` are no
23+
longer marked for deprecation.
24+
25+
26+
Development
27+
-----------
28+
29+
Minimum version of setuptools bumped to 64
30+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
31+
32+
To comply with requirements of ``setuptools_scm``, the minimum version of ``setuptools``
33+
has been increased from 42 to 64.

‎doc/conf.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ def _parse_skip_subdirs_file():
118118
'sphinxext.redirect_from',
119119
'sphinx_copybutton',
120120
'sphinx_design',
121+
'sphinx_tags',
121122
]
122123

123124
exclude_patterns = [
@@ -207,6 +208,7 @@ def _check_dependencies():
207208
'scipy': ('https://docs.scipy.org/doc/scipy/', None),
208209
'tornado': ('https://www.tornadoweb.org/en/stable/', None),
209210
'xarray': ('https://docs.xarray.dev/en/stable/', None),
211+
'meson-python': ('https://meson-python.readthedocs.io/en/stable/', None)
210212
}
211213

212214

@@ -282,6 +284,18 @@ def gallery_image_warning_filter(record):
282284
logger = logging.getLogger('sphinx')
283285
logger.addFilter(gallery_image_warning_filter)
284286

< 8A15 code>287+
# Sphinx tags configuration
288+
tags_create_tags = True
289+
tags_page_title = "All tags"
290+
tags_create_badges = True
291+
tags_badge_colors = {
292+
"animation": "primary",
293+
"component:*": "secondary",
294+
"event-handling": "success",
295+
"interactivity:*": "dark",
296+
"plot-type:*": "danger",
297+
"*": "light" # default value
298+
}
285299

286300
mathmpl_fontsize = 11.0
287301
mathmpl_srcset = ['2x']

0 commit comments

Comments
 (0)
0