Merge pull request #19337 from QuLogic/move-sphinxext-data

anntzer · web-flow · commit 9b3b11152d7c · 2021-01-28T21:53:00.000+01:00
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -3,18 +3,12 @@ include pytest.ini
 include MANIFEST.in
 include matplotlibrc.template setup.cfg.template
 include setupext.py setup.py
-include lib/matplotlib/mpl-data/matplotlibrc
-include lib/matplotlib/mpl-data/images/*
-include lib/matplotlib/mpl-data/fonts/ttf/*
-include lib/matplotlib/mpl-data/fonts/pdfcorefonts/*
-include lib/matplotlib/mpl-data/fonts/afm/*
-include lib/matplotlib/mpl-data/stylelib/*
 recursive-include LICENSE *
 recursive-include doc *
 recursive-include examples *
 recursive-include extern *
 recursive-include lib *
-recursive-include lib/matplotlib/mpl-data/sample_data *
+recursive-include lib/matplotlib/mpl-data *
 recursive-include src  *.cpp *.c *.h *.m
 recursive-include tools *
 recursive-include tutorials *
diff --git a/lib/matplotlib/mpl-data/plot_directive/plot_directive.css b/lib/matplotlib/mpl-data/plot_directive/plot_directive.css
diff --git a/lib/matplotlib/sphinxext/__init__.py b/lib/matplotlib/sphinxext/__init__.py
@@ -1,3 +0,0 @@
-from pathlib import Path
-
-_static_path = Path(__file__).resolve().parent / Path('static')
diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py
@@ -156,7 +156,7 @@
 import matplotlib
 from matplotlib.backend_bases import FigureManagerBase
 import matplotlib.pyplot as plt
-from matplotlib import _api, _pylab_helpers, cbook, sphinxext
+from matplotlib import _api, _pylab_helpers, cbook
 
 matplotlib.use("agg")
 align = _api.deprecated(
@@ -256,7 +256,7 @@ def run(self):
 
 def _copy_css_file(app, exc):
     if exc is None and app.builder.format == 'html':
-        src = sphinxext._static_path / Path('plot_directive.css')
+        src = cbook._get_data_path('plot_directive/plot_directive.css')
         dst = app.outdir / Path('_static')
         shutil.copy(src, dst)
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +0,0 @@`
`1`		`-from pathlib import Path`
`2`		`-`
`3`		`-_static_path = Path(__file__).resolve().parent / Path('static')`