8000 Move gui_support.macosx option to packages section. · matplotlib/matplotlib@68eba59 · GitHub
[go: up one dir, main page]
Skip to content

Commit 68eba59

Browse files
anntzeranntzer
committed
Move gui_support.macosx option to packages section.
Currently, packages and gui_support only have one entry each, and are conceptually close enough to be merged.
1 parent fea21af commit 68eba59

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

‎doc/api/next_api_changes/development/21415-AL.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
``gui_support.macosx`` setup option has been renamed to ``packages.macosx``
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

‎mplsetup.cfg.template

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33
[libs]
44
# By default, Matplotlib builds with LTO, which may be slow if you re-compile
55
# often, and don't need the space saving/speedup.
6+
#
67
#enable_lto = True
8+
#
79
# By default, Matplotlib downloads and builds its own copies of FreeType and of
810
# Qhull. You may set the following to True to instead link against a system
911
# FreeType/Qhull. As an exception, Matplotlib defaults to the system version
1012
# of FreeType on AIX.
13+
#
1114
#system_freetype = False
1215
#system_qhull = False
1316

1417
[packages]
15-
# There are a number of data subpackages from Matplotlib that are
16-
# considered optional. All except 'tests' data (meaning the baseline
17-
# image files) are installed by default, but that can be changed here.
18-
#tests = False
19-
20-
[gui_support]
21-
# Matplotlib supports multiple GUI toolkits, known as backends.
22-
# The MacOSX backend requires the Cocoa headers included with XCode.
23-
# You can select whether to build it by uncommenting the following line.
24-
# It is never built on Linux or Windows, regardless of the config value.
18+
# Some of Matplotlib's components are optional: the MacOSX backend (installed
19+
# by default on MacOSX; requires the Cocoa headers included with XCode), and
20+
# the test data (i.e., the baseline image files; not installed by default).
21+
# You can control whether they are installed by uncommenting the following
22+
# lines. Note that the MacOSX backend is never built on Linux or Windows,
23+
# regardless of the config value.
2524
#
25+
#tests = False
2626
#macosx = True
2727

2828
[rc_options]

‎setupext.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,6 @@ def do_custom_build(self, env):
321321

322322

323323
class OptionalPackage(SetupPackage):
324-
config_category = "packages"
325324
default_config = True
326325

327326
def check(self):
@@ -330,7 +329,7 @@ def check(self):
330329
331330
May be overridden by subclasses for additional checks.
332331
"""
333-
if config.getboolean(self.config_category, self.name,
332+
if config.getboolean("packages", self.name,
334333
fallback=self.default_config):
335334
return "installing"
336335
else: # Configuration opt-out by user
@@ -717,7 +716,6 @@ def do_custom_build(self, env):
717716

718717

719718
class BackendMacOSX(OptionalPackage):
720-
config_category = 'gui_support'
721719
name = 'macosx'
722720

723721
def check(self):
@@ -726,10 +724,10 @@ def check(self):
726724
return super().check()
727725

728726
def get_extensions(self):
729-
sources = [
730-
'src/_macosx.m'
731-
]
732-
ext = Extension('matplotlib.backends._macosx', sources)
727+
ext = Extension(
728+
'matplotlib.backends._macosx', [
729+
'src/_macosx.m'
730+
])
733731
ext.extra_compile_args.extend(['-Werror=unguarded-availability'])
734732
ext.extra_link_args.extend(['-framework', 'Cocoa'])
735733
if platform.python_implementation().lower() == 'pypy':

0 commit comments

Comments
 (0)
0