Merge branch 'main' into text-overhaul

Author: QuLogic

.github/workflows/cibuildwheel.yml

@@ -145,7 +145,7 @@ jobs:
         run: Remove-Item -Recurse C:\Strawberry
 
       - name: Build wheels for CPython 3.14
-        uses: pypa/cibuildwheel@5f22145df44122af0f5a201f93cf0207171beca7  # v3.0.0
+        uses: pypa/cibuildwheel@95d2f3a92fbf80abe066b09418bbf128a8923df2  # v3.0.1
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:
@@ -159,7 +159,7 @@ jobs:
             --upgrade --pre --only-binary=:all: contourpy numpy pillow
 
       - name: Build wheels for CPython 3.13
-        uses: pypa/cibuildwheel@5f22145df44122af0f5a201f93cf0207171beca7  # v3.0.0
+        uses: pypa/cibuildwheel@95d2f3a92fbf80abe066b09418bbf128a8923df2  # v3.0.1
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:
@@ -168,23 +168,23 @@ jobs:
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
       - name: Build wheels for CPython 3.12
-        uses: pypa/cibuildwheel@5f22145df44122af0f5a201f93cf0207171beca7  # v3.0.0
+        uses: pypa/cibuildwheel@95d2f3a92fbf80abe066b09418bbf128a8923df2  # v3.0.1
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:
           CIBW_BUILD: "cp312-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
       - name: Build wheels for CPython 3.11
-        uses: pypa/cibuildwheel@5f22145df44122af0f5a201f93cf0207171beca7  # v3.0.0
+        uses: pypa/cibuildwheel@95d2f3a92fbf80abe066b09418bbf128a8923df2  # v3.0.1
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:
           CIBW_BUILD: "cp311-*"
           CIBW_ARCHS: ${{ matrix.cibw_archs }}
 
       - name: Build wheels for PyPy
-        uses: pypa/cibuildwheel@5f22145df44122af0f5a201f93cf0207171beca7  # v3.0.0
+        uses: pypa/cibuildwheel@95d2f3a92fbf80abe066b09418bbf128a8923df2  # v3.0.1
         with:
           package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }}
         env:

.github/workflows/cygwin.yml

@@ -84,7 +84,7 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
 
-      - uses: cygwin/cygwin-install-action@f61179d72284ceddc397ed07ddb444d82bf9e559  # v5
+      - uses: cygwin/cygwin-install-action@f2009323764960f80959895c7bc3bb30210afe4d  # v6
         with:
           packages: >-
             ccache gcc-g++ gdb git graphviz libcairo-devel libffi-devel

ci/schemas/conda-environment.json

@@ -1,6 +1,6 @@
 {
     "title": "conda environment file",
-    "description": "Support for conda's enviroment.yml files (e.g. `conda env export > environment.yml`)",
+    "description": "Support for conda's environment.yml files (e.g. `conda env export > environment.yml`)",
     "id": "https://raw.githubusercontent.com/Microsoft/vscode-python/main/schemas/conda-environment.json",
     "$schema": "http://json-schema.org/draft-04/schema#",
     "definitions": {

doc/api/next_api_changes/behavior/30272-ES.rst

@@ -0,0 +1,2 @@
+``font_manager.findfont`` logs if selected font weight does not match requested
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

doc/api/prev_api_changes/api_changes_0.90.1.rst

@@ -32,7 +32,7 @@ Changes for 0.90.1
     named units.ConversionInterface.convert.
 
     Axes.errorbar uses Axes.vlines and Axes.hlines to draw its error
-    limits int he vertical and horizontal direction.  As you'll see
+    limits in the vertical and horizontal direction.  As you'll see
     in the changes below, these functions now return a LineCollection
     rather than a list of lines.  The new return signature for
     errorbar is  ylins, caplines, errorcollections where

doc/api/prev_api_changes/api_changes_1.5.0.rst

@@ -189,7 +189,7 @@ algorithm that was not necessarily applicable to custom Axes. Three new private
 methods, ``matplotlib.axes._base._AxesBase._get_view``,
 ``matplotlib.axes._base._AxesBase._set_view``, and
 ``matplotlib.axes._base._AxesBase._set_view_from_bbox``, allow for custom
-*Axes* classes to override the pan and zoom algorithms. Implementors of
+*Axes* classes to override the pan and zoom algorithms. Implementers of
 custom *Axes* who override these methods may provide suitable behaviour for
 both pan and zoom as well as the view navigation buttons on the interactive
 toolbars.

doc/devel/MEP/MEP14.rst

@@ -78,7 +78,7 @@ number of other projects:
 - `Microsoft DirectWrite`_
 - `Apple Core Text`_
 
-.. _pango: https://pango.gnome.org
+.. _pango: https://github.com/GNOME/pango
 .. _harfbuzz: https://github.com/harfbuzz/harfbuzz
 .. _QtTextLayout: https://doc.qt.io/archives/qt-4.8/qtextlayout.html
 .. _Microsoft DirectWrite: https://docs.microsoft.com/en-ca/windows/win32/directwrite/introducing-directwrite

doc/missing-references.json

@@ -122,8 +122,12 @@
       "doc/api/_as_gen/mpl_toolkits.axisartist.floating_axes.rst:32:<autosummary>:1"
     ],
     "numpy.float64": [
+      "doc/docstring of matplotlib.ft2font.pybind11_detail_function_record_v1_system_libstdcpp_gxx_abi_1xxx_use_cxx11_abi_1.set_text:1",
       "doc/docstring of matplotlib.ft2font.PyCapsule.set_text:1"
     ],
+    "numpy.typing.NDArray": [
+      "doc/docstring of matplotlib.ft2font.pybind11_detail_function_record_v1_system_libstdcpp_gxx_abi_1xxx_use_cxx11_abi_1.set_text:1"
+    ],
     "numpy.uint8": [
       "<unknown>:1"
     ]

doc/sphinxext/redirect_from.py

@@ -94,10 +94,15 @@ def run(self):
         domain = self.env.get_domain('redirect_from')
         current_doc = self.env.path2doc(self.state.document.current_source)
         redirected_reldoc, _ = self.env.relfn2path(redirected_doc, current_doc)
-        if redirected_reldoc in domain.redirects:
+        if (
+            redirected_reldoc in domain.redirects
+            and domain.redirects[redirected_reldoc] != current_doc
+        ):
             raise ValueError(
                 f"{redirected_reldoc} is already noted as redirecting to "
-                f"{domain.redirects[redirected_reldoc]}")
+                f"{domain.redirects[redirected_reldoc]}\n"
+                f"Cannot also redirect it to {current_doc}"
+            )
         domain.redirects[redirected_reldoc] = current_doc
         return []
 

doc/users/prev_whats_new/changelog.rst

@@ -1689,7 +1689,7 @@ recent changes, please refer to the :doc:`/users/release_notes`.
     required by the experimental traited config and are somewhat out of date.
     If needed, install them independently, see
     http://code.enthought.com/pages/traits.html and
-    http://www.voidspace.org.uk/python/configobj.html
+    https://configobj.readthedocs.io/en/latest/
 
 2008-12-12
     Added support to assign labels to histograms of multiple data. - MM