Merge branch 'v3.8.x' into merge_up_v3.8.1

ksunden · ksunden · commit 390416aa7b6f · 2023-11-02T12:59:17.000-05:00
diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml
@@ -64,6 +64,9 @@ jobs:
         run: |
           python -m build --sdist
           python ci/export_sdist_name.py
+        env:
+          # Prevent including development runtime dependencies in metadata.
+          CIBUILDWHEEL: 1
 
       - name: Check README rendering for PyPI
         run: twine check dist/*
diff --git a/doc/api/prev_api_changes/api_changes_3.8.1.rst b/doc/api/prev_api_changes/api_changes_3.8.1.rst
@@ -0,0 +1,33 @@
+API Changes for 3.6.1
+=====================
+
+Behaviour
+---------
+
+Default behaviour of ``hexbin`` with *C* provided requires at least 1 point
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The behaviour changed in 3.8.0 to be inclusive of *mincnt*. However, that resulted in
+errors or warnings with some reduction functions, so now the default is to require at
+least 1 point to call the reduction function. This effectively restores the default
+behaviour to match that of Matplotlib 3.7 and before.
+
+
+Deprecations
+------------
+
+Deprecations removed in ``contour``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``contour.allsegs``, ``contour.allkinds``, and ``contour.find_nearest_contour`` are no
+longer marked for deprecation.
+
+
+Development
+-----------
+
+Minimum version of setuptools bumped to 64
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To comply with requirements of ``setuptools_scm``, the minimum version of ``setuptools``
+has been increased from 42 to 64.
diff --git a/doc/devel/development_setup.rst b/doc/devel/development_setup.rst
@@ -195,6 +195,10 @@ For more information on installation and other configuration options, see the
 Meson Python :external+meson-python:ref:`editable installs guide <how-to-guides-editable-installs>`.
 
 
+If the installation is not working, please consult the :ref:`troubleshooting guide <troubleshooting-faq>`.
+If the guide does not offer a solution, please reach out via `chat <https://gitter.im/matplotlib/matplotlib>`_
+or :ref:`open an issue <submitting-a-bug-report>`.
+
 Verify the Installation
 =======================
 
diff --git a/doc/users/github_stats.rst b/doc/users/github_stats.rst
diff --git a/doc/users/prev_whats_new/github_stats_3.8.0.rst b/doc/users/prev_whats_new/github_stats_3.8.0.rst
diff --git a/doc/users/release_notes.rst b/doc/users/release_notes.rst
@@ -19,8 +19,10 @@ Version 3.8
     :maxdepth: 1
 
     prev_whats_new/whats_new_3.8.0.rst
+    ../api/prev_api_changes/api_changes_3.8.1.rst
     ../api/prev_api_changes/api_changes_3.8.0.rst
     github_stats.rst
+    prev_whats_new/github_stats_3.8.0.rst
 
 Version 3.7
 ^^^^^^^^^^^
diff --git a/environment.yml b/environment.yml
@@ -15,10 +15,6 @@ dependencies:
   - fonttools>=4.22.0
   - importlib-resources>=3.2.0
   - kiwisolver>=1.3.1
-  - meson-python>=0.13.1
-  - numpy>=1.21
-  - pillow>=8
-  - pkg-config
   - pybind11>=2.6.0
   - pygobject
   - pyparsing>=2.3.1
diff --git a/galleries/tutorials/images.py b/galleries/tutorials/images.py
@@ -156,9 +156,8 @@
 #    commands together in one cell.  plt commands will not change plots from earlier
 #    cells.
 #
-# There are many other colormap schemes available.  See the `list and
-# images of the colormaps
-# <../colors/colormaps.html>`_.
+# There are many other colormap schemes available.  See the :ref:`list and images
+# of the colormaps<colormaps>`.
 #
 # .. _`Color Bars`:
 #
diff --git a/galleries/users_explain/quick_start.py b/galleries/users_explain/quick_start.py
@@ -131,7 +131,7 @@
 # to provide the ``data`` keyword argument and generate plots passing the
 # strings corresponding to the *x* and *y* variables.
 #
-# .. _structured numpy array: <https://numpy.org/doc/stable/user/basics.rec.html#structured-arrays>`_  # noqa: E501
+# .. _structured numpy array: https://numpy.org/doc/stable/user/basics.rec.html#structured-arrays  # noqa: E501
 
 np.random.seed(19680801)  # seed the random number generator.
 data = {'a': np.arange(50),

Original file line number	Diff line number	Diff line change
`@@ -156,9 +156,8 @@`
`156`	`156`	`# commands together in one cell. plt commands will not change plots from earlier`
`157`	`157`	`# cells.`
`158`	`158`	`#`
`159`		-# There are many other colormap schemes available. See the `list and
`160`		`-# images of the colormaps`
`161`		-# <../colors/colormaps.html>`_.
	`159`	+# There are many other colormap schemes available. See the :ref:`list and images
	`160`	+# of the colormaps<colormaps>`.
`162`	`161`	`#`
`163`	`162`	# .. _`Color Bars`:
`164`	`163`	`#`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@`
`131`	`131`	# to provide the ``data`` keyword argument and generate plots passing the
`132`	`132`	`# strings corresponding to the x and y variables.`
`133`	`133`	`#`
`134`		-# .. _structured numpy array: <https://numpy.org/doc/stable/user/basics.rec.html#structured-arrays>`_ # noqa: E501
	`134`	`+# .. _structured numpy array: https://numpy.org/doc/stable/user/basics.rec.html#structured-arrays # noqa: E501`
`135`	`135`
`136`	`136`	`np.random.seed(19680801) # seed the random number generator.`
`137`	`137`	`data = {'a': np.arange(50),`