From b73cf46f0a1b55aec3518fa0e5cc2fa41dfd73f0 Mon Sep 17 00:00:00 2001
From: David Stansby <dstansby@gmail.com>
Date: Fri, 10 Dec 2021 10:08:17 +0000
Subject: [PATCH] Backport PR #21900: Include test notebooks in test package

---
 lib/matplotlib/tests/test_backend_nbagg.py | 2 ++
 setupext.py                                | 1 +
 2 files changed, 3 insertions(+)

diff --git a/lib/matplotlib/tests/test_backend_nbagg.py b/lib/matplotlib/tests/test_backend_nbagg.py
index a7060ed2a7fd..4ebf3e1f56d1 100644
--- a/lib/matplotlib/tests/test_backend_nbagg.py
+++ b/lib/matplotlib/tests/test_backend_nbagg.py
@@ -6,6 +6,8 @@
 import pytest
 
 nbformat = pytest.importorskip('nbformat')
+pytest.importorskip('nbconvert')
+pytest.importorskip('ipykernel')
 
 # From https://blog.thedataincubator.com/2016/06/testing-jupyter-notebooks/
 
diff --git a/setupext.py b/setupext.py
index 25e12f7a7919..e41ab98fe1c0 100644
--- a/setupext.py
+++ b/setupext.py
@@ -481,6 +481,7 @@ def get_package_data(self):
                 *_pkg_data_helper('matplotlib', 'tests/tinypages'),
                 'tests/cmr10.pfb',
                 'tests/mpltest.ttf',
+                'tests/test_*.ipynb',
             ],
             'mpl_toolkits': [
                 *_pkg_data_helper('mpl_toolkits', 'tests/baseline_images'),