Remove logic for optionally building Agg and TkAgg.

anntzer · anntzer · commit be1a25bebd02 · 2019-02-24T19:34:35.000+01:00
They are actually not optional (that's the `force = True` setting which
overrides the OptionalBackendPackage logic), so just make them
SetupPackages and remove the corresponding (outdated) comments in
setup.cfg.template.
diff --git a/setup.cfg.template b/setup.cfg.template
@@ -29,25 +29,10 @@
 #sample_data = True
 
 [gui_support]
-# Matplotlib supports multiple GUI toolkits, including
-# GTK3, MacOSX, Qt4, Qt5, Tk, and WX. Support for many of
-# these toolkits requires AGG, the Anti-Grain Geometry library,
-# which is provided by Matplotlib and built by default.
-#
-# Some backends are written in pure Python, and others require
-# extension code to be compiled. By default, Matplotlib checks for
-# these GUI toolkits during installation and, if present, compiles the
-# required extensions to support the toolkit.
-#
-# - Tk support requires Tk development headers and Tkinter.
-# - Mac OSX backend requires the Cocoa headers included with XCode.
-#
-# The other GUI toolkits do not require any extension code, and can be
-# used as long as the libraries are installed on your system --
-# therefore they are installed unconditionally.
-#
-# You can uncomment any the following lines to change this
-# behavior. Acceptable values are:
+# Matplotlib supports multiple GUI toolkits, known as backends.
+# The Mac OSX backend requires the Cocoa headers included with XCode.
+# You can select whether to build it by uncommenting the following line.
+# Acceptable values are:
 #
 #     True: build the extension. Exits with a warning if the
 #           required dependencies are not available
@@ -56,9 +41,7 @@
 #           otherwise skip silently. This is the default
 #           behavior
 #
-#agg = auto
 #macosx = auto
-#tkagg = auto
 
 [rc_options]
 # User-configurable options
diff --git a/setupext.py b/setupext.py
@@ -626,7 +626,6 @@ def _try_managers(*managers):
 
 class OptionalPackage(SetupPackage):
     optional = True
-    force = False
     config_category = "packages"
     default_config = "auto"
 
@@ -663,12 +662,7 @@ def check(self):
                 self.optional = False
         # Configuration opt-out by user
         else:
-            # Some backend extensions (e.g. Agg) need to be built for certain
-            # other GUI backends (e.g. TkAgg) even when manually disabled
-            if self.force is True:
-                message = "installing forced (config override)"
-            else:
-                raise CheckFailed("skipping due to configuration")
+            raise CheckFailed("skipping due to configuration")
 
         # Check requirements and add extra information (if any) to message.
         # If requirements are not met a CheckFailed should be raised in there.
@@ -690,10 +684,6 @@ def check_requirements(self):
         return ""
 
 
-class OptionalBackendPackage(OptionalPackage):
-    config_category = "gui_support"
-
-
 class Platform(SetupPackage):
     name = "platform"
 
@@ -1193,9 +1183,8 @@ def get_extension(self):
         return ext
 
 
-class BackendAgg(OptionalBackendPackage):
+class BackendAgg(SetupPackage):
     name = "agg"
-    force = True
 
     def get_extension(self):
         sources = [
@@ -1211,9 +1200,8 @@ def get_extension(self):
         return ext
 
 
-class BackendTkAgg(OptionalBackendPackage):
+class BackendTkAgg(SetupPackage):
     name = "tkagg"
-    force = True
 
     def check(self):
         return "installing; run-time loading from Python Tcl/Tk"
@@ -1241,7 +1229,8 @@ def add_flags(self, ext):
             ext.libraries.extend(['dl'])
 
 
-class BackendMacOSX(OptionalBackendPackage):
+class BackendMacOSX(OptionalPackage):
+    config_category = 'gui_support'
     name = 'macosx'
 
     def check_requirements(self):
@@ -1262,15 +1251,12 @@ def get_extension(self):
         return ext
 
 
-class OptionalPackageData(OptionalPackage):
-    config_category = "package_data"
-
-
-class Dlls(OptionalPackageData):
+class Dlls(OptionalPackage):
     """
     On Windows, this packages any DLL files that can be found in the
     lib/matplotlib/* directories.
     """
+    config_category = "package_data"
     name = "dlls"
 
     def check_requirements(self):
