Move gui_support.macosx option to packages section.

anntzer · anntzer · commit 68eba59a7edd · 2021-10-21T23:54:28.000+02:00
Currently, packages and gui_support only have one entry each, and are
conceptually close enough to be merged.
diff --git a/doc/api/next_api_changes/development/21415-AL.rst b/doc/api/next_api_changes/development/21415-AL.rst
@@ -0,0 +1,2 @@
+``gui_support.macosx`` setup option has been renamed to ``packages.macosx``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/mplsetup.cfg.template b/mplsetup.cfg.template
@@ -3,26 +3,26 @@
 [libs]
 # By default, Matplotlib builds with LTO, which may be slow if you re-compile
 # often, and don't need the space saving/speedup.
+#
 #enable_lto = True
+#
 # By default, Matplotlib downloads and builds its own copies of FreeType and of
 # Qhull.  You may set the following to True to instead link against a system
 # FreeType/Qhull.  As an exception, Matplotlib defaults to the system version
 # of FreeType on AIX.
+#
 #system_freetype = False
 #system_qhull = False
 
 [packages]
-# There are a number of data subpackages from Matplotlib that are
-# considered optional. All except 'tests' data (meaning the baseline
-# image files) are installed by default, but that can be changed here.
-#tests = False
-
-[gui_support]
-# Matplotlib supports multiple GUI toolkits, known as backends.
-# The MacOSX backend requires the Cocoa headers included with XCode.
-# You can select whether to build it by uncommenting the following line.
-# It is never built on Linux or Windows, regardless of the config value.
+# Some of Matplotlib's components are optional: the MacOSX backend (installed
+# by default on MacOSX; requires the Cocoa headers included with XCode), and
+# the test data (i.e., the baseline image files; not installed by default).
+# You can control whether they are installed by uncommenting the following
+# lines.  Note that the MacOSX backend is never built on Linux or Windows,
+# regardless of the config value.
 #
+#tests = False
 #macosx = True
 
 [rc_options]
diff --git a/setupext.py b/setupext.py
@@ -321,7 +321,6 @@ def do_custom_build(self, env):
 
 
 class OptionalPackage(SetupPackage):
-    config_category = "packages"
     default_config = True
 
     def check(self):
@@ -330,7 +329,7 @@ def check(self):
 
         May be overridden by subclasses for additional checks.
         """
-        if config.getboolean(self.config_category, self.name,
+        if config.getboolean("packages", self.name,
                              fallback=self.default_config):
             return "installing"
         else:  # Configuration opt-out by user
@@ -717,7 +716,6 @@ def do_custom_build(self, env):
 
 
 class BackendMacOSX(OptionalPackage):
-    config_category = 'gui_support'
     name = 'macosx'
 
     def check(self):
@@ -726,10 +724,10 @@ def check(self):
         return super().check()
 
     def get_extensions(self):
-        sources = [
-            'src/_macosx.m'
-            ]
-        ext = Extension('matplotlib.backends._macosx', sources)
+        ext = Extension(
+            'matplotlib.backends._macosx', [
+                'src/_macosx.m'
+            ])
         ext.extra_compile_args.extend(['-Werror=unguarded-availability'])
         ext.extra_link_args.extend(['-framework', 'Cocoa'])
         if platform.python_implementation().lower() == 'pypy':

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+``gui_support.macosx`` setup option has been renamed to ``packages.macosx``
	`2`	`+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~`