Merge pull request #19383 from anntzer/sd

QuLogic · web-flow · commit f13a1be0eaee · 2021-01-28T01:13:57.000-05:00
Always include sample_data in installs.
diff --git a/setup.cfg.template b/setup.cfg.template
@@ -21,7 +21,6 @@ license_files = LICENSE/*
 # considered optional. All except 'tests' data (meaning the baseline
 # image files) are installed by default, but that can be changed here.
 #tests = False
-#sample_data = True
 
 [gui_support]
 # Matplotlib supports multiple GUI toolkits, known as backends.
diff --git a/setup.py b/setup.py
@@ -61,7 +61,6 @@
     setupext.Platform(),
     setupext.FreeType(),
     setupext.Qhull(),
-    setupext.SampleData(),
     setupext.Tests(),
     setupext.BackendMacOSX(),
     ]
diff --git a/setupext.py b/setupext.py
@@ -365,9 +365,7 @@ def get_package_data(self):
         return {
             'matplotlib': [
                 'mpl-data/matplotlibrc',
-                *_pkg_data_helper('matplotlib', 'mpl-data/fonts'),
-                *_pkg_data_helper('matplotlib', 'mpl-data/images'),
-                *_pkg_data_helper('matplotlib', 'mpl-data/stylelib'),
+                *_pkg_data_helper('matplotlib', 'mpl-data'),
                 *_pkg_data_helper('matplotlib', 'backends/web_backend'),
                 '*.dll',  # Only actually matters on Windows.
             ],
@@ -478,21 +476,6 @@ def get_extensions(self):
         yield ext
 
 
-class SampleData(OptionalPackage):
-    """
-    This handles the sample data that ships with matplotlib.  It is
-    technically optional, though most often will be desired.
-    """
-    name = "sample_data"
-
-    def get_package_data(self):
-        return {
-            'matplotlib': [
-                *_pkg_data_helper('matplotlib', 'mpl-data/sample_data'),
-            ],
-        }
-
-
 class Tests(OptionalPackage):
     name = "tests"
     default_config = False

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,6 @@`
`61`	`61`	`setupext.Platform(),`
`62`	`62`	`setupext.FreeType(),`
`63`	`63`	`setupext.Qhull(),`
`64`		`- setupext.SampleData(),`
`65`	`64`	`setupext.Tests(),`
`66`	`65`	`setupext.BackendMacOSX(),`
`67`	`66`	`]`