Skip to content

Commit ef32a2a

Browse files
authored
Merge branch 'matplotlib:main' into logo_guide
2 parents 3a65868 + d3491dc commit ef32a2a

Some content is hidden

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

43 files changed

+1575
-318
lines changed

.github/workflows/cibuildwheel.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,6 @@ jobs:
151151
CIBW_ENABLE: "cpython-freethreading cpython-prerelease"
152152
CIBW_ARCHS: ${{ matrix.cibw_archs }}
153153
CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
154-
CIBW_BEFORE_TEST: >-
155-
python -m pip install
156-
--index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple
157-
--upgrade --pre --only-binary=:all: contourpy numpy pillow
158154

159155
- name: Build wheels for CPython 3.13
160156
uses: pypa/cibuildwheel@352e01339f0a173aa2a3eb57f01492e341e83865 # v3.1.3

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
persist-credentials: false
3333

3434
- name: Initialize CodeQL
35-
uses: github/codeql-action/init@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.8
35+
uses: github/codeql-action/init@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10
3636
with:
3737
languages: ${{ matrix.language }}
3838

@@ -43,4 +43,4 @@ jobs:
4343
pip install --user -v .
4444
4545
- name: Perform CodeQL Analysis
46-
uses: github/codeql-action/analyze@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.8
46+
uses: github/codeql-action/analyze@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.10

ci/codespell-ignore-words.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ whis
2020
wit
2121
Copin
2222
socio-economic
23+
Ines

doc/_embedded_plots/figure_subplots_adjust.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
overlay = fig.add_axes([0, 0, 1, 1], zorder=100)
99
overlay.axis("off")
10-
xycoords='figure fraction'
11-
arrowprops=dict(arrowstyle="<->", shrinkA=0, shrinkB=0)
10+
xycoords = 'figure fraction'
11+
arrowprops = dict(arrowstyle="<->", shrinkA=0, shrinkB=0)
1212

1313
for ax in axs.flat:
1414
ax.set(xticks=[], yticks=[])
Lines changed: 35 additions & 0 deletions
Loading
Lines changed: 35 additions & 0 deletions
Loading
Lines changed: 35 additions & 0 deletions
Loading

doc/api/colors_api.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ Color norms
3232
PowerNorm
3333
SymLogNorm
3434
TwoSlopeNorm
35+
MultiNorm
3536

3637
Univariate Colormaps
3738
--------------------
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
The *axes* parameter of ``RadialLocator``
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
... is deprecated. `~.polar.RadialLocator` now fetches the relevant information
4+
from the Axis' parent Axes.

doc/devel/communication_guide.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ On social media, Matplotlib:
215215
* Highlights various parts of the library, especially the more obscure bits and
216216
bobbles.
217217
* Acknowledges that it is a sometimes frustrating tangle of bits & bobbles that
218-
can confuse even the folks who work on it & signal boosts their confuzzlment.
218+
can confuse even the folks who work on it & signal boosts their confuzzlement.
219219

220220

221221
Behavior

0 commit comments

Comments
 (0)