From 291599d4b3ea5e00f922820b1e9b79e4e009a2ac Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Fri, 29 Mar 2019 12:39:55 +0100 Subject: [PATCH] Move sphinxext test to matplotlib.tests like everyone else. It doesn't really make sense to have a separate subpackage just for a single test (compare e.g. with test_triangulation which also lives there, even though matplotlib.tri is its own subpckage, or the various backend-specific tests). --- lib/matplotlib/sphinxext/tests/__init__.py | 1 - lib/matplotlib/sphinxext/tests/conftest.py | 3 --- .../tests/test_tinypages.py => tests/test_sphinxext.py} | 0 lib/matplotlib/{sphinxext => }/tests/tinypages/.gitignore | 0 lib/matplotlib/{sphinxext => }/tests/tinypages/README.md | 0 .../{sphinxext => }/tests/tinypages/_static/.gitignore | 0 .../{sphinxext => }/tests/tinypages/_static/README.txt | 0 lib/matplotlib/{sphinxext => }/tests/tinypages/conf.py | 0 lib/matplotlib/{sphinxext => }/tests/tinypages/index.rst | 0 lib/matplotlib/{sphinxext => }/tests/tinypages/range4.py | 0 lib/matplotlib/{sphinxext => }/tests/tinypages/range6.py | 0 lib/matplotlib/{sphinxext => }/tests/tinypages/some_plots.rst | 0 setupext.py | 4 +--- 13 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 lib/matplotlib/sphinxext/tests/__init__.py delete mode 100644 lib/matplotlib/sphinxext/tests/conftest.py rename lib/matplotlib/{sphinxext/tests/test_tinypages.py => tests/test_sphinxext.py} (100%) rename lib/matplotlib/{sphinxext => }/tests/tinypages/.gitignore (100%) rename lib/matplotlib/{sphinxext => }/tests/tinypages/README.md (100%) rename lib/matplotlib/{sphinxext => }/tests/tinypages/_static/.gitignore (100%) rename lib/matplotlib/{sphinxext => }/tests/tinypages/_static/README.txt (100%) rename lib/matplotlib/{sphinxext => }/tests/tinypages/conf.py (100%) rename lib/matplotlib/{sphinxext => }/tests/tinypages/index.rst (100%) rename lib/matplotlib/{sphinxext => }/tests/tinypages/range4.py (100%) rename lib/matplotlib/{sphinxext => }/tests/tinypages/range6.py (100%) rename lib/matplotlib/{sphinxext => }/tests/tinypages/some_plots.rst (100%) diff --git a/lib/matplotlib/sphinxext/tests/__init__.py b/lib/matplotlib/sphinxext/tests/__init__.py deleted file mode 100644 index 7a8947f7fb9b..000000000000 --- a/lib/matplotlib/sphinxext/tests/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# Make tests a package diff --git a/lib/matplotlib/sphinxext/tests/conftest.py b/lib/matplotlib/sphinxext/tests/conftest.py deleted file mode 100644 index 81829c903c58..000000000000 --- a/lib/matplotlib/sphinxext/tests/conftest.py +++ /dev/null @@ -1,3 +0,0 @@ -from matplotlib.testing.conftest import (mpl_test_settings, - mpl_image_comparison_parameters, - pytest_configure, pytest_unconfigure) diff --git a/lib/matplotlib/sphinxext/tests/test_tinypages.py b/lib/matplotlib/tests/test_sphinxext.py similarity index 100% rename from lib/matplotlib/sphinxext/tests/test_tinypages.py rename to lib/matplotlib/tests/test_sphinxext.py diff --git a/lib/matplotlib/sphinxext/tests/tinypages/.gitignore b/lib/matplotlib/tests/tinypages/.gitignore similarity index 100% rename from lib/matplotlib/sphinxext/tests/tinypages/.gitignore rename to lib/matplotlib/tests/tinypages/.gitignore diff --git a/lib/matplotlib/sphinxext/tests/tinypages/README.md b/lib/matplotlib/tests/tinypages/README.md similarity index 100% rename from lib/matplotlib/sphinxext/tests/tinypages/README.md rename to lib/matplotlib/tests/tinypages/README.md diff --git a/lib/matplotlib/sphinxext/tests/tinypages/_static/.gitignore b/lib/matplotlib/tests/tinypages/_static/.gitignore similarity index 100% rename from lib/matplotlib/sphinxext/tests/tinypages/_static/.gitignore rename to lib/matplotlib/tests/tinypages/_static/.gitignore diff --git a/lib/matplotlib/sphinxext/tests/tinypages/_static/README.txt b/lib/matplotlib/tests/tinypages/_static/README.txt similarity index 100% rename from lib/matplotlib/sphinxext/tests/tinypages/_static/README.txt rename to lib/matplotlib/tests/tinypages/_static/README.txt diff --git a/lib/matplotlib/sphinxext/tests/tinypages/conf.py b/lib/matplotlib/tests/tinypages/conf.py similarity index 100% rename from lib/matplotlib/sphinxext/tests/tinypages/conf.py rename to lib/matplotlib/tests/tinypages/conf.py diff --git a/lib/matplotlib/sphinxext/tests/tinypages/index.rst b/lib/matplotlib/tests/tinypages/index.rst similarity index 100% rename from lib/matplotlib/sphinxext/tests/tinypages/index.rst rename to lib/matplotlib/tests/tinypages/index.rst diff --git a/lib/matplotlib/sphinxext/tests/tinypages/range4.py b/lib/matplotlib/tests/tinypages/range4.py similarity index 100% rename from lib/matplotlib/sphinxext/tests/tinypages/range4.py rename to lib/matplotlib/tests/tinypages/range4.py diff --git a/lib/matplotlib/sphinxext/tests/tinypages/range6.py b/lib/matplotlib/tests/tinypages/range6.py similarity index 100% rename from lib/matplotlib/sphinxext/tests/tinypages/range6.py rename to lib/matplotlib/tests/tinypages/range6.py diff --git a/lib/matplotlib/sphinxext/tests/tinypages/some_plots.rst b/lib/matplotlib/tests/tinypages/some_plots.rst similarity index 100% rename from lib/matplotlib/sphinxext/tests/tinypages/some_plots.rst rename to lib/matplotlib/tests/tinypages/some_plots.rst diff --git a/setupext.py b/setupext.py index 2f1b1b5e4b12..64079a8a8845 100644 --- a/setupext.py +++ b/setupext.py @@ -586,13 +586,11 @@ def get_package_data(self): return { 'matplotlib': [ *_pkg_data_helper('matplotlib', 'tests/baseline_images'), + *_pkg_data_helper('matplotlib', 'tests/tinypages'), 'tests/cmr10.pfb', 'tests/mpltest.ttf', 'tests/test_rcparams.rc', 'tests/test_utf32_be_rcparams.rc', - 'sphinxext/tests/tinypages/*.rst', - 'sphinxext/tests/tinypages/*.py', - 'sphinxext/tests/tinypages/_static/*', ], 'mpl_toolkits': [ *_pkg_data_helper('mpl_toolkits', 'tests/baseline_images'),