From 615017a31e49cfbe542d11c49428822f46ae1232 Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Wed, 8 May 2024 14:28:21 -0600 Subject: [PATCH 001/161] Add an output-base-name option to the Sphinx plot directive This allows specifying the output base name of the generated image files. The name can include '{counter}', which is automatically string formatted to an incrementing counter. The default if it is not specified is left intact as the current behavior, which is to use the base name of the provided script or the RST document. This is required to use the plot directive with MyST, because the directive is broken with MyST (an issue I don't want to fix), requiring the use of eval-rst. But the way eval-rst works, the incrementing counter is not maintained across different eval-rst directives, meaning if you try to include multiple of them in the same document, the images will overwrite each other. This allows you to manually work around this with something like ```{eval-rst} .. plot:: :output-base-name: plot-1 ... ``` ```{eval-rst} .. plot:: :output-base-name: plot-2 ... ``` Aside from this, it's generally useful to be able to specify the image name used for a plot, as a more informative name can be used rather than just '-1.png'. --- lib/matplotlib/sphinxext/plot_directive.py | 26 ++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py index 65b25fb913a5..249979c942ad 100644 --- a/lib/matplotlib/sphinxext/plot_directive.py +++ b/lib/matplotlib/sphinxext/plot_directive.py @@ -47,6 +47,15 @@ The ``.. plot::`` directive supports the following options: +``:output-base-name:`` : str + The base name (without the extension) of the outputted image files. The + default is to use the same name as the input script, or the name of + the RST document if no script is provided. The string can include the + format ``{counter}`` to use an incremented counter. For example, + ``'plot-{counter}'`` will create files like ``plot-1.png``, ``plot-2.png``, + and so on. If the ``{counter}`` is not provided, two plots with the same + output-base-name may overwrite each other. + ``:format:`` : {'python', 'doctest'} The format of the input. If unset, the format is auto-detected. @@ -88,6 +97,10 @@ The plot directive has the following configuration options: +plot_output_base_name + Default value for the output-base-name option (default is to use the name + of the input script, or the name of the RST file if no script is provided) + plot_include_source Default value for the include-source option (default: False). @@ -265,6 +278,7 @@ class PlotDirective(Directive): 'scale': directives.nonnegative_int, 'align': Image.align, 'class': directives.class_option, + 'output-base-name': directives.unchanged, 'include-source': _option_boolean, 'show-source-link': _option_boolean, 'format': _option_format, @@ -299,6 +313,7 @@ def setup(app): app.add_config_value('plot_pre_code', None, True) app.add_config_value('plot_include_source', False, True) app.add_config_value('plot_html_show_source_link', True, True) + app.add_config_value('plot_output_base_name', None, True) app.add_config_value('plot_formats', ['png', 'hires.png', 'pdf'], True) app.add_config_value('plot_basedir', None, True) app.add_config_value('plot_html_show_formats', True, True) @@ -734,6 +749,7 @@ def run(arguments, content, options, state_machine, state, lineno): options.setdefault('include-source', config.plot_include_source) options.setdefault('show-source-link', config.plot_html_show_source_link) + options.setdefault('output-base-name', config.plot_output_base_name) if 'class' in options: # classes are parsed into a list of string, and output by simply @@ -775,14 +791,20 @@ def run(arguments, content, options, state_machine, state, lineno): function_name = None code = Path(source_file_name).read_text(encoding='utf-8') - output_base = os.path.basename(source_file_name) + if options['output-base-name']: + output_base = options['output-base-name'] + else: + output_base = os.path.basename(source_file_name) else: source_file_name = rst_file code = textwrap.dedent("\n".join(map(str, content))) counter = document.attributes.get('_plot_counter', 0) + 1 document.attributes['_plot_counter'] = counter base, ext = os.path.splitext(os.path.basename(source_file_name)) - output_base = '%s-%d.py' % (base, counter) + if options['output-base-name']: + output_base = options['output-base-name'].format(counter=counter) + else: + output_base = '%s-%d.py' % (base, counter) function_name = None caption = options.get('caption', '') From b4329626dde5665918c4b42fe6e9669d68aa4c73 Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Wed, 8 May 2024 23:15:19 -0600 Subject: [PATCH 002/161] Add tests for output-base-name --- lib/matplotlib/tests/test_sphinxext.py | 3 +++ lib/matplotlib/tests/tinypages/some_plots.rst | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/lib/matplotlib/tests/test_sphinxext.py b/lib/matplotlib/tests/test_sphinxext.py index 6624e3b17ba5..29d6f3168621 100644 --- a/lib/matplotlib/tests/test_sphinxext.py +++ b/lib/matplotlib/tests/test_sphinxext.py @@ -97,6 +97,9 @@ def plot_directive_file(num): assert filecmp.cmp(range_6, plot_file(17)) # plot 22 is from the range6.py file again, but a different function assert filecmp.cmp(range_10, img_dir / 'range6_range10.png') + # plots 23 and 24 use a custom base name with {counter} + assert filecmp.cmp(range_4, img_dir / 'custom-base-name-18.png') + assert filecmp.cmp(range_6, img_dir / 'custom-base-name-19.png') # Modify the included plot contents = (tmp_path / 'included_plot_21.rst').read_bytes() diff --git a/lib/matplotlib/tests/tinypages/some_plots.rst b/lib/matplotlib/tests/tinypages/some_plots.rst index dd1f79892b0e..b484d705ae1c 100644 --- a/lib/matplotlib/tests/tinypages/some_plots.rst +++ b/lib/matplotlib/tests/tinypages/some_plots.rst @@ -174,3 +174,15 @@ Plot 21 is generated via an include directive: Plot 22 uses a different specific function in a file with plot commands: .. plot:: range6.py range10 + +Plots 23 and 24 use output-base-name with a {counter}. + +.. plot:: + :output-base-name: custom-base-name-{counter} + + plt.plot(range(4)) + +.. plot:: + :output-base-name: custom-base-name-{counter} + + plt.plot(range(6)) From 426abc7ec938f8de77eb5eb0760d262bfe3f5491 Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Fri, 11 Oct 2024 20:56:44 +0200 Subject: [PATCH 003/161] Remove {counter} from output-base-name and remove the global config The idea of allowing the use of the counter for custom base names is flawed because the counter would always be incremented even for custom names that don't use it. Also, the global base name is difficult to get working because we don't have a good global view of the plots to create a counter, especially in the case of partial rebuilds. Instead, we just simplify things by just allowing setting a custom-base-name. If two plot directives use the same custom-base-name, then one will end up overwriting the other (I'm still looking into whether it's possible to at least detect this and give an error). --- lib/matplotlib/sphinxext/plot_directive.py | 18 +++++------------- lib/matplotlib/tests/test_sphinxext.py | 6 +++--- lib/matplotlib/tests/tinypages/some_plots.rst | 6 +++--- 3 files changed, 11 insertions(+), 19 deletions(-) diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py index 249979c942ad..4e7b0ffd20c7 100644 --- a/lib/matplotlib/sphinxext/plot_directive.py +++ b/lib/matplotlib/sphinxext/plot_directive.py @@ -50,10 +50,7 @@ ``:output-base-name:`` : str The base name (without the extension) of the outputted image files. The default is to use the same name as the input script, or the name of - the RST document if no script is provided. The string can include the - format ``{counter}`` to use an incremented counter. For example, - ``'plot-{counter}'`` will create files like ``plot-1.png``, ``plot-2.png``, - and so on. If the ``{counter}`` is not provided, two plots with the same + the RST document if no script is provided. Note: two plots with the same output-base-name may overwrite each other. ``:format:`` : {'python', 'doctest'} @@ -97,10 +94,6 @@ The plot directive has the following configuration options: -plot_output_base_name - Default value for the output-base-name option (default is to use the name - of the input script, or the name of the RST file if no script is provided) - plot_include_source Default value for the include-source option (default: False). @@ -313,7 +306,6 @@ def setup(app): app.add_config_value('plot_pre_code', None, True) app.add_config_value('plot_include_source', False, True) app.add_config_value('plot_html_show_source_link', True, True) - app.add_config_value('plot_output_base_name', None, True) app.add_config_value('plot_formats', ['png', 'hires.png', 'pdf'], True) app.add_config_value('plot_basedir', None, True) app.add_config_value('plot_html_show_formats', True, True) @@ -749,7 +741,7 @@ def run(arguments, content, options, state_machine, state, lineno): options.setdefault('include-source', config.plot_include_source) options.setdefault('show-source-link', config.plot_html_show_source_link) - options.setdefault('output-base-name', config.plot_output_base_name) + options.setdefault('output-base-name', None) if 'class' in options: # classes are parsed into a list of string, and output by simply @@ -798,12 +790,12 @@ def run(arguments, content, options, state_machine, state, lineno): else: source_file_name = rst_file code = textwrap.dedent("\n".join(map(str, content))) - counter = document.attributes.get('_plot_counter', 0) + 1 - document.attributes['_plot_counter'] = counter base, ext = os.path.splitext(os.path.basename(source_file_name)) if options['output-base-name']: - output_base = options['output-base-name'].format(counter=counter) + output_base = options['output-base-name'] else: + counter = document.attributes.get('_plot_counter', 0) + 1 + document.attributes['_plot_counter'] = counter output_base = '%s-%d.py' % (base, counter) function_name = None caption = options.get('caption', '') diff --git a/lib/matplotlib/tests/test_sphinxext.py b/lib/matplotlib/tests/test_sphinxext.py index 29d6f3168621..3555ab3462c3 100644 --- a/lib/matplotlib/tests/test_sphinxext.py +++ b/lib/matplotlib/tests/test_sphinxext.py @@ -97,9 +97,9 @@ def plot_directive_file(num): assert filecmp.cmp(range_6, plot_file(17)) # plot 22 is from the range6.py file again, but a different function assert filecmp.cmp(range_10, img_dir / 'range6_range10.png') - # plots 23 and 24 use a custom base name with {counter} - assert filecmp.cmp(range_4, img_dir / 'custom-base-name-18.png') - assert filecmp.cmp(range_6, img_dir / 'custom-base-name-19.png') + # plots 23 and 24 use a custom base name + assert filecmp.cmp(range_4, img_dir / 'custom-base-name-1.png') + assert filecmp.cmp(range_6, img_dir / 'custom-base-name-2.png') # Modify the included plot contents = (tmp_path / 'included_plot_21.rst').read_bytes() diff --git a/lib/matplotlib/tests/tinypages/some_plots.rst b/lib/matplotlib/tests/tinypages/some_plots.rst index b484d705ae1c..05a7fc34c92a 100644 --- a/lib/matplotlib/tests/tinypages/some_plots.rst +++ b/lib/matplotlib/tests/tinypages/some_plots.rst @@ -175,14 +175,14 @@ Plot 22 uses a different specific function in a file with plot commands: .. plot:: range6.py range10 -Plots 23 and 24 use output-base-name with a {counter}. +Plots 23 and 24 use output-base-name. .. plot:: - :output-base-name: custom-base-name-{counter} + :output-base-name: custom-base-name-1 plt.plot(range(4)) .. plot:: - :output-base-name: custom-base-name-{counter} + :output-base-name: custom-base-name-2 plt.plot(range(6)) From 8485bfd9f1dcd1feabefb8cda0595a58e73321be Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Fri, 11 Oct 2024 21:41:39 +0200 Subject: [PATCH 004/161] Check for duplicate output-base-name in the Sphinx extension Previously it would just overwrite one plot with the other. I did not add tests for this because I would have to create a whole separate docs build just to test the error (but I have tested it manually). --- lib/matplotlib/sphinxext/plot_directive.py | 45 +++++++++++++++++++++- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py index 4e7b0ffd20c7..7b3383e34840 100644 --- a/lib/matplotlib/sphinxext/plot_directive.py +++ b/lib/matplotlib/sphinxext/plot_directive.py @@ -50,8 +50,8 @@ ``:output-base-name:`` : str The base name (without the extension) of the outputted image files. The default is to use the same name as the input script, or the name of - the RST document if no script is provided. Note: two plots with the same - output-base-name may overwrite each other. + the RST document if no script is provided. The output-base-name for each + plot directive must be unique. ``:format:`` : {'python', 'doctest'} The format of the input. If unset, the format is auto-detected. @@ -171,6 +171,7 @@ and *TEMPLATE_SRCSET*. """ +from collections import defaultdict import contextlib import doctest from io import StringIO @@ -188,6 +189,7 @@ from docutils.parsers.rst.directives.images import Image import jinja2 # Sphinx dependency. +from sphinx.environment.collectors import EnvironmentCollector from sphinx.errors import ExtensionError import matplotlib @@ -319,9 +321,35 @@ def setup(app): app.connect('build-finished', _copy_css_file) metadata = {'parallel_read_safe': True, 'parallel_write_safe': True, 'version': matplotlib.__version__} + app.connect('builder-inited', init_filename_registry) + app.add_env_collector(FilenameCollector) return metadata +# ----------------------------------------------------------------------------- +# Handle Duplicate Filenames +# ----------------------------------------------------------------------------- + +def init_filename_registry(app): + env = app.builder.env + if not hasattr(env, 'mpl_custom_base_names'): + env.mpl_custom_base_names = defaultdict(set) + +class FilenameCollector(EnvironmentCollector): + def process_doc(self, app, doctree): + pass + + def clear_doc(self, app, env, docname): + if docname in env.mpl_custom_base_names: + del env.mpl_custom_base_names[docname] + + def merge_other(self, app, env, docnames, other): + for docname in docnames: + if docname in other.mpl_custom_base_names: + if docname not in env.mpl_custom_base_names: + env.mpl_custom_base_names[docname] = set() + env.mpl_custom_base_names[docname].update(other.mpl_custom_base_names[docname]) + # ----------------------------------------------------------------------------- # Doctest handling # ----------------------------------------------------------------------------- @@ -606,6 +634,16 @@ def _parse_srcset(entries): raise ExtensionError(f'srcset argument {entry!r} is invalid.') return srcset +def check_output_base_name(env, output_base): + docname = env.docname + + for d in env.mpl_custom_base_names: + if output_base in env.mpl_custom_base_names[d]: + if d == docname: + raise PlotError(f"The output-base-name '{output_base}' is used multiple times.") + raise PlotError(f"The output-base-name '{output_base}' is used multiple times (it is also used in {env.doc2path(d)}).") + + env.mpl_custom_base_names[docname].add(output_base) def render_figures(code, code_path, output_dir, output_base, context, function_name, config, context_reset=False, @@ -730,6 +768,7 @@ def render_figures(code, code_path, output_dir, output_base, context, def run(arguments, content, options, state_machine, state, lineno): document = state_machine.document config = document.settings.env.config + env = document.settings.env nofigs = 'nofigs' in options if config.plot_srcset and setup.app.builder.name == 'singlehtml': @@ -785,6 +824,7 @@ def run(arguments, content, options, state_machine, state, lineno): code = Path(source_file_name).read_text(encoding='utf-8') if options['output-base-name']: output_base = options['output-base-name'] + check_output_base_name(env, output_base) else: output_base = os.path.basename(source_file_name) else: @@ -793,6 +833,7 @@ def run(arguments, content, options, state_machine, state, lineno): base, ext = os.path.splitext(os.path.basename(source_file_name)) if options['output-base-name']: output_base = options['output-base-name'] + check_output_base_name(env, output_base) else: counter = document.attributes.get('_plot_counter', 0) + 1 document.attributes['_plot_counter'] = counter From f94a9324036a8da1141e4c275eb231c26c20cccc Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Fri, 11 Oct 2024 19:04:02 -0500 Subject: [PATCH 005/161] Fix flake8 errors --- lib/matplotlib/sphinxext/plot_directive.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py index 7b3383e34840..abce90dfc0e3 100644 --- a/lib/matplotlib/sphinxext/plot_directive.py +++ b/lib/matplotlib/sphinxext/plot_directive.py @@ -335,6 +335,7 @@ def init_filename_registry(app): if not hasattr(env, 'mpl_custom_base_names'): env.mpl_custom_base_names = defaultdict(set) + class FilenameCollector(EnvironmentCollector): def process_doc(self, app, doctree): pass @@ -348,7 +349,8 @@ def merge_other(self, app, env, docnames, other): if docname in other.mpl_custom_base_names: if docname not in env.mpl_custom_base_names: env.mpl_custom_base_names[docname] = set() - env.mpl_custom_base_names[docname].update(other.mpl_custom_base_names[docname]) + env.mpl_custom_base_names[docname].update( + other.mpl_custom_base_names[docname]) # ----------------------------------------------------------------------------- # Doctest handling @@ -634,17 +636,23 @@ def _parse_srcset(entries): raise ExtensionError(f'srcset argument {entry!r} is invalid.') return srcset + def check_output_base_name(env, output_base): docname = env.docname for d in env.mpl_custom_base_names: if output_base in env.mpl_custom_base_names[d]: if d == docname: - raise PlotError(f"The output-base-name '{output_base}' is used multiple times.") - raise PlotError(f"The output-base-name '{output_base}' is used multiple times (it is also used in {env.doc2path(d)}).") + raise PlotError( + f"The output-base-name " + f"{output_base}' is used multiple times.") + raise PlotError(f"The output-base-name " + f"'{output_base}' is used multiple times " + f"(it is also used in {env.doc2path(d)}).") env.mpl_custom_base_names[docname].add(output_base) + def render_figures(code, code_path, output_dir, output_base, context, function_name, config, context_reset=False, close_figs=False, From 8f05ba6eb541cb7f19ec74f8c6e934a32fdd9380 Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Sat, 12 Oct 2024 16:31:22 -0600 Subject: [PATCH 006/161] Make an internal class private This will hopefully fix Sphinx trying and failing to include it. --- lib/matplotlib/sphinxext/plot_directive.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py index abce90dfc0e3..71fe0e7d7850 100644 --- a/lib/matplotlib/sphinxext/plot_directive.py +++ b/lib/matplotlib/sphinxext/plot_directive.py @@ -322,7 +322,7 @@ def setup(app): metadata = {'parallel_read_safe': True, 'parallel_write_safe': True, 'version': matplotlib.__version__} app.connect('builder-inited', init_filename_registry) - app.add_env_collector(FilenameCollector) + app.add_env_collector(_FilenameCollector) return metadata @@ -336,7 +336,7 @@ def init_filename_registry(app): env.mpl_custom_base_names = defaultdict(set) -class FilenameCollector(EnvironmentCollector): +class _FilenameCollector(EnvironmentCollector): def process_doc(self, app, doctree): pass From 1fa88dd1e3936f3fe2847b1b532f8cae214428d1 Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Mon, 14 Oct 2024 10:32:31 -0600 Subject: [PATCH 007/161] Fix small code nit --- lib/matplotlib/sphinxext/plot_directive.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py index 71fe0e7d7850..16866459e784 100644 --- a/lib/matplotlib/sphinxext/plot_directive.py +++ b/lib/matplotlib/sphinxext/plot_directive.py @@ -838,11 +838,11 @@ def run(arguments, content, options, state_machine, state, lineno): else: source_file_name = rst_file code = textwrap.dedent("\n".join(map(str, content))) - base, ext = os.path.splitext(os.path.basename(source_file_name)) if options['output-base-name']: output_base = options['output-base-name'] check_output_base_name(env, output_base) else: + base, ext = os.path.splitext(os.path.basename(source_file_name)) counter = document.attributes.get('_plot_counter', 0) + 1 document.attributes['_plot_counter'] = counter output_base = '%s-%d.py' % (base, counter) From a22fcc304e251b28b46f9f69884fe053a7790e81 Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Mon, 14 Oct 2024 10:32:41 -0600 Subject: [PATCH 008/161] Add a test for output-base-name with a .py file --- lib/matplotlib/tests/test_sphinxext.py | 7 ++++--- lib/matplotlib/tests/tinypages/some_plots.rst | 13 ++++++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lib/matplotlib/tests/test_sphinxext.py b/lib/matplotlib/tests/test_sphinxext.py index 758b440d4dc0..4370d9cea47d 100644 --- a/lib/matplotlib/tests/test_sphinxext.py +++ b/lib/matplotlib/tests/test_sphinxext.py @@ -96,9 +96,10 @@ def plot_directive_file(num): assert filecmp.cmp(range_6, plot_file(17)) # plot 22 is from the range6.py file again, but a different function assert filecmp.cmp(range_10, img_dir / 'range6_range10.png') - # plots 23 and 24 use a custom base name - assert filecmp.cmp(range_4, img_dir / 'custom-base-name-1.png') - assert filecmp.cmp(range_6, img_dir / 'custom-base-name-2.png') + # plots 23 through 25 use a custom base name + assert filecmp.cmp(range_6, img_dir / 'custom-base-name-6.png') + assert filecmp.cmp(range_10, img_dir / 'custom-base-name-10.png') + assert filecmp.cmp(range_4, img_dir / 'custom-base-name-4.png') # Modify the included plot contents = (tmp_path / 'included_plot_21.rst').read_bytes() diff --git a/lib/matplotlib/tests/tinypages/some_plots.rst b/lib/matplotlib/tests/tinypages/some_plots.rst index 05a7fc34c92a..7652c7301563 100644 --- a/lib/matplotlib/tests/tinypages/some_plots.rst +++ b/lib/matplotlib/tests/tinypages/some_plots.rst @@ -175,14 +175,17 @@ Plot 22 uses a different specific function in a file with plot commands: .. plot:: range6.py range10 -Plots 23 and 24 use output-base-name. +Plots 23 through 25 use output-base-name. .. plot:: - :output-base-name: custom-base-name-1 + :output-base-name: custom-base-name-6 - plt.plot(range(4)) + plt.plot(range(6)) .. plot:: - :output-base-name: custom-base-name-2 + :output-base-name: custom-base-name-10 - plt.plot(range(6)) + plt.plot(range(10)) + +.. plot:: range4.py + :output-base-name: custom-base-name-4 From 86fb16710c43a5e6c2354371ff3124d39178b876 Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Thu, 17 Oct 2024 12:37:25 -0600 Subject: [PATCH 009/161] Remove a redundant test --- lib/matplotlib/tests/test_sphinxext.py | 3 +-- lib/matplotlib/tests/tinypages/some_plots.rst | 7 +------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/matplotlib/tests/test_sphinxext.py b/lib/matplotlib/tests/test_sphinxext.py index 4370d9cea47d..64759f650b06 100644 --- a/lib/matplotlib/tests/test_sphinxext.py +++ b/lib/matplotlib/tests/test_sphinxext.py @@ -96,9 +96,8 @@ def plot_directive_file(num): assert filecmp.cmp(range_6, plot_file(17)) # plot 22 is from the range6.py file again, but a different function assert filecmp.cmp(range_10, img_dir / 'range6_range10.png') - # plots 23 through 25 use a custom base name + # plots 23 and 24 use a custom base name assert filecmp.cmp(range_6, img_dir / 'custom-base-name-6.png') - assert filecmp.cmp(range_10, img_dir / 'custom-base-name-10.png') assert filecmp.cmp(range_4, img_dir / 'custom-base-name-4.png') # Modify the included plot diff --git a/lib/matplotlib/tests/tinypages/some_plots.rst b/lib/matplotlib/tests/tinypages/some_plots.rst index 7652c7301563..51348415f128 100644 --- a/lib/matplotlib/tests/tinypages/some_plots.rst +++ b/lib/matplotlib/tests/tinypages/some_plots.rst @@ -175,17 +175,12 @@ Plot 22 uses a different specific function in a file with plot commands: .. plot:: range6.py range10 -Plots 23 through 25 use output-base-name. +Plots 23 and 24 use output-base-name. .. plot:: :output-base-name: custom-base-name-6 plt.plot(range(6)) -.. plot:: - :output-base-name: custom-base-name-10 - - plt.plot(range(10)) - .. plot:: range4.py :output-base-name: custom-base-name-4 From e0be21e57d68e49d1380bae4af22a44575abca55 Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Thu, 17 Oct 2024 12:37:35 -0600 Subject: [PATCH 010/161] Disallow / or . in output-base-name --- lib/matplotlib/sphinxext/plot_directive.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py index 16866459e784..3e10aac176c7 100644 --- a/lib/matplotlib/sphinxext/plot_directive.py +++ b/lib/matplotlib/sphinxext/plot_directive.py @@ -640,6 +640,11 @@ def _parse_srcset(entries): def check_output_base_name(env, output_base): docname = env.docname + if '.' in output_base or '/' in output_base: + raise PlotError( + f"The output-base-name '{output_base}' is invalid. " + f"It must not contain dots or slashes.") + for d in env.mpl_custom_base_names: if output_base in env.mpl_custom_base_names[d]: if d == docname: From f322125f9fdd2734831130de9d975d73bbff7a92 Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Fri, 18 Oct 2024 12:27:34 -0600 Subject: [PATCH 011/161] Rename output-base-name to image-basename --- lib/matplotlib/sphinxext/plot_directive.py | 22 +++++++++---------- lib/matplotlib/tests/test_sphinxext.py | 6 ++--- lib/matplotlib/tests/tinypages/some_plots.rst | 6 ++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py index 3e10aac176c7..d4b547686283 100644 --- a/lib/matplotlib/sphinxext/plot_directive.py +++ b/lib/matplotlib/sphinxext/plot_directive.py @@ -47,10 +47,10 @@ The ``.. plot::`` directive supports the following options: -``:output-base-name:`` : str +``:image-basename:`` : str The base name (without the extension) of the outputted image files. The default is to use the same name as the input script, or the name of - the RST document if no script is provided. The output-base-name for each + the RST document if no script is provided. The image-basename for each plot directive must be unique. ``:format:`` : {'python', 'doctest'} @@ -273,7 +273,7 @@ class PlotDirective(Directive): 'scale': directives.nonnegative_int, 'align': Image.align, 'class': directives.class_option, - 'output-base-name': directives.unchanged, + 'image-basename': directives.unchanged, 'include-source': _option_boolean, 'show-source-link': _option_boolean, 'format': _option_format, @@ -642,16 +642,16 @@ def check_output_base_name(env, output_base): if '.' in output_base or '/' in output_base: raise PlotError( - f"The output-base-name '{output_base}' is invalid. " + f"The image-basename '{output_base}' is invalid. " f"It must not contain dots or slashes.") for d in env.mpl_custom_base_names: if output_base in env.mpl_custom_base_names[d]: if d == docname: raise PlotError( - f"The output-base-name " + f"The image-basename " f"{output_base}' is used multiple times.") - raise PlotError(f"The output-base-name " + raise PlotError(f"The image-basename " f"'{output_base}' is used multiple times " f"(it is also used in {env.doc2path(d)}).") @@ -793,7 +793,7 @@ def run(arguments, content, options, state_machine, state, lineno): options.setdefault('include-source', config.plot_include_source) options.setdefault('show-source-link', config.plot_html_show_source_link) - options.setdefault('output-base-name', None) + options.setdefault('image-basename', None) if 'class' in options: # classes are parsed into a list of string, and output by simply @@ -835,16 +835,16 @@ def run(arguments, content, options, state_machine, state, lineno): function_name = None code = Path(source_file_name).read_text(encoding='utf-8') - if options['output-base-name']: - output_base = options['output-base-name'] + if options['image-basename']: + output_base = options['image-basename'] check_output_base_name(env, output_base) else: output_base = os.path.basename(source_file_name) else: source_file_name = rst_file code = textwrap.dedent("\n".join(map(str, content))) - if options['output-base-name']: - output_base = options['output-base-name'] + if options['image-basename']: + output_base = options['image-basename'] check_output_base_name(env, output_base) else: base, ext = os.path.splitext(os.path.basename(source_file_name)) diff --git a/lib/matplotlib/tests/test_sphinxext.py b/lib/matplotlib/tests/test_sphinxext.py index 64759f650b06..139bd56d8fe3 100644 --- a/lib/matplotlib/tests/test_sphinxext.py +++ b/lib/matplotlib/tests/test_sphinxext.py @@ -96,9 +96,9 @@ def plot_directive_file(num): assert filecmp.cmp(range_6, plot_file(17)) # plot 22 is from the range6.py file again, but a different function assert filecmp.cmp(range_10, img_dir / 'range6_range10.png') - # plots 23 and 24 use a custom base name - assert filecmp.cmp(range_6, img_dir / 'custom-base-name-6.png') - assert filecmp.cmp(range_4, img_dir / 'custom-base-name-4.png') + # plots 23 and 24 use a custom basename + assert filecmp.cmp(range_6, img_dir / 'custom-basename-6.png') + assert filecmp.cmp(range_4, img_dir / 'custom-basename-4.png') # Modify the included plot contents = (tmp_path / 'included_plot_21.rst').read_bytes() diff --git a/lib/matplotlib/tests/tinypages/some_plots.rst b/lib/matplotlib/tests/tinypages/some_plots.rst index 51348415f128..85e53086e792 100644 --- a/lib/matplotlib/tests/tinypages/some_plots.rst +++ b/lib/matplotlib/tests/tinypages/some_plots.rst @@ -175,12 +175,12 @@ Plot 22 uses a different specific function in a file with plot commands: .. plot:: range6.py range10 -Plots 23 and 24 use output-base-name. +Plots 23 and 24 use image-basename. .. plot:: - :output-base-name: custom-base-name-6 + :image-basename: custom-basename-6 plt.plot(range(6)) .. plot:: range4.py - :output-base-name: custom-base-name-4 + :image-basename: custom-basename-4 From fc33c3887dd5a8455d06b329a4a32c302771f267 Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Mon, 21 Oct 2024 12:30:41 -0600 Subject: [PATCH 012/161] Use a better variable name --- lib/matplotlib/sphinxext/plot_directive.py | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py index d4b547686283..535b4b5b5fd9 100644 --- a/lib/matplotlib/sphinxext/plot_directive.py +++ b/lib/matplotlib/sphinxext/plot_directive.py @@ -332,8 +332,8 @@ def setup(app): def init_filename_registry(app): env = app.builder.env - if not hasattr(env, 'mpl_custom_base_names'): - env.mpl_custom_base_names = defaultdict(set) + if not hasattr(env, 'mpl_plot_image_basenames'): + env.mpl_plot_image_basenames = defaultdict(set) class _FilenameCollector(EnvironmentCollector): @@ -341,16 +341,16 @@ def process_doc(self, app, doctree): pass def clear_doc(self, app, env, docname): - if docname in env.mpl_custom_base_names: - del env.mpl_custom_base_names[docname] + if docname in env.mpl_plot_image_basenames: + del env.mpl_plot_image_basenames[docname] def merge_other(self, app, env, docnames, other): for docname in docnames: - if docname in other.mpl_custom_base_names: - if docname not in env.mpl_custom_base_names: - env.mpl_custom_base_names[docname] = set() - env.mpl_custom_base_names[docname].update( - other.mpl_custom_base_names[docname]) + if docname in other.mpl_plot_image_basenames: + if docname not in env.mpl_plot_image_basenames: + env.mpl_plot_image_basenames[docname] = set() + env.mpl_plot_image_basenames[docname].update( + other.mpl_plot_image_basenames[docname]) # ----------------------------------------------------------------------------- # Doctest handling @@ -645,8 +645,8 @@ def check_output_base_name(env, output_base): f"The image-basename '{output_base}' is invalid. " f"It must not contain dots or slashes.") - for d in env.mpl_custom_base_names: - if output_base in env.mpl_custom_base_names[d]: + for d in env.mpl_plot_image_basenames: + if output_base in env.mpl_plot_image_basenames[d]: if d == docname: raise PlotError( f"The image-basename " @@ -655,7 +655,7 @@ def check_output_base_name(env, output_base): f"'{output_base}' is used multiple times " f"(it is also used in {env.doc2path(d)}).") - env.mpl_custom_base_names[docname].add(output_base) + env.mpl_plot_image_basenames[docname].add(output_base) def render_figures(code, code_path, output_dir, output_base, context, From 7d416cf7cc90151c80435df583bf16f3524c565f Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Mon, 21 Oct 2024 12:34:48 -0600 Subject: [PATCH 013/161] Simplify logic in merge_other --- lib/matplotlib/sphinxext/plot_directive.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py index 535b4b5b5fd9..d6034ac9cd9a 100644 --- a/lib/matplotlib/sphinxext/plot_directive.py +++ b/lib/matplotlib/sphinxext/plot_directive.py @@ -345,12 +345,10 @@ def clear_doc(self, app, env, docname): del env.mpl_plot_image_basenames[docname] def merge_other(self, app, env, docnames, other): - for docname in docnames: - if docname in other.mpl_plot_image_basenames: - if docname not in env.mpl_plot_image_basenames: - env.mpl_plot_image_basenames[docname] = set() - env.mpl_plot_image_basenames[docname].update( - other.mpl_plot_image_basenames[docname]) + for docname in other.mpl_plot_image_basenames: + env.mpl_plot_image_basenames[docname].update( + other.mpl_plot_image_basenames[docname]) + # ----------------------------------------------------------------------------- # Doctest handling From 8a51fd92f65fec226733d911ab1633a8eb3e8e0d Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Sat, 12 Apr 2025 23:40:30 -0400 Subject: [PATCH 014/161] DOC: add warnings about get_window_extent and BboxImage Closes #2831 --- lib/matplotlib/artist.py | 26 +++++++++++++------ lib/matplotlib/image.py | 56 +++++++++++++++++++++++++++++++++------- 2 files changed, 65 insertions(+), 17 deletions(-) diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py index c87c789048c4..f4782f0d942d 100644 --- a/lib/matplotlib/artist.py +++ b/lib/matplotlib/artist.py @@ -329,19 +329,29 @@ def get_window_extent(self, renderer=None): """ Get the artist's bounding box in display space. - The bounding box' width and height are nonnegative. + The bounding box's width and height are non-negative. Subclasses should override for inclusion in the bounding box "tight" calculation. Default is to return an empty bounding box at 0, 0. - Be careful when using this function, the results will not update - if the artist window extent of the artist changes. The extent - can change due to any changes in the transform stack, such as - changing the Axes limits, the figure size, or the canvas used - (as is done when saving a figure). This can lead to unexpected - behavior where interactive figures will look fine on the screen, - but will save incorrectly. + .. warning :: + + Be careful when using this function, the results will not update if + the artist window extent of the artist changes. + + The extent can change due to any changes in the transform stack, such + as changing the Axes limits, the figure size, the canvas used (as is + done when saving a figure), or the DPI. + + This can lead to unexpected behavior where interactive figures will + look fine on the screen, but will save incorrectly. + + To get accurate results you may need to manually call + `matplotlib.figure.Figure.savefig` or + `matplotlib.figure.Figure.draw_without_rendering` to have Matplotlib + compute the rendered size. + """ return Bbox([[0, 0], [0, 0]]) diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py index bd1254c27fe1..8aa48f30d947 100644 --- a/lib/matplotlib/image.py +++ b/lib/matplotlib/image.py @@ -1374,8 +1374,52 @@ def set_data(self, A): class BboxImage(_ImageBase): - """The Image class whose size is determined by the given bbox.""" + """ + The Image class whose size is determined by the given bbox. + + Parameters + ---------- + bbox : BboxBase or Callable[RendererBase, BboxBase] + The bbox or a function to generate the bbox + + .. warning :: + + If using `matplotlib.artist.Artist.get_window_extent` as the + callable ensure that the other artist is drawn first (lower zorder) + or you may need to renderer the figure twice to ensure that the + computed bbox is accurate. + cmap : str or `~matplotlib.colors.Colormap`, default: :rc:`image.cmap` + The Colormap instance or registered colormap name used to map scalar + data to colors. + norm : str or `~matplotlib.colors.Normalize` + Maps luminance to 0-1. + interpolation : str, default: :rc:`image.interpolation` + Supported values are 'none', 'auto', 'nearest', 'bilinear', + 'bicubic', 'spline16', 'spline36', 'hanning', 'hamming', 'hermite', + 'kaiser', 'quadric', 'catrom', 'gaussian', 'bessel', 'mitchell', + 'sinc', 'lanczos', 'blackman'. + origin : {'upper', 'lower'}, default: :rc:`image.origin` + Place the [0, 0] index of the array in the upper left or lower left + corner of the Axes. The convention 'upper' is typically used for + matrices and images. + filternorm : bool, default: True + A parameter for the antigrain image resize filter + (see the antigrain documentation). + If filternorm is set, the filter normalizes integer values and corrects + the rounding errors. It doesn't do anything with the source floating + point values, it corrects only integers according to the rule of 1.0 + which means that any sum of pixel weights must be equal to 1.0. So, + the filter function must produce a graph of the proper shape. + filterrad : float > 0, default: 4 + The filter radius for filters that have a radius parameter, i.e. when + interpolation is one of: 'sinc', 'lanczos' or 'blackman'. + resample : bool, default: False + When True, use a full resampling method. When False, only resample when + the output image is larger than the input image. + **kwargs : `~matplotlib.artist.Artist` properties + + """ def __init__(self, bbox, *, cmap=None, @@ -1388,12 +1432,7 @@ def __init__(self, bbox, resample=False, **kwargs ): - """ - cmap is a colors.Colormap instance - norm is a colors.Normalize instance to map luminance to 0-1 - kwargs are an optional list of Artist keyword args - """ super().__init__( None, cmap=cmap, @@ -1409,12 +1448,11 @@ def __init__(self, bbox, self.bbox = bbox def get_window_extent(self, renderer=None): - if renderer is None: - renderer = self.get_figure()._get_renderer() - if isinstance(self.bbox, BboxBase): return self.bbox elif callable(self.bbox): + if renderer is None: + renderer = self.get_figure()._get_renderer() return self.bbox(renderer) else: raise ValueError("Unknown type of bbox") From 8865ece2cb72b46e23309f59d14f15c0aead1dfa Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Mon, 14 Apr 2025 09:08:49 -0400 Subject: [PATCH 015/161] DOC: fix rst markup Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> --- lib/matplotlib/artist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py index f4782f0d942d..fa468e7ffe4f 100644 --- a/lib/matplotlib/artist.py +++ b/lib/matplotlib/artist.py @@ -335,7 +335,7 @@ def get_window_extent(self, renderer=None): "tight" calculation. Default is to return an empty bounding box at 0, 0. - .. warning :: + .. warning:: Be careful when using this function, the results will not update if the artist window extent of the artist changes. From d494c318707db65110783ae629e6f498afe7bcb1 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Mon, 14 Apr 2025 09:17:57 -0400 Subject: [PATCH 016/161] DOC: clarify wording Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> --- lib/matplotlib/artist.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py index fa468e7ffe4f..39fed23d1d7c 100644 --- a/lib/matplotlib/artist.py +++ b/lib/matplotlib/artist.py @@ -337,15 +337,14 @@ def get_window_extent(self, renderer=None): .. warning:: - Be careful when using this function, the results will not update if - the artist window extent of the artist changes. - The extent can change due to any changes in the transform stack, such as changing the Axes limits, the figure size, the canvas used (as is done when saving a figure), or the DPI. - This can lead to unexpected behavior where interactive figures will - look fine on the screen, but will save incorrectly. + Relying on a once-retrieved window extent can lead to unexpected + behavior in various cases such as interactive figures being resized or + moved to a screen with different dpi, or figures that look fine on + screen render incorrectly when saved to file. To get accurate results you may need to manually call `matplotlib.figure.Figure.savefig` or From f7972682baa9afdbdba247da5a31852beac34726 Mon Sep 17 00:00:00 2001 From: Oscar Gustafsson Date: Thu, 29 Aug 2024 10:36:15 +0200 Subject: [PATCH 017/161] Change first argument to add_axes from list to tuple --- doc/project/history.rst | 4 ++-- doc/users/prev_whats_new/whats_new_3.5.0.rst | 6 +++--- galleries/examples/animation/rain.py | 2 +- .../make_room_for_ylabel_using_axesgrid.py | 8 ++++---- .../examples/axisartist/demo_parasite_axes.py | 2 +- .../images_contours_and_fields/barcode_demo.py | 2 +- .../image_antialiasing.py | 2 +- .../image_exact_placement.py | 8 ++++---- galleries/examples/misc/svg_filter_line.py | 2 +- galleries/examples/misc/svg_filter_pie.py | 2 +- galleries/examples/showcase/anatomy.py | 2 +- galleries/examples/showcase/firefox.py | 2 +- galleries/examples/showcase/mandelbrot.py | 2 +- .../subplots_axes_and_figures/axes_demo.py | 4 ++-- .../mathtext_examples.py | 2 +- .../ticks/fig_axes_customize_simple.py | 2 +- galleries/examples/widgets/buttons.py | 4 ++-- galleries/examples/widgets/range_slider.py | 2 +- galleries/examples/widgets/slider_demo.py | 6 +++--- galleries/examples/widgets/slider_snap_demo.py | 6 +++--- galleries/examples/widgets/textbox.py | 2 +- galleries/tutorials/artists.py | 8 ++++---- galleries/users_explain/axes/arranging_axes.py | 4 ++-- galleries/users_explain/axes/axes_intro.rst | 4 ++-- galleries/users_explain/colors/colors.py | 2 +- galleries/users_explain/text/text_props.py | 2 +- .../users_explain/toolkits/axisartist.rst | 2 +- lib/matplotlib/_enums.py | 2 +- lib/matplotlib/figure.py | 4 ++-- lib/matplotlib/image.py | 2 +- lib/matplotlib/tests/test_artist.py | 4 ++-- lib/matplotlib/tests/test_axes.py | 10 +++++----- lib/matplotlib/tests/test_colorbar.py | 12 ++++++------ lib/matplotlib/tests/test_colors.py | 6 +++--- lib/matplotlib/tests/test_constrainedlayout.py | 4 ++-- lib/matplotlib/tests/test_figure.py | 18 +++++++++--------- lib/matplotlib/tests/test_image.py | 4 ++-- lib/matplotlib/tests/test_marker.py | 4 ++-- lib/matplotlib/tests/test_offsetbox.py | 2 +- lib/matplotlib/tests/test_polar.py | 12 ++++++------ lib/matplotlib/tests/test_usetex.py | 2 +- lib/matplotlib/widgets.py | 2 +- .../axes_grid1/tests/test_axes_grid1.py | 2 +- tools/make_icons.py | 2 +- 44 files changed, 93 insertions(+), 93 deletions(-) diff --git a/doc/project/history.rst b/doc/project/history.rst index 966b7a3caa38..7f148902898b 100644 --- a/doc/project/history.rst +++ b/doc/project/history.rst @@ -157,7 +157,7 @@ Matplotlib logo (2008 - 2015). def add_math_background(): - ax = fig.add_axes([0., 0., 1., 1.]) + ax = fig.add_axes((0., 0., 1., 1.)) text = [] text.append( @@ -187,7 +187,7 @@ Matplotlib logo (2008 - 2015). def add_polar_bar(): - ax = fig.add_axes([0.025, 0.075, 0.2, 0.85], projection='polar') + ax = fig.add_axes((0.025, 0.075, 0.2, 0.85), projection='polar') ax.patch.set_alpha(axalpha) ax.set_axisbelow(True) diff --git a/doc/users/prev_whats_new/whats_new_3.5.0.rst b/doc/users/prev_whats_new/whats_new_3.5.0.rst index e67573702218..54687e9a487e 100644 --- a/doc/users/prev_whats_new/whats_new_3.5.0.rst +++ b/doc/users/prev_whats_new/whats_new_3.5.0.rst @@ -274,9 +274,9 @@ of the text inside the Axes of the `.TextBox` widget. fig = plt.figure(figsize=(4, 3)) for i, alignment in enumerate(['left', 'center', 'right']): - box_input = fig.add_axes([0.1, 0.7 - i*0.3, 0.8, 0.2]) - text_box = TextBox(ax=box_input, initial=f'{alignment} alignment', - label='', textalignment=alignment) + box_input = fig.add_axes((0.1, 0.7 - i*0.3, 0.8, 0.2)) + text_box = TextBox(ax=box_input, initial=f'{alignment} alignment', + label='', textalignment=alignment) Simplifying the font setting for usetex mode -------------------------------------------- diff --git a/galleries/examples/animation/rain.py b/galleries/examples/animation/rain.py index 4303e567d074..2a354aaa7c94 100644 --- a/galleries/examples/animation/rain.py +++ b/galleries/examples/animation/rain.py @@ -22,7 +22,7 @@ # Create new Figure and an Axes which fills it. fig = plt.figure(figsize=(7, 7)) -ax = fig.add_axes([0, 0, 1, 1], frameon=False) +ax = fig.add_axes((0, 0, 1, 1), frameon=False) ax.set_xlim(0, 1), ax.set_xticks([]) ax.set_ylim(0, 1), ax.set_yticks([]) diff --git a/galleries/examples/axes_grid1/make_room_for_ylabel_using_axesgrid.py b/galleries/examples/axes_grid1/make_room_for_ylabel_using_axesgrid.py index f130ef4a6de2..7e914ff76b6b 100644 --- a/galleries/examples/axes_grid1/make_room_for_ylabel_using_axesgrid.py +++ b/galleries/examples/axes_grid1/make_room_for_ylabel_using_axesgrid.py @@ -10,7 +10,7 @@ from mpl_toolkits.axes_grid1.axes_divider import make_axes_area_auto_adjustable fig = plt.figure() -ax = fig.add_axes([0, 0, 1, 1]) +ax = fig.add_axes((0, 0, 1, 1)) ax.set_yticks([0.5], labels=["very long label"]) @@ -19,8 +19,8 @@ # %% fig = plt.figure() -ax1 = fig.add_axes([0, 0, 1, 0.5]) -ax2 = fig.add_axes([0, 0.5, 1, 0.5]) +ax1 = fig.add_axes((0, 0, 1, 0.5)) +ax2 = fig.add_axes((0, 0.5, 1, 0.5)) ax1.set_yticks([0.5], labels=["very long label"]) ax1.set_ylabel("Y label") @@ -33,7 +33,7 @@ # %% fig = plt.figure() -ax1 = fig.add_axes([0, 0, 1, 1]) +ax1 = fig.add_axes((0, 0, 1, 1)) divider = make_axes_locatable(ax1) ax2 = divider.append_axes("right", "100%", pad=0.3, sharey=ax1) diff --git a/galleries/examples/axisartist/demo_parasite_axes.py b/galleries/examples/axisartist/demo_parasite_axes.py index 8565ef455c7e..800b9be32ac8 100644 --- a/galleries/examples/axisartist/demo_parasite_axes.py +++ b/galleries/examples/axisartist/demo_parasite_axes.py @@ -24,7 +24,7 @@ fig = plt.figure() -host = fig.add_axes([0.15, 0.1, 0.65, 0.8], axes_class=HostAxes) +host = fig.add_axes((0.15, 0.1, 0.65, 0.8), axes_class=HostAxes) par1 = host.get_aux_axes(viewlim_mode=None, sharex=host) par2 = host.get_aux_axes(viewlim_mode=None, sharex=host) diff --git a/galleries/examples/images_contours_and_fields/barcode_demo.py b/galleries/examples/images_contours_and_fields/barcode_demo.py index bdf48ca22531..5df58535650d 100644 --- a/galleries/examples/images_contours_and_fields/barcode_demo.py +++ b/galleries/examples/images_contours_and_fields/barcode_demo.py @@ -30,7 +30,7 @@ dpi = 100 fig = plt.figure(figsize=(len(code) * pixel_per_bar / dpi, 2), dpi=dpi) -ax = fig.add_axes([0, 0, 1, 1]) # span the whole figure +ax = fig.add_axes((0, 0, 1, 1)) # span the whole figure ax.set_axis_off() ax.imshow(code.reshape(1, -1), cmap='binary', aspect='auto', interpolation='nearest') diff --git a/galleries/examples/images_contours_and_fields/image_antialiasing.py b/galleries/examples/images_contours_and_fields/image_antialiasing.py index 7f223f6998f2..10f563875767 100644 --- a/galleries/examples/images_contours_and_fields/image_antialiasing.py +++ b/galleries/examples/images_contours_and_fields/image_antialiasing.py @@ -245,7 +245,7 @@ # may serve a 100x100 version of the image, which will be downsampled.) fig = plt.figure(figsize=(2, 2)) -ax = fig.add_axes([0, 0, 1, 1]) +ax = fig.add_axes((0, 0, 1, 1)) ax.imshow(aa[:400, :400], cmap='RdBu_r', interpolation='nearest') plt.show() # %% diff --git a/galleries/examples/images_contours_and_fields/image_exact_placement.py b/galleries/examples/images_contours_and_fields/image_exact_placement.py index a3b314a7c7c3..7c667dfed1af 100644 --- a/galleries/examples/images_contours_and_fields/image_exact_placement.py +++ b/galleries/examples/images_contours_and_fields/image_exact_placement.py @@ -134,13 +134,13 @@ def annotate_rect(ax): fig = plt.figure(figsize=(fig_width / dpi, fig_height / dpi), facecolor='aliceblue') # the position posA must be normalized by the figure width and height: -ax = fig.add_axes([posA[0] / fig_width, posA[1] / fig_height, - posA[2] / fig_width, posA[3] / fig_height]) +ax = fig.add_axes((posA[0] / fig_width, posA[1] / fig_height, + posA[2] / fig_width, posA[3] / fig_height)) ax.imshow(A, vmin=-1, vmax=1) annotate_rect(ax) -ax = fig.add_axes([posB[0] / fig_width, posB[1] / fig_height, - posB[2] / fig_width, posB[3] / fig_height]) +ax = fig.add_axes((posB[0] / fig_width, posB[1] / fig_height, + posB[2] / fig_width, posB[3] / fig_height)) ax.imshow(B, vmin=-1, vmax=1) plt.show() # %% diff --git a/galleries/examples/misc/svg_filter_line.py b/galleries/examples/misc/svg_filter_line.py index c6adec093bee..dd97dc975eda 100644 --- a/galleries/examples/misc/svg_filter_line.py +++ b/galleries/examples/misc/svg_filter_line.py @@ -17,7 +17,7 @@ import matplotlib.transforms as mtransforms fig1 = plt.figure() -ax = fig1.add_axes([0.1, 0.1, 0.8, 0.8]) +ax = fig1.add_axes((0.1, 0.1, 0.8, 0.8)) # draw lines l1, = ax.plot([0.1, 0.5, 0.9], [0.1, 0.9, 0.5], "bo-", diff --git a/galleries/examples/misc/svg_filter_pie.py b/galleries/examples/misc/svg_filter_pie.py index b823cc9670c9..b19867be9a2f 100644 --- a/galleries/examples/misc/svg_filter_pie.py +++ b/galleries/examples/misc/svg_filter_pie.py @@ -19,7 +19,7 @@ # make a square figure and Axes fig = plt.figure(figsize=(6, 6)) -ax = fig.add_axes([0.1, 0.1, 0.8, 0.8]) +ax = fig.add_axes((0.1, 0.1, 0.8, 0.8)) labels = 'Frogs', 'Hogs', 'Dogs', 'Logs' fracs = [15, 30, 45, 10] diff --git a/galleries/examples/showcase/anatomy.py b/galleries/examples/showcase/anatomy.py index b1fbde9c8d7b..798e4204cad3 100644 --- a/galleries/examples/showcase/anatomy.py +++ b/galleries/examples/showcase/anatomy.py @@ -27,7 +27,7 @@ Y3 = np.random.uniform(Y1, Y2, len(X)) fig = plt.figure(figsize=(7.5, 7.5)) -ax = fig.add_axes([0.2, 0.17, 0.68, 0.7], aspect=1) +ax = fig.add_axes((0.2, 0.17, 0.68, 0.7), aspect=1) ax.xaxis.set_major_locator(MultipleLocator(1.000)) ax.xaxis.set_minor_locator(AutoMinorLocator(4)) diff --git a/galleries/examples/showcase/firefox.py b/galleries/examples/showcase/firefox.py index 65682ccd7429..2026d253f6b6 100644 --- a/galleries/examples/showcase/firefox.py +++ b/galleries/examples/showcase/firefox.py @@ -48,7 +48,7 @@ def svg_parse(path): xmax, ymax = verts.max(axis=0) + 1 fig = plt.figure(figsize=(5, 5), facecolor="0.75") # gray background -ax = fig.add_axes([0, 0, 1, 1], frameon=False, aspect=1, +ax = fig.add_axes((0, 0, 1, 1), frameon=False, aspect=1, xlim=(xmin, xmax), # centering ylim=(ymax, ymin), # centering, upside down xticks=[], yticks=[]) # no ticks diff --git a/galleries/examples/showcase/mandelbrot.py b/galleries/examples/showcase/mandelbrot.py index ab40a061dc03..d8b7faf4c7b8 100644 --- a/galleries/examples/showcase/mandelbrot.py +++ b/galleries/examples/showcase/mandelbrot.py @@ -55,7 +55,7 @@ def mandelbrot_set(xmin, xmax, ymin, ymax, xn, yn, maxiter, horizon=2.0): width = 10 height = 10*yn/xn fig = plt.figure(figsize=(width, height), dpi=dpi) - ax = fig.add_axes([0, 0, 1, 1], frameon=False, aspect=1) + ax = fig.add_axes((0, 0, 1, 1), frameon=False, aspect=1) # Shaded rendering light = colors.LightSource(azdeg=315, altdeg=10) diff --git a/galleries/examples/subplots_axes_and_figures/axes_demo.py b/galleries/examples/subplots_axes_and_figures/axes_demo.py index 07f3ca2070c2..16db465449a4 100644 --- a/galleries/examples/subplots_axes_and_figures/axes_demo.py +++ b/galleries/examples/subplots_axes_and_figures/axes_demo.py @@ -33,12 +33,12 @@ main_ax.set_title('Gaussian colored noise') # this is an inset Axes over the main Axes -right_inset_ax = fig.add_axes([.65, .6, .2, .2], facecolor='k') +right_inset_ax = fig.add_axes((.65, .6, .2, .2), facecolor='k') right_inset_ax.hist(s, 400, density=True) right_inset_ax.set(title='Probability', xticks=[], yticks=[]) # this is another inset Axes over the main Axes -left_inset_ax = fig.add_axes([.2, .6, .2, .2], facecolor='k') +left_inset_ax = fig.add_axes((.2, .6, .2, .2), facecolor='k') left_inset_ax.plot(t[:len(r)], r) left_inset_ax.set(title='Impulse response', xlim=(0, .2), xticks=[], yticks=[]) diff --git a/galleries/examples/text_labels_and_annotations/mathtext_examples.py b/galleries/examples/text_labels_and_annotations/mathtext_examples.py index f9f8e628e08b..cf395f0daf0e 100644 --- a/galleries/examples/text_labels_and_annotations/mathtext_examples.py +++ b/galleries/examples/text_labels_and_annotations/mathtext_examples.py @@ -61,7 +61,7 @@ def doall(): # Creating figure and axis. fig = plt.figure(figsize=(7, 7)) - ax = fig.add_axes([0.01, 0.01, 0.98, 0.90], + ax = fig.add_axes((0.01, 0.01, 0.98, 0.90), facecolor="white", frameon=True) ax.set_xlim(0, 1) ax.set_ylim(0, 1) diff --git a/galleries/examples/ticks/fig_axes_customize_simple.py b/galleries/examples/ticks/fig_axes_customize_simple.py index 0dd85ec4bd93..07a569e3d31d 100644 --- a/galleries/examples/ticks/fig_axes_customize_simple.py +++ b/galleries/examples/ticks/fig_axes_customize_simple.py @@ -13,7 +13,7 @@ fig = plt.figure() fig.patch.set_facecolor('lightgoldenrodyellow') -ax1 = fig.add_axes([0.1, 0.3, 0.4, 0.4]) +ax1 = fig.add_axes((0.1, 0.3, 0.4, 0.4)) ax1.patch.set_facecolor('lightslategray') ax1.tick_params(axis='x', labelcolor='tab:red', labelrotation=45, labelsize=16) diff --git a/galleries/examples/widgets/buttons.py b/galleries/examples/widgets/buttons.py index 61249522c72c..2aef798399f4 100644 --- a/galleries/examples/widgets/buttons.py +++ b/galleries/examples/widgets/buttons.py @@ -41,8 +41,8 @@ def prev(self, event): plt.draw() callback = Index() -axprev = fig.add_axes([0.7, 0.05, 0.1, 0.075]) -axnext = fig.add_axes([0.81, 0.05, 0.1, 0.075]) +axprev = fig.add_axes((0.7, 0.05, 0.1, 0.075)) +axnext = fig.add_axes((0.81, 0.05, 0.1, 0.075)) bnext = Button(axnext, 'Next') bnext.on_clicked(callback.next) bprev = Button(axprev, 'Previous') diff --git a/galleries/examples/widgets/range_slider.py b/galleries/examples/widgets/range_slider.py index f1bed7431e39..d2f2d1554246 100644 --- a/galleries/examples/widgets/range_slider.py +++ b/galleries/examples/widgets/range_slider.py @@ -34,7 +34,7 @@ axs[1].set_title('Histogram of pixel intensities') # Create the RangeSlider -slider_ax = fig.add_axes([0.20, 0.1, 0.60, 0.03]) +slider_ax = fig.add_axes((0.20, 0.1, 0.60, 0.03)) slider = RangeSlider(slider_ax, "Threshold", img.min(), img.max()) # Create the Vertical lines on the histogram diff --git a/galleries/examples/widgets/slider_demo.py b/galleries/examples/widgets/slider_demo.py index 7dc47b9c7b6f..e56390c182a0 100644 --- a/galleries/examples/widgets/slider_demo.py +++ b/galleries/examples/widgets/slider_demo.py @@ -38,7 +38,7 @@ def f(t, amplitude, frequency): fig.subplots_adjust(left=0.25, bottom=0.25) # Make a horizontal slider to control the frequency. -axfreq = fig.add_axes([0.25, 0.1, 0.65, 0.03]) +axfreq = fig.add_axes((0.25, 0.1, 0.65, 0.03)) freq_slider = Slider( ax=axfreq, label='Frequency [Hz]', @@ -48,7 +48,7 @@ def f(t, amplitude, frequency): ) # Make a vertically oriented slider to control the amplitude -axamp = fig.add_axes([0.1, 0.25, 0.0225, 0.63]) +axamp = fig.add_axes((0.1, 0.25, 0.0225, 0.63)) amp_slider = Slider( ax=axamp, label="Amplitude", @@ -70,7 +70,7 @@ def update(val): amp_slider.on_changed(update) # Create a `matplotlib.widgets.Button` to reset the sliders to initial values. -resetax = fig.add_axes([0.8, 0.025, 0.1, 0.04]) +resetax = fig.add_axes((0.8, 0.025, 0.1, 0.04)) button = Button(resetax, 'Reset', hovercolor='0.975') diff --git a/galleries/examples/widgets/slider_snap_demo.py b/galleries/examples/widgets/slider_snap_demo.py index 953ffaf63672..5826be32fa07 100644 --- a/galleries/examples/widgets/slider_snap_demo.py +++ b/galleries/examples/widgets/slider_snap_demo.py @@ -30,8 +30,8 @@ fig.subplots_adjust(bottom=0.25) l, = ax.plot(t, s, lw=2) -ax_freq = fig.add_axes([0.25, 0.1, 0.65, 0.03]) -ax_amp = fig.add_axes([0.25, 0.15, 0.65, 0.03]) +ax_freq = fig.add_axes((0.25, 0.1, 0.65, 0.03)) +ax_amp = fig.add_axes((0.25, 0.15, 0.65, 0.03)) # define the values to use for snapping allowed_amplitudes = np.concatenate([np.linspace(.1, 5, 100), [6, 7, 8, 9]]) @@ -60,7 +60,7 @@ def update(val): sfreq.on_changed(update) samp.on_changed(update) -ax_reset = fig.add_axes([0.8, 0.025, 0.1, 0.04]) +ax_reset = fig.add_axes((0.8, 0.025, 0.1, 0.04)) button = Button(ax_reset, 'Reset', hovercolor='0.975') diff --git a/galleries/examples/widgets/textbox.py b/galleries/examples/widgets/textbox.py index d5f02b82a30b..2121ce8594ce 100644 --- a/galleries/examples/widgets/textbox.py +++ b/galleries/examples/widgets/textbox.py @@ -39,7 +39,7 @@ def submit(expression): plt.draw() -axbox = fig.add_axes([0.1, 0.05, 0.8, 0.075]) +axbox = fig.add_axes((0.1, 0.05, 0.8, 0.075)) text_box = TextBox(axbox, "Evaluate", textalignment="center") text_box.on_submit(submit) text_box.set_val("t ** 2") # Trigger `submit` with the initial string. diff --git a/galleries/tutorials/artists.py b/galleries/tutorials/artists.py index a258eb71d447..4f93f7c71a6e 100644 --- a/galleries/tutorials/artists.py +++ b/galleries/tutorials/artists.py @@ -70,7 +70,7 @@ class in the Matplotlib API, and the one you will be working with most coordinates:: fig2 = plt.figure() - ax2 = fig2.add_axes([0.15, 0.1, 0.7, 0.3]) + ax2 = fig2.add_axes((0.15, 0.1, 0.7, 0.3)) Continuing with our example:: @@ -134,7 +134,7 @@ class in the Matplotlib API, and the one you will be working with most # Fixing random state for reproducibility np.random.seed(19680801) -ax2 = fig.add_axes([0.15, 0.1, 0.7, 0.3]) +ax2 = fig.add_axes((0.15, 0.1, 0.7, 0.3)) n, bins, patches = ax2.hist(np.random.randn(1000), 50, facecolor='yellow', edgecolor='yellow') ax2.set_xlabel('Time [s]') @@ -295,7 +295,7 @@ class in the Matplotlib API, and the one you will be working with most # # In [157]: ax1 = fig.add_subplot(211) # -# In [158]: ax2 = fig.add_axes([0.1, 0.1, 0.7, 0.3]) +# In [158]: ax2 = fig.add_axes((0.1, 0.1, 0.7, 0.3)) # # In [159]: ax1 # Out[159]: @@ -669,7 +669,7 @@ class in the Matplotlib API, and the one you will be working with most rect = fig.patch # a rectangle instance rect.set_facecolor('lightgoldenrodyellow') -ax1 = fig.add_axes([0.1, 0.3, 0.4, 0.4]) +ax1 = fig.add_axes((0.1, 0.3, 0.4, 0.4)) rect = ax1.patch rect.set_facecolor('lightslategray') diff --git a/galleries/users_explain/axes/arranging_axes.py b/galleries/users_explain/axes/arranging_axes.py index bc537e15c12c..64879d4a696d 100644 --- a/galleries/users_explain/axes/arranging_axes.py +++ b/galleries/users_explain/axes/arranging_axes.py @@ -103,8 +103,8 @@ w, h = 4, 3 margin = 0.5 fig = plt.figure(figsize=(w, h), facecolor='lightblue') -ax = fig.add_axes([margin / w, margin / h, (w - 2 * margin) / w, - (h - 2 * margin) / h]) +ax = fig.add_axes((margin / w, margin / h, + (w - 2 * margin) / w, (h - 2 * margin) / h)) # %% diff --git a/galleries/users_explain/axes/axes_intro.rst b/galleries/users_explain/axes/axes_intro.rst index 16738d929056..0ffbfd4ffdb4 100644 --- a/galleries/users_explain/axes/axes_intro.rst +++ b/galleries/users_explain/axes/axes_intro.rst @@ -52,8 +52,8 @@ Axes are added using methods on `~.Figure` objects, or via the `~.pyplot` interf There are a number of other methods for adding Axes to a Figure: -* `.Figure.add_axes`: manually position an Axes. ``fig.add_axes([0, 0, 1, - 1])`` makes an Axes that fills the whole figure. +* `.Figure.add_axes`: manually position an Axes. ``fig.add_axes((0, 0, 1, 1))`` makes an + Axes that fills the whole figure. * `.pyplot.subplots` and `.Figure.subplots`: add a grid of Axes as in the example above. The pyplot version returns both the Figure object and an array of Axes. Note that ``fig, ax = plt.subplots()`` adds a single Axes to a Figure. diff --git a/galleries/users_explain/colors/colors.py b/galleries/users_explain/colors/colors.py index c91a5fcb0dbe..97a281bf1977 100644 --- a/galleries/users_explain/colors/colors.py +++ b/galleries/users_explain/colors/colors.py @@ -197,7 +197,7 @@ def demo(sty): if f'xkcd:{name}' in mcolors.XKCD_COLORS} fig = plt.figure(figsize=[9, 5]) -ax = fig.add_axes([0, 0, 1, 1]) +ax = fig.add_axes((0, 0, 1, 1)) n_groups = 3 n_rows = len(overlap) // n_groups + 1 diff --git a/galleries/users_explain/text/text_props.py b/galleries/users_explain/text/text_props.py index c5ae22c02d38..fb67421fd880 100644 --- a/galleries/users_explain/text/text_props.py +++ b/galleries/users_explain/text/text_props.py @@ -75,7 +75,7 @@ top = bottom + height fig = plt.figure() -ax = fig.add_axes([0, 0, 1, 1]) +ax = fig.add_axes((0, 0, 1, 1)) # axes coordinates: (0, 0) is bottom left and (1, 1) is upper right p = patches.Rectangle( diff --git a/galleries/users_explain/toolkits/axisartist.rst b/galleries/users_explain/toolkits/axisartist.rst index eff2b575a63f..7ff0897f23d8 100644 --- a/galleries/users_explain/toolkits/axisartist.rst +++ b/galleries/users_explain/toolkits/axisartist.rst @@ -50,7 +50,7 @@ To create an Axes, :: import mpl_toolkits.axisartist as AA fig = plt.figure() - fig.add_axes([0.1, 0.1, 0.8, 0.8], axes_class=AA.Axes) + fig.add_axes((0.1, 0.1, 0.8, 0.8), axes_class=AA.Axes) or to create a subplot :: diff --git a/lib/matplotlib/_enums.py b/lib/matplotlib/_enums.py index 75a09b7b5d8c..d85c5c5f03db 100644 --- a/lib/matplotlib/_enums.py +++ b/lib/matplotlib/_enums.py @@ -151,7 +151,7 @@ def demo(): import matplotlib.pyplot as plt fig = plt.figure(figsize=(4, 1.2)) - ax = fig.add_axes([0, 0, 1, 0.8]) + ax = fig.add_axes((0, 0, 1, 0.8)) ax.set_title('Cap style') for x, style in enumerate(['butt', 'round', 'projecting']): diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py index ec11e379db60..01ddd6c2bac5 100644 --- a/lib/matplotlib/figure.py +++ b/lib/matplotlib/figure.py @@ -3678,7 +3678,7 @@ def figaspect(arg): w, h = figaspect(2.) fig = Figure(figsize=(w, h)) - ax = fig.add_axes([0.1, 0.1, 0.8, 0.8]) + ax = fig.add_axes((0.1, 0.1, 0.8, 0.8)) ax.imshow(A, **kwargs) Make a figure with the proper aspect for an array:: @@ -3686,7 +3686,7 @@ def figaspect(arg): A = rand(5, 3) w, h = figaspect(A) fig = Figure(figsize=(w, h)) - ax = fig.add_axes([0.1, 0.1, 0.8, 0.8]) + ax = fig.add_axes((0.1, 0.1, 0.8, 0.8)) ax.imshow(A, **kwargs) """ diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py index 760235b6284d..e48c32bb8cf9 100644 --- a/lib/matplotlib/image.py +++ b/lib/matplotlib/image.py @@ -1772,7 +1772,7 @@ def thumbnail(infile, thumbfile, scale=0.1, interpolation='bilinear', fig = Figure(figsize=(width, height), dpi=dpi) FigureCanvasBase(fig) - ax = fig.add_axes([0, 0, 1, 1], aspect='auto', + ax = fig.add_axes((0, 0, 1, 1), aspect='auto', frameon=False, xticks=[], yticks=[]) ax.imshow(im, aspect='auto', resample=True, interpolation=interpolation) fig.savefig(thumbfile, dpi=dpi) diff --git a/lib/matplotlib/tests/test_artist.py b/lib/matplotlib/tests/test_artist.py index 5c8141e40741..d6a1e2b7bd38 100644 --- a/lib/matplotlib/tests/test_artist.py +++ b/lib/matplotlib/tests/test_artist.py @@ -128,7 +128,7 @@ def test_clipping(): def test_clipping_zoom(fig_test, fig_ref): # This test places the Axes and sets its limits such that the clip path is # outside the figure entirely. This should not break the clip path. - ax_test = fig_test.add_axes([0, 0, 1, 1]) + ax_test = fig_test.add_axes((0, 0, 1, 1)) l, = ax_test.plot([-3, 3], [-3, 3]) # Explicit Path instead of a Rectangle uses clip path processing, instead # of a clip box optimization. @@ -136,7 +136,7 @@ def test_clipping_zoom(fig_test, fig_ref): p = mpatches.PathPatch(p, transform=ax_test.transData) l.set_clip_path(p) - ax_ref = fig_ref.add_axes([0, 0, 1, 1]) + ax_ref = fig_ref.add_axes((0, 0, 1, 1)) ax_ref.plot([-3, 3], [-3, 3]) ax_ref.set(xlim=(0.5, 0.75), ylim=(0.5, 0.75)) diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py index c1758d2ec3e0..8dea18f23368 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -7126,7 +7126,7 @@ def shared_axes_generator(request): ax = ax_lst[0][0] elif request.param == 'add_axes': fig = plt.figure() - ax = fig.add_axes([.1, .1, .8, .8]) + ax = fig.add_axes((.1, .1, .8, .8)) return fig, ax @@ -7460,7 +7460,7 @@ def test_title_no_move_off_page(): # make sure that the automatic title repositioning does not get done. mpl.rcParams['axes.titley'] = None fig = plt.figure() - ax = fig.add_axes([0.1, -0.5, 0.8, 0.2]) + ax = fig.add_axes((0.1, -0.5, 0.8, 0.2)) ax.tick_params(axis="x", bottom=True, top=True, labelbottom=True, labeltop=True) tt = ax.set_title('Boo') @@ -8399,7 +8399,7 @@ def test_aspect_nonlinear_adjustable_box(): def test_aspect_nonlinear_adjustable_datalim(): fig = plt.figure(figsize=(10, 10)) # Square. - ax = fig.add_axes([.1, .1, .8, .8]) # Square. + ax = fig.add_axes((.1, .1, .8, .8)) # Square. ax.plot([.4, .6], [.4, .6]) # Set minpos to keep logit happy. ax.set(xscale="log", xlim=(1, 100), yscale="logit", ylim=(1 / 101, 1 / 11), @@ -8623,7 +8623,7 @@ def test_multiplot_autoscale(): def test_sharing_does_not_link_positions(): fig = plt.figure() ax0 = fig.add_subplot(221) - ax1 = fig.add_axes([.6, .6, .3, .3], sharex=ax0) + ax1 = fig.add_axes((.6, .6, .3, .3), sharex=ax0) init_pos = ax1.get_position() fig.subplots_adjust(left=0) assert (ax1.get_position().get_points() == init_pos.get_points()).all() @@ -9722,7 +9722,7 @@ def test_axes_set_position_external_bbox_unchanged(fig_test, fig_ref): ax_test = fig_test.add_axes(bbox) ax_test.set_position([0.25, 0.25, 0.5, 0.5]) assert (bbox.x0, bbox.y0, bbox.width, bbox.height) == (0.0, 0.0, 1.0, 1.0) - ax_ref = fig_ref.add_axes([0.25, 0.25, 0.5, 0.5]) + ax_ref = fig_ref.add_axes((0.25, 0.25, 0.5, 0.5)) def test_bar_shape_mismatch(): diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py index f95f131e3bf6..b77fdb0c8ed8 100644 --- a/lib/matplotlib/tests/test_colorbar.py +++ b/lib/matplotlib/tests/test_colorbar.py @@ -332,11 +332,11 @@ def test_colorbar_closed_patch(): plt.rcParams['pcolormesh.snap'] = False fig = plt.figure(figsize=(8, 6)) - ax1 = fig.add_axes([0.05, 0.85, 0.9, 0.1]) - ax2 = fig.add_axes([0.1, 0.65, 0.75, 0.1]) - ax3 = fig.add_axes([0.05, 0.45, 0.9, 0.1]) - ax4 = fig.add_axes([0.05, 0.25, 0.9, 0.1]) - ax5 = fig.add_axes([0.05, 0.05, 0.9, 0.1]) + ax1 = fig.add_axes((0.05, 0.85, 0.9, 0.1)) + ax2 = fig.add_axes((0.1, 0.65, 0.75, 0.1)) + ax3 = fig.add_axes((0.05, 0.45, 0.9, 0.1)) + ax4 = fig.add_axes((0.05, 0.25, 0.9, 0.1)) + ax5 = fig.add_axes((0.05, 0.05, 0.9, 0.1)) cmap = mpl.colormaps["RdBu"].resampled(5) @@ -854,7 +854,7 @@ def test_axes_handles_same_functions(fig_ref, fig_test): for nn, fig in enumerate([fig_ref, fig_test]): ax = fig.add_subplot() pc = ax.pcolormesh(np.ones(300).reshape(10, 30)) - cax = fig.add_axes([0.9, 0.1, 0.03, 0.8]) + cax = fig.add_axes((0.9, 0.1, 0.03, 0.8)) cb = fig.colorbar(pc, cax=cax) if nn == 0: caxx = cax diff --git a/lib/matplotlib/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py index 8d0f3467f045..04e9b82c6e6e 100644 --- a/lib/matplotlib/tests/test_colors.py +++ b/lib/matplotlib/tests/test_colors.py @@ -857,9 +857,9 @@ def test_boundarynorm_and_colorbarbase(): # Make a figure and axes with dimensions as desired. fig = plt.figure() - ax1 = fig.add_axes([0.05, 0.80, 0.9, 0.15]) - ax2 = fig.add_axes([0.05, 0.475, 0.9, 0.15]) - ax3 = fig.add_axes([0.05, 0.15, 0.9, 0.15]) + ax1 = fig.add_axes((0.05, 0.80, 0.9, 0.15)) + ax2 = fig.add_axes((0.05, 0.475, 0.9, 0.15)) + ax3 = fig.add_axes((0.05, 0.15, 0.9, 0.15)) # Set the colormap and bounds bounds = [-1, 2, 5, 7, 12, 15] diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py index 7c7dd43a3115..05f4723cb7a4 100644 --- a/lib/matplotlib/tests/test_constrainedlayout.py +++ b/lib/matplotlib/tests/test_constrainedlayout.py @@ -309,7 +309,7 @@ def test_constrained_layout16(): """Test ax.set_position.""" fig, ax = plt.subplots(layout="constrained") example_plot(ax, fontsize=12) - ax2 = fig.add_axes([0.2, 0.2, 0.4, 0.4]) + ax2 = fig.add_axes((0.2, 0.2, 0.4, 0.4)) @image_comparison(['constrained_layout17.png'], style='mpl20') @@ -357,7 +357,7 @@ def test_constrained_layout20(): img = np.hypot(gx, gx[:, None]) fig = plt.figure() - ax = fig.add_axes([0, 0, 1, 1]) + ax = fig.add_axes((0, 0, 1, 1)) mesh = ax.pcolormesh(gx, gx, img[:-1, :-1]) fig.colorbar(mesh) diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py index 014eb2cf23d0..5668c770c361 100644 --- a/lib/matplotlib/tests/test_figure.py +++ b/lib/matplotlib/tests/test_figure.py @@ -241,7 +241,7 @@ def test_gca(): fig = plt.figure() # test that gca() picks up Axes created via add_axes() - ax0 = fig.add_axes([0, 0, 1, 1]) + ax0 = fig.add_axes((0, 0, 1, 1)) assert fig.gca() is ax0 # test that gca() picks up Axes created via add_subplot() @@ -546,7 +546,7 @@ def test_invalid_figure_add_axes(): fig.add_axes((.1, .1, .5, np.nan)) with pytest.raises(TypeError, match="multiple values for argument 'rect'"): - fig.add_axes([0, 0, 1, 1], rect=[0, 0, 1, 1]) + fig.add_axes((0, 0, 1, 1), rect=[0, 0, 1, 1]) fig2, ax = plt.subplots() with pytest.raises(ValueError, @@ -559,7 +559,7 @@ def test_invalid_figure_add_axes(): fig2.add_axes(ax, "extra positional argument") with pytest.raises(TypeError, match=r"add_axes\(\) takes 1 positional arguments"): - fig.add_axes([0, 0, 1, 1], "extra positional argument") + fig.add_axes((0, 0, 1, 1), "extra positional argument") def test_subplots_shareax_loglabels(): @@ -1583,22 +1583,22 @@ def test_add_subplot_kwargs(): def test_add_axes_kwargs(): # fig.add_axes() always creates new axes, even if axes kwargs differ. fig = plt.figure() - ax = fig.add_axes([0, 0, 1, 1]) - ax1 = fig.add_axes([0, 0, 1, 1]) + ax = fig.add_axes((0, 0, 1, 1)) + ax1 = fig.add_axes((0, 0, 1, 1)) assert ax is not None assert ax1 is not ax plt.close() fig = plt.figure() - ax = fig.add_axes([0, 0, 1, 1], projection='polar') - ax1 = fig.add_axes([0, 0, 1, 1], projection='polar') + ax = fig.add_axes((0, 0, 1, 1), projection='polar') + ax1 = fig.add_axes((0, 0, 1, 1), projection='polar') assert ax is not None assert ax1 is not ax plt.close() fig = plt.figure() - ax = fig.add_axes([0, 0, 1, 1], projection='polar') - ax1 = fig.add_axes([0, 0, 1, 1]) + ax = fig.add_axes((0, 0, 1, 1), projection='polar') + ax1 = fig.add_axes((0, 0, 1, 1)) assert ax is not None assert ax1.name == 'rectilinear' assert ax1 is not ax diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py index 93124141487f..5401dd73e5ef 100644 --- a/lib/matplotlib/tests/test_image.py +++ b/lib/matplotlib/tests/test_image.py @@ -504,7 +504,7 @@ def test_image_shift(): def test_image_edges(): fig = plt.figure(figsize=[1, 1]) - ax = fig.add_axes([0, 0, 1, 1], frameon=False) + ax = fig.add_axes((0, 0, 1, 1), frameon=False) data = np.tile(np.arange(12), 15).reshape(20, 9) @@ -1192,7 +1192,7 @@ def test_exact_vmin(): # make the image exactly 190 pixels wide fig = plt.figure(figsize=(1.9, 0.1), dpi=100) - ax = fig.add_axes([0, 0, 1, 1]) + ax = fig.add_axes((0, 0, 1, 1)) data = np.array( [[-1, -1, -1, 0, 0, 0, 0, 43, 79, 95, 66, 1, -1, -1, -1, 0, 0, 0, 34]], diff --git a/lib/matplotlib/tests/test_marker.py b/lib/matplotlib/tests/test_marker.py index f6e20c148897..a1e71f1f6533 100644 --- a/lib/matplotlib/tests/test_marker.py +++ b/lib/matplotlib/tests/test_marker.py @@ -181,9 +181,9 @@ def test_marker_clipping(fig_ref, fig_test): width = 2 * marker_size * ncol height = 2 * marker_size * nrow * 2 fig_ref.set_size_inches((width / fig_ref.dpi, height / fig_ref.dpi)) - ax_ref = fig_ref.add_axes([0, 0, 1, 1]) + ax_ref = fig_ref.add_axes((0, 0, 1, 1)) fig_test.set_size_inches((width / fig_test.dpi, height / fig_ref.dpi)) - ax_test = fig_test.add_axes([0, 0, 1, 1]) + ax_test = fig_test.add_axes((0, 0, 1, 1)) for i, marker in enumerate(markers.MarkerStyle.markers): x = i % ncol diff --git a/lib/matplotlib/tests/test_offsetbox.py b/lib/matplotlib/tests/test_offsetbox.py index f18fa7c777d1..81fe062d83b2 100644 --- a/lib/matplotlib/tests/test_offsetbox.py +++ b/lib/matplotlib/tests/test_offsetbox.py @@ -455,7 +455,7 @@ def test_remove_draggable(): def test_draggable_in_subfigure(): fig = plt.figure() # Put annotation at lower left corner to make it easily pickable below. - ann = fig.subfigures().add_axes([0, 0, 1, 1]).annotate("foo", (0, 0)) + ann = fig.subfigures().add_axes((0, 0, 1, 1)).annotate("foo", (0, 0)) ann.draggable(True) fig.canvas.draw() # Texts are non-pickable until the first draw. MouseEvent("button_press_event", fig.canvas, 1, 1)._process() diff --git a/lib/matplotlib/tests/test_polar.py b/lib/matplotlib/tests/test_polar.py index a0969df5de90..31e8cdd89a21 100644 --- a/lib/matplotlib/tests/test_polar.py +++ b/lib/matplotlib/tests/test_polar.py @@ -150,7 +150,7 @@ def test_polar_rmin(): theta = 2*np.pi*r fig = plt.figure() - ax = fig.add_axes([0.1, 0.1, 0.8, 0.8], polar=True) + ax = fig.add_axes((0.1, 0.1, 0.8, 0.8), polar=True) ax.plot(theta, r) ax.set_rmax(2.0) ax.set_rmin(0.5) @@ -162,7 +162,7 @@ def test_polar_negative_rmin(): theta = 2*np.pi*r fig = plt.figure() - ax = fig.add_axes([0.1, 0.1, 0.8, 0.8], polar=True) + ax = fig.add_axes((0.1, 0.1, 0.8, 0.8), polar=True) ax.plot(theta, r) ax.set_rmax(0.0) ax.set_rmin(-3.0) @@ -174,7 +174,7 @@ def test_polar_rorigin(): theta = 2*np.pi*r fig = plt.figure() - ax = fig.add_axes([0.1, 0.1, 0.8, 0.8], polar=True) + ax = fig.add_axes((0.1, 0.1, 0.8, 0.8), polar=True) ax.plot(theta, r) ax.set_rmax(2.0) ax.set_rmin(0.5) @@ -184,14 +184,14 @@ def test_polar_rorigin(): @image_comparison(['polar_invertedylim.png'], style='default') def test_polar_invertedylim(): fig = plt.figure() - ax = fig.add_axes([0.1, 0.1, 0.8, 0.8], polar=True) + ax = fig.add_axes((0.1, 0.1, 0.8, 0.8), polar=True) ax.set_ylim(2, 0) @image_comparison(['polar_invertedylim_rorigin.png'], style='default') def test_polar_invertedylim_rorigin(): fig = plt.figure() - ax = fig.add_axes([0.1, 0.1, 0.8, 0.8], polar=True) + ax = fig.add_axes((0.1, 0.1, 0.8, 0.8), polar=True) ax.yaxis.set_inverted(True) # Set the rlims to inverted (2, 0) without calling set_rlim, to check that # viewlims are correctly unstaled before draw()ing. @@ -206,7 +206,7 @@ def test_polar_theta_position(): theta = 2*np.pi*r fig = plt.figure() - ax = fig.add_axes([0.1, 0.1, 0.8, 0.8], polar=True) + ax = fig.add_axes((0.1, 0.1, 0.8, 0.8), polar=True) ax.plot(theta, r) ax.set_theta_zero_location("NW", 30) ax.set_theta_direction('clockwise') diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py index c7658c4f42ac..c92beed7f2c6 100644 --- a/lib/matplotlib/tests/test_usetex.py +++ b/lib/matplotlib/tests/test_usetex.py @@ -168,7 +168,7 @@ def test_rotation(): mpl.rcParams['text.usetex'] = True fig = plt.figure() - ax = fig.add_axes([0, 0, 1, 1]) + ax = fig.add_axes((0, 0, 1, 1)) ax.set(xlim=[-0.5, 5], xticks=[], ylim=[-0.5, 3], yticks=[], frame_on=False) text = {val: val[0] for val in ['top', 'center', 'bottom', 'left', 'right']} diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py index 6b196571814d..e62379470db1 100644 --- a/lib/matplotlib/widgets.py +++ b/lib/matplotlib/widgets.py @@ -1841,7 +1841,7 @@ def __init__(self, targetfig, toolfig): self.sliderbottom.slidermax = self.slidertop self.slidertop.slidermin = self.sliderbottom - bax = toolfig.add_axes([0.8, 0.05, 0.15, 0.075]) + bax = toolfig.add_axes((0.8, 0.05, 0.15, 0.075)) self.buttonreset = Button(bax, 'Reset') self.buttonreset.on_clicked(self._on_reset) diff --git a/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py b/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py index 496ce74d72c0..6748c1d7e1c0 100644 --- a/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py +++ b/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py @@ -678,7 +678,7 @@ def test_mark_inset_unstales_viewlim(fig_test, fig_ref): def test_auto_adjustable(): fig = plt.figure() - ax = fig.add_axes([0, 0, 1, 1]) + ax = fig.add_axes((0, 0, 1, 1)) pad = 0.1 make_axes_area_auto_adjustable(ax, pad=pad) fig.canvas.draw() diff --git a/tools/make_icons.py b/tools/make_icons.py index f09d40e92256..b253c0517c43 100755 --- a/tools/make_icons.py +++ b/tools/make_icons.py @@ -64,7 +64,7 @@ def make_icon(font_path, ccode): def make_matplotlib_icon(): fig = plt.figure(figsize=(1, 1)) fig.patch.set_alpha(0.0) - ax = fig.add_axes([0.025, 0.025, 0.95, 0.95], projection='polar') + ax = fig.add_axes((0.025, 0.025, 0.95, 0.95), projection='polar') ax.set_axisbelow(True) N = 7 From db4e67cf385074bdee7be33ae349c58fb2cbb3f5 Mon Sep 17 00:00:00 2001 From: Oscar Gustafsson Date: Thu, 29 Aug 2024 10:42:28 +0200 Subject: [PATCH 018/161] Change first argument to set_[xyz]lim to two arguments --- .../prev_whats_new/dflt_style_changes.rst | 2 +- doc/users/prev_whats_new/whats_new_3.5.0.rst | 8 +-- .../examples/animation/simple_scatter.py | 2 +- .../examples/event_handling/poly_editor.py | 4 +- .../examples/event_handling/pong_sgskip.py | 4 +- .../eventcollection_demo.py | 4 +- .../lines_bars_and_markers/markevery_demo.py | 4 +- .../shapes_and_collections/hatch_demo.py | 4 +- galleries/examples/showcase/xkcd.py | 6 +-- .../examples/statistics/errorbar_limits.py | 2 +- .../user_interfaces/fourier_demo_wx_sgskip.py | 8 +-- .../artists/transforms_tutorial.py | 2 +- galleries/users_explain/axes/axes_intro.rst | 2 +- galleries/users_explain/axes/axes_scales.py | 2 +- lib/matplotlib/axes/_base.py | 4 +- lib/matplotlib/image.py | 4 +- lib/matplotlib/tests/test_arrow_patches.py | 4 +- lib/matplotlib/tests/test_artist.py | 8 +-- lib/matplotlib/tests/test_axes.py | 50 +++++++++---------- lib/matplotlib/tests/test_axis.py | 4 +- lib/matplotlib/tests/test_colorbar.py | 2 +- lib/matplotlib/tests/test_dates.py | 2 +- lib/matplotlib/tests/test_image.py | 22 ++++---- lib/matplotlib/tests/test_legend.py | 4 +- lib/matplotlib/tests/test_lines.py | 4 +- lib/matplotlib/tests/test_offsetbox.py | 4 +- lib/matplotlib/tests/test_path.py | 4 +- lib/matplotlib/tests/test_simplification.py | 10 ++-- lib/matplotlib/tests/test_text.py | 4 +- lib/matplotlib/tests/test_tightlayout.py | 4 +- lib/matplotlib/widgets.py | 4 +- .../axisartist/tests/test_axislines.py | 4 +- lib/mpl_toolkits/mplot3d/tests/test_axes3d.py | 6 +-- 33 files changed, 101 insertions(+), 101 deletions(-) diff --git a/doc/users/prev_whats_new/dflt_style_changes.rst b/doc/users/prev_whats_new/dflt_style_changes.rst index a833064b573b..808204383fb8 100644 --- a/doc/users/prev_whats_new/dflt_style_changes.rst +++ b/doc/users/prev_whats_new/dflt_style_changes.rst @@ -1005,7 +1005,7 @@ a cleaner separation between subplots. ax = fig.add_subplot(2, 2, j) ax.hist(np.random.beta(0.5, 0.5, 10000), 25, density=True) - ax.set_xlim([0, 1]) + ax.set_xlim(0, 1) ax.set_title(title) ax = fig.add_subplot(2, 2, j + 2) diff --git a/doc/users/prev_whats_new/whats_new_3.5.0.rst b/doc/users/prev_whats_new/whats_new_3.5.0.rst index 54687e9a487e..fb156d0c68e8 100644 --- a/doc/users/prev_whats_new/whats_new_3.5.0.rst +++ b/doc/users/prev_whats_new/whats_new_3.5.0.rst @@ -375,9 +375,9 @@ attribute. points = ax.scatter((3, 3), (1, 3), (1, 3), c='red', zorder=10, label='zorder=10') - ax.set_xlim((0, 5)) - ax.set_ylim((0, 5)) - ax.set_zlim((0, 2.5)) + ax.set_xlim(0, 5) + ax.set_ylim(0, 5) + ax.set_zlim(0, 2.5) plane = mpatches.Patch(facecolor='white', edgecolor='black', label='zorder=1') @@ -485,7 +485,7 @@ new styling parameters for the added handles. ax = ax_old valmin = 0 valinit = 0.5 - ax.set_xlim([0, 1]) + ax.set_xlim(0, 1) ax_old.axvspan(valmin, valinit, 0, 1) ax.axvline(valinit, 0, 1, color="r", lw=1) ax.set_xticks([]) diff --git a/galleries/examples/animation/simple_scatter.py b/galleries/examples/animation/simple_scatter.py index 3f8c285810a3..5afef75f6074 100644 --- a/galleries/examples/animation/simple_scatter.py +++ b/galleries/examples/animation/simple_scatter.py @@ -11,7 +11,7 @@ import matplotlib.animation as animation fig, ax = plt.subplots() -ax.set_xlim([0, 10]) +ax.set_xlim(0, 10) scat = ax.scatter(1, 0) x = np.linspace(0, 10) diff --git a/galleries/examples/event_handling/poly_editor.py b/galleries/examples/event_handling/poly_editor.py index f6efd8bb8446..9cc2e5373ae5 100644 --- a/galleries/examples/event_handling/poly_editor.py +++ b/galleries/examples/event_handling/poly_editor.py @@ -203,6 +203,6 @@ def on_mouse_move(self, event): p = PolygonInteractor(ax, poly) ax.set_title('Click and drag a point to move it') - ax.set_xlim((-2, 2)) - ax.set_ylim((-2, 2)) + ax.set_xlim(-2, 2) + ax.set_ylim(-2, 2) plt.show() diff --git a/galleries/examples/event_handling/pong_sgskip.py b/galleries/examples/event_handling/pong_sgskip.py index 583e51eacdc5..2c4c35a7cb35 100644 --- a/galleries/examples/event_handling/pong_sgskip.py +++ b/galleries/examples/event_handling/pong_sgskip.py @@ -134,9 +134,9 @@ def __init__(self, ax): # create the initial line self.ax = ax ax.xaxis.set_visible(False) - ax.set_xlim([0, 7]) + ax.set_xlim(0, 7) ax.yaxis.set_visible(False) - ax.set_ylim([-1, 1]) + ax.set_ylim(-1, 1) pad_a_x = 0 pad_b_x = .50 pad_a_y = pad_b_y = .30 diff --git a/galleries/examples/lines_bars_and_markers/eventcollection_demo.py b/galleries/examples/lines_bars_and_markers/eventcollection_demo.py index 1aa2fa622812..6854a13e0974 100644 --- a/galleries/examples/lines_bars_and_markers/eventcollection_demo.py +++ b/galleries/examples/lines_bars_and_markers/eventcollection_demo.py @@ -53,8 +53,8 @@ ax.add_collection(yevents2) # set the limits -ax.set_xlim([0, 1]) -ax.set_ylim([0, 1]) +ax.set_xlim(0, 1) +ax.set_ylim(0, 1) ax.set_title('line plot with data points') diff --git a/galleries/examples/lines_bars_and_markers/markevery_demo.py b/galleries/examples/lines_bars_and_markers/markevery_demo.py index 919e12cde952..da4da0ecf9f1 100644 --- a/galleries/examples/lines_bars_and_markers/markevery_demo.py +++ b/galleries/examples/lines_bars_and_markers/markevery_demo.py @@ -79,8 +79,8 @@ for ax, markevery in zip(axs.flat, cases): ax.set_title(f'markevery={markevery}') ax.plot(x, y, 'o', ls='-', ms=4, markevery=markevery) - ax.set_xlim((6, 6.7)) - ax.set_ylim((1.1, 1.7)) + ax.set_xlim(6, 6.7) + ax.set_ylim(1.1, 1.7) # %% # markevery on polar plots diff --git a/galleries/examples/shapes_and_collections/hatch_demo.py b/galleries/examples/shapes_and_collections/hatch_demo.py index f2ca490c4e37..8d44dba5489b 100644 --- a/galleries/examples/shapes_and_collections/hatch_demo.py +++ b/galleries/examples/shapes_and_collections/hatch_demo.py @@ -41,8 +41,8 @@ hatch='*', facecolor='y')) axs['patches'].add_patch(Polygon([(10, 20), (30, 50), (50, 10)], hatch='\\/...', facecolor='g')) -axs['patches'].set_xlim([0, 40]) -axs['patches'].set_ylim([10, 60]) +axs['patches'].set_xlim(0, 40) +axs['patches'].set_ylim(10, 60) axs['patches'].set_aspect(1) plt.show() diff --git a/galleries/examples/showcase/xkcd.py b/galleries/examples/showcase/xkcd.py index 3d6d5418a13f..9b4de0a90f5b 100644 --- a/galleries/examples/showcase/xkcd.py +++ b/galleries/examples/showcase/xkcd.py @@ -19,7 +19,7 @@ ax.spines[['top', 'right']].set_visible(False) ax.set_xticks([]) ax.set_yticks([]) - ax.set_ylim([-30, 10]) + ax.set_ylim(-30, 10) data = np.ones(100) data[70:] -= np.arange(30) @@ -50,9 +50,9 @@ ax.xaxis.set_ticks_position('bottom') ax.set_xticks([0, 1]) ax.set_xticklabels(['CONFIRMED BY\nEXPERIMENT', 'REFUTED BY\nEXPERIMENT']) - ax.set_xlim([-0.5, 1.5]) + ax.set_xlim(-0.5, 1.5) ax.set_yticks([]) - ax.set_ylim([0, 110]) + ax.set_ylim(0, 110) ax.set_title("CLAIMS OF SUPERNATURAL POWERS") diff --git a/galleries/examples/statistics/errorbar_limits.py b/galleries/examples/statistics/errorbar_limits.py index f1d26460d947..fde18327af83 100644 --- a/galleries/examples/statistics/errorbar_limits.py +++ b/galleries/examples/statistics/errorbar_limits.py @@ -71,7 +71,7 @@ linestyle='none') # tidy up the figure -ax.set_xlim((0, 5.5)) +ax.set_xlim(0, 5.5) ax.set_title('Errorbar upper and lower limits') plt.show() diff --git a/galleries/examples/user_interfaces/fourier_demo_wx_sgskip.py b/galleries/examples/user_interfaces/fourier_demo_wx_sgskip.py index f51917fda6b9..9e72b3745a40 100644 --- a/galleries/examples/user_interfaces/fourier_demo_wx_sgskip.py +++ b/galleries/examples/user_interfaces/fourier_demo_wx_sgskip.py @@ -194,10 +194,10 @@ def createPlots(self): self.subplot1.set_xlabel("frequency f", fontsize=8) self.subplot2.set_ylabel("Time Domain Waveform x(t)", fontsize=8) self.subplot2.set_xlabel("time t", fontsize=8) - self.subplot1.set_xlim([-6, 6]) - self.subplot1.set_ylim([0, 1]) - self.subplot2.set_xlim([-2, 2]) - self.subplot2.set_ylim([-2, 2]) + self.subplot1.set_xlim(-6, 6) + self.subplot1.set_ylim(0, 1) + self.subplot2.set_xlim(-2, 2) + self.subplot2.set_ylim(-2, 2) self.subplot1.text(0.05, .95, r'$X(f) = \mathcal{F}\{x(t)\}$', verticalalignment='top', diff --git a/galleries/users_explain/artists/transforms_tutorial.py b/galleries/users_explain/artists/transforms_tutorial.py index f8a3e98e8077..3920fe886c7f 100644 --- a/galleries/users_explain/artists/transforms_tutorial.py +++ b/galleries/users_explain/artists/transforms_tutorial.py @@ -401,7 +401,7 @@ fig, ax = plt.subplots() xdata, ydata = (0.2, 0.7), (0.5, 0.5) ax.plot(xdata, ydata, "o") -ax.set_xlim((0, 1)) +ax.set_xlim(0, 1) trans = (fig.dpi_scale_trans + transforms.ScaledTranslation(xdata[0], ydata[0], ax.transData)) diff --git a/galleries/users_explain/axes/axes_intro.rst b/galleries/users_explain/axes/axes_intro.rst index 0ffbfd4ffdb4..bb3094495026 100644 --- a/galleries/users_explain/axes/axes_intro.rst +++ b/galleries/users_explain/axes/axes_intro.rst @@ -143,7 +143,7 @@ Other important methods set the extent on the axes (`~.axes.Axes.set_xlim`, `~.a x = 2**np.cumsum(np.random.randn(200)) linesx = ax.plot(t, x) ax.set_yscale('log') - ax.set_xlim([20, 180]) + ax.set_xlim(20, 180) The Axes class also has helpers to deal with Axis ticks and their labels. Most straight-forward is `~.axes.Axes.set_xticks` and `~.axes.Axes.set_yticks` which manually set the tick locations and optionally their labels. Minor ticks can be toggled with `~.axes.Axes.minorticks_on` or `~.axes.Axes.minorticks_off`. diff --git a/galleries/users_explain/axes/axes_scales.py b/galleries/users_explain/axes/axes_scales.py index 6b163835070c..f901c012974a 100644 --- a/galleries/users_explain/axes/axes_scales.py +++ b/galleries/users_explain/axes/axes_scales.py @@ -171,7 +171,7 @@ def inverse(a): ax.set_yscale('function', functions=(forward, inverse)) ax.set_title('function: Mercator') ax.grid(True) -ax.set_xlim([0, 180]) +ax.set_xlim(0, 180) ax.yaxis.set_minor_formatter(NullFormatter()) ax.yaxis.set_major_locator(FixedLocator(np.arange(0, 90, 10))) diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py index c5c525b29a06..987ffc8defa5 100644 --- a/lib/matplotlib/axes/_base.py +++ b/lib/matplotlib/axes/_base.py @@ -2179,9 +2179,9 @@ def axis(self, arg=None, /, *, emit=True, **kwargs): xlim = self.get_xlim() ylim = self.get_ylim() edge_size = max(np.diff(xlim), np.diff(ylim))[0] - self.set_xlim([xlim[0], xlim[0] + edge_size], + self.set_xlim(xlim[0], xlim[0] + edge_size, emit=emit, auto=False) - self.set_ylim([ylim[0], ylim[0] + edge_size], + self.set_ylim(ylim[0], ylim[0] + edge_size, emit=emit, auto=False) else: raise ValueError(f"Unrecognized string {arg!r} to axis; " diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py index e48c32bb8cf9..afb75d042c6d 100644 --- a/lib/matplotlib/image.py +++ b/lib/matplotlib/image.py @@ -967,9 +967,9 @@ def set_extent(self, extent, **kwargs): self.sticky_edges.x[:] = [xmin, xmax] self.sticky_edges.y[:] = [ymin, ymax] if self.axes.get_autoscalex_on(): - self.axes.set_xlim((xmin, xmax), auto=None) + self.axes.set_xlim(xmin, xmax, auto=None) if self.axes.get_autoscaley_on(): - self.axes.set_ylim((ymin, ymax), auto=None) + self.axes.set_ylim(ymin, ymax, auto=None) self.stale = True def get_extent(self): diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py index c2b6d4fa8086..e26c806c9ea4 100644 --- a/lib/matplotlib/tests/test_arrow_patches.py +++ b/lib/matplotlib/tests/test_arrow_patches.py @@ -59,8 +59,8 @@ def __prepare_fancyarrow_dpi_cor_test(): """ fig2 = plt.figure("fancyarrow_dpi_cor_test", figsize=(4, 3), dpi=50) ax = fig2.add_subplot() - ax.set_xlim([0, 1]) - ax.set_ylim([0, 1]) + ax.set_xlim(0, 1) + ax.set_ylim(0, 1) ax.add_patch(mpatches.FancyArrowPatch(posA=(0.3, 0.4), posB=(0.8, 0.6), lw=3, arrowstyle='->', mutation_scale=100)) diff --git a/lib/matplotlib/tests/test_artist.py b/lib/matplotlib/tests/test_artist.py index d6a1e2b7bd38..1367701ffe3e 100644 --- a/lib/matplotlib/tests/test_artist.py +++ b/lib/matplotlib/tests/test_artist.py @@ -120,8 +120,8 @@ def test_clipping(): patch.set_clip_path(clip_path, ax2.transData) ax2.add_patch(patch) - ax1.set_xlim([-3, 3]) - ax1.set_ylim([-3, 3]) + ax1.set_xlim(-3, 3) + ax1.set_ylim(-3, 3) @check_figures_equal() @@ -226,8 +226,8 @@ def test_default_edges(): np.arange(10) + 1, np.arange(10), 'o') ax2.bar(np.arange(10), np.arange(10), align='edge') ax3.text(0, 0, "BOX", size=24, bbox=dict(boxstyle='sawtooth')) - ax3.set_xlim((-1, 1)) - ax3.set_ylim((-1, 1)) + ax3.set_xlim(-1, 1) + ax3.set_ylim(-1, 1) pp1 = mpatches.PathPatch( mpath.Path([(0, 0), (1, 0), (1, 1), (0, 0)], [mpath.Path.MOVETO, mpath.Path.CURVE3, diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py index 8dea18f23368..50e214b15225 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -3262,16 +3262,16 @@ def test_stackplot(): y3 = 3.0 * x + 2 ax = fig.add_subplot(1, 1, 1) ax.stackplot(x, y1, y2, y3) - ax.set_xlim((0, 10)) - ax.set_ylim((0, 70)) + ax.set_xlim(0, 10) + ax.set_ylim(0, 70) # Reuse testcase from above for a test with labeled data and with colours # from the Axes property cycle. data = {"x": x, "y1": y1, "y2": y2, "y3": y3} fig, ax = plt.subplots() ax.stackplot("x", "y1", "y2", "y3", data=data, colors=["C0", "C1", "C2"]) - ax.set_xlim((0, 10)) - ax.set_ylim((0, 70)) + ax.set_xlim(0, 10) + ax.set_ylim(0, 70) @image_comparison(['stackplot_test_baseline.png'], remove_text=True) @@ -3308,16 +3308,16 @@ def test_stackplot_hatching(fig_ref, fig_test): # stackplot with different hatching styles (issue #27146) ax_test = fig_test.subplots() ax_test.stackplot(x, y1, y2, y3, hatch=["x", "//", "\\\\"], colors=["white"]) - ax_test.set_xlim((0, 10)) - ax_test.set_ylim((0, 70)) + ax_test.set_xlim(0, 10) + ax_test.set_ylim(0, 70) # compare with result from hatching each layer individually stack_baseline = np.zeros(len(x)) ax_ref = fig_ref.subplots() ax_ref.fill_between(x, stack_baseline, y1, hatch="x", facecolor="white") ax_ref.fill_between(x, y1, y1+y2, hatch="//", facecolor="white") ax_ref.fill_between(x, y1+y2, y1+y2+y3, hatch="\\\\", facecolor="white") - ax_ref.set_xlim((0, 10)) - ax_ref.set_ylim((0, 70)) + ax_ref.set_xlim(0, 10) + ax_ref.set_ylim(0, 70) def _bxp_test_helper( @@ -3594,13 +3594,13 @@ def test_boxplot(): fig, ax = plt.subplots() ax.boxplot([x, x], bootstrap=10000, notch=1) - ax.set_ylim((-30, 30)) + ax.set_ylim(-30, 30) # Reuse testcase from above for a labeled data test data = {"x": [x, x]} fig, ax = plt.subplots() ax.boxplot("x", bootstrap=10000, notch=1, data=data) - ax.set_ylim((-30, 30)) + ax.set_ylim(-30, 30) @check_figures_equal() @@ -3638,10 +3638,10 @@ def test_boxplot_sym2(): fig, [ax1, ax2] = plt.subplots(1, 2) ax1.boxplot([x, x], bootstrap=10000, sym='^') - ax1.set_ylim((-30, 30)) + ax1.set_ylim(-30, 30) ax2.boxplot([x, x], bootstrap=10000, sym='g') - ax2.set_ylim((-30, 30)) + ax2.set_ylim(-30, 30) @image_comparison(['boxplot_sym.png'], @@ -3654,7 +3654,7 @@ def test_boxplot_sym(): fig, ax = plt.subplots() ax.boxplot([x, x], sym='gs') - ax.set_ylim((-30, 30)) + ax.set_ylim(-30, 30) @image_comparison(['boxplot_autorange_false_whiskers.png', @@ -3669,11 +3669,11 @@ def test_boxplot_autorange_whiskers(): fig1, ax1 = plt.subplots() ax1.boxplot([x, x], bootstrap=10000, notch=1) - ax1.set_ylim((-5, 5)) + ax1.set_ylim(-5, 5) fig2, ax2 = plt.subplots() ax2.boxplot([x, x], bootstrap=10000, notch=1, autorange=True) - ax2.set_ylim((-5, 5)) + ax2.set_ylim(-5, 5) def _rc_test_bxp_helper(ax, rc_dict): @@ -3763,7 +3763,7 @@ def test_boxplot_with_CIarray(): # another with manual values ax.boxplot([x, x], bootstrap=10000, usermedians=[None, 1.0], conf_intervals=CIs, notch=1) - ax.set_ylim((-30, 30)) + ax.set_ylim(-30, 30) @image_comparison(['boxplot_no_inverted_whisker.png'], @@ -4352,7 +4352,7 @@ def test_errorbar_limits(): xlolims=xlolims, xuplims=xuplims, uplims=uplims, lolims=lolims, ls='none', mec='blue', capsize=0, color='cyan') - ax.set_xlim((0, 5.5)) + ax.set_xlim(0, 5.5) ax.set_title('Errorbar upper and lower limits') @@ -5282,8 +5282,8 @@ def test_vertex_markers(): fig, ax = plt.subplots() ax.plot(data, linestyle='', marker=marker_as_tuple, mfc='k') ax.plot(data[::-1], linestyle='', marker=marker_as_list, mfc='b') - ax.set_xlim([-1, 10]) - ax.set_ylim([-1, 10]) + ax.set_xlim(-1, 10) + ax.set_ylim(-1, 10) @image_comparison(['vline_hline_zorder.png', 'errorbar_zorder.png'], @@ -5552,8 +5552,8 @@ def test_step_linestyle(): ax.step(x, y, lw=5, linestyle=ls, where='pre') ax.step(x, y + 1, lw=5, linestyle=ls, where='mid') ax.step(x, y + 2, lw=5, linestyle=ls, where='post') - ax.set_xlim([-1, 5]) - ax.set_ylim([-1, 7]) + ax.set_xlim(-1, 5) + ax.set_ylim(-1, 7) # Reuse testcase from above for a labeled data test data = {"X": x, "Y0": y, "Y1": y+1, "Y2": y+2} @@ -5564,8 +5564,8 @@ def test_step_linestyle(): ax.step("X", "Y0", lw=5, linestyle=ls, where='pre', data=data) ax.step("X", "Y1", lw=5, linestyle=ls, where='mid', data=data) ax.step("X", "Y2", lw=5, linestyle=ls, where='post', data=data) - ax.set_xlim([-1, 5]) - ax.set_ylim([-1, 7]) + ax.set_xlim(-1, 5) + ax.set_ylim(-1, 7) @image_comparison(['mixed_collection'], remove_text=True) @@ -7802,8 +7802,8 @@ def test_zoom_inset(): axin1 = ax.inset_axes([0.7, 0.7, 0.35, 0.35]) # redraw the data in the inset axes... axin1.pcolormesh(x, y, z[:-1, :-1]) - axin1.set_xlim([1.5, 2.15]) - axin1.set_ylim([2, 2.5]) + axin1.set_xlim(1.5, 2.15) + axin1.set_ylim(2, 2.5) axin1.set_aspect(ax.get_aspect()) with pytest.warns(mpl.MatplotlibDeprecationWarning): diff --git a/lib/matplotlib/tests/test_axis.py b/lib/matplotlib/tests/test_axis.py index e33656ea9c17..5cb3ff4d3856 100644 --- a/lib/matplotlib/tests/test_axis.py +++ b/lib/matplotlib/tests/test_axis.py @@ -15,9 +15,9 @@ def test_axis_not_in_layout(): fig2, (ax2_left, ax2_right) = plt.subplots(ncols=2, layout='constrained') # 100 label overlapping the end of the axis - ax1_left.set_xlim([0, 100]) + ax1_left.set_xlim(0, 100) # 100 label not overlapping the end of the axis - ax2_left.set_xlim([0, 120]) + ax2_left.set_xlim(0, 120) for ax in ax1_left, ax2_left: ax.set_xticks([0, 100]) diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py index b77fdb0c8ed8..ba20f325f4d7 100644 --- a/lib/matplotlib/tests/test_colorbar.py +++ b/lib/matplotlib/tests/test_colorbar.py @@ -845,7 +845,7 @@ def test_colorbar_change_lim_scale(): pc = ax[1].pcolormesh(np.arange(100).reshape(10, 10)+1) cb = fig.colorbar(pc, ax=ax[1], extend='both') - cb.ax.set_ylim([20, 90]) + cb.ax.set_ylim(20, 90) @check_figures_equal() diff --git a/lib/matplotlib/tests/test_dates.py b/lib/matplotlib/tests/test_dates.py index 73f10cec52aa..8ee12131fdbe 100644 --- a/lib/matplotlib/tests/test_dates.py +++ b/lib/matplotlib/tests/test_dates.py @@ -199,7 +199,7 @@ def test_too_many_date_ticks(caplog): tf = datetime.datetime(2000, 1, 20) fig, ax = plt.subplots() with pytest.warns(UserWarning) as rec: - ax.set_xlim((t0, tf), auto=True) + ax.set_xlim(t0, tf, auto=True) assert len(rec) == 1 assert ('Attempting to set identical low and high xlims' in str(rec[0].message)) diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py index 5401dd73e5ef..271fe6755a15 100644 --- a/lib/matplotlib/tests/test_image.py +++ b/lib/matplotlib/tests/test_image.py @@ -114,12 +114,12 @@ def test_imshow_zoom(fig_test, fig_ref): fig.set_size_inches(2.9, 2.9) ax = fig_test.subplots() ax.imshow(A, interpolation='auto') - ax.set_xlim([10, 20]) - ax.set_ylim([10, 20]) + ax.set_xlim(10, 20) + ax.set_ylim(10, 20) ax = fig_ref.subplots() ax.imshow(A, interpolation='nearest') - ax.set_xlim([10, 20]) - ax.set_ylim([10, 20]) + ax.set_xlim(10, 20) + ax.set_ylim(10, 20) @check_figures_equal() @@ -512,8 +512,8 @@ def test_image_edges(): interpolation='none', cmap='gray') x = y = 2 - ax.set_xlim([-x, x]) - ax.set_ylim([-y, y]) + ax.set_xlim(-x, x) + ax.set_ylim(-y, y) ax.set_xticks([]) ax.set_yticks([]) @@ -538,7 +538,7 @@ def test_image_composite_background(): ax.imshow(arr, extent=[0, 2, 15, 0]) ax.imshow(arr, extent=[4, 6, 15, 0]) ax.set_facecolor((1, 0, 0, 0.5)) - ax.set_xlim([0, 12]) + ax.set_xlim(0, 12) @image_comparison(['image_composite_alpha'], remove_text=True, tol=0.07) @@ -564,8 +564,8 @@ def test_image_composite_alpha(): ax.imshow(arr2, extent=[0, 5, 2, 3], alpha=0.6) ax.imshow(arr2, extent=[0, 5, 3, 4], alpha=0.3) ax.set_facecolor((0, 0.5, 0, 1)) - ax.set_xlim([0, 5]) - ax.set_ylim([5, 0]) + ax.set_xlim(0, 5) + ax.set_ylim(5, 0) @check_figures_equal(extensions=["pdf"]) @@ -1469,8 +1469,8 @@ def test_rgba_antialias(): axs = axs.flatten() # zoom in axs[0].imshow(aa, interpolation='nearest', cmap=cmap, vmin=-1.2, vmax=1.2) - axs[0].set_xlim([N/2-25, N/2+25]) - axs[0].set_ylim([N/2+50, N/2-10]) + axs[0].set_xlim(N/2-25, N/2+25) + axs[0].set_ylim(N/2+50, N/2-10) # no anti-alias axs[1].imshow(aa, interpolation='nearest', cmap=cmap, vmin=-1.2, vmax=1.2) diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py index 9c708598e27c..a073fa839d50 100644 --- a/lib/matplotlib/tests/test_legend.py +++ b/lib/matplotlib/tests/test_legend.py @@ -518,8 +518,8 @@ def test_legend_stackplot(): y2 = 2.0 * x + 1 y3 = 3.0 * x + 2 ax.stackplot(x, y1, y2, y3, labels=['y1', 'y2', 'y3']) - ax.set_xlim((0, 10)) - ax.set_ylim((0, 70)) + ax.set_xlim(0, 10) + ax.set_ylim(0, 70) ax.legend(loc='best') diff --git a/lib/matplotlib/tests/test_lines.py b/lib/matplotlib/tests/test_lines.py index 56bded0c6557..88f96d1b6555 100644 --- a/lib/matplotlib/tests/test_lines.py +++ b/lib/matplotlib/tests/test_lines.py @@ -219,8 +219,8 @@ def test_marker_fill_styles(): markeredgecolor=color, markeredgewidth=2) - ax.set_ylim([0, 7.5]) - ax.set_xlim([-5, 155]) + ax.set_ylim(0, 7.5) + ax.set_xlim(-5, 155) def test_markerfacecolor_fillstyle(): diff --git a/lib/matplotlib/tests/test_offsetbox.py b/lib/matplotlib/tests/test_offsetbox.py index 81fe062d83b2..cd693c64ee3f 100644 --- a/lib/matplotlib/tests/test_offsetbox.py +++ b/lib/matplotlib/tests/test_offsetbox.py @@ -48,8 +48,8 @@ def test_offsetbox_clipping(): da.add_artist(bg) da.add_artist(line) ax.add_artist(anchored_box) - ax.set_xlim((0, 1)) - ax.set_ylim((0, 1)) + ax.set_xlim(0, 1) + ax.set_ylim(0, 1) def test_offsetbox_clip_children(): diff --git a/lib/matplotlib/tests/test_path.py b/lib/matplotlib/tests/test_path.py index 5424160dad93..88bb5840a97f 100644 --- a/lib/matplotlib/tests/test_path.py +++ b/lib/matplotlib/tests/test_path.py @@ -155,8 +155,8 @@ def test_nonlinear_containment(): def test_arrow_contains_point(): # fix bug (#8384) fig, ax = plt.subplots() - ax.set_xlim((0, 2)) - ax.set_ylim((0, 2)) + ax.set_xlim(0, 2) + ax.set_ylim(0, 2) # create an arrow with Curve style arrow = patches.FancyArrowPatch((0.5, 0.25), (1.5, 0.75), diff --git a/lib/matplotlib/tests/test_simplification.py b/lib/matplotlib/tests/test_simplification.py index bc9b46b14db2..41d01addd622 100644 --- a/lib/matplotlib/tests/test_simplification.py +++ b/lib/matplotlib/tests/test_simplification.py @@ -25,7 +25,7 @@ def test_clipping(): fig, ax = plt.subplots() ax.plot(t, s, linewidth=1.0) - ax.set_ylim((-0.20, -0.28)) + ax.set_ylim(-0.20, -0.28) @image_comparison(['overflow'], remove_text=True, @@ -244,8 +244,8 @@ def test_simplify_curve(): fig, ax = plt.subplots() ax.add_patch(pp1) - ax.set_xlim((0, 2)) - ax.set_ylim((0, 2)) + ax.set_xlim(0, 2) + ax.set_ylim(0, 2) @check_figures_equal(extensions=['png', 'pdf', 'svg']) @@ -401,8 +401,8 @@ def test_closed_path_clipping(fig_test, fig_ref): def test_hatch(): fig, ax = plt.subplots() ax.add_patch(plt.Rectangle((0, 0), 1, 1, fill=False, hatch="/")) - ax.set_xlim((0.45, 0.55)) - ax.set_ylim((0.45, 0.55)) + ax.set_xlim(0.45, 0.55) + ax.set_ylim(0.45, 0.55) @image_comparison(['fft_peaks'], remove_text=True) diff --git a/lib/matplotlib/tests/test_text.py b/lib/matplotlib/tests/test_text.py index 79a9e2d66c46..7327ed55ed04 100644 --- a/lib/matplotlib/tests/test_text.py +++ b/lib/matplotlib/tests/test_text.py @@ -144,8 +144,8 @@ def test_multiline2(): fig, ax = plt.subplots() - ax.set_xlim([0, 1.4]) - ax.set_ylim([0, 2]) + ax.set_xlim(0, 1.4) + ax.set_ylim(0, 2) ax.axhline(0.5, color='C2', linewidth=0.3) sts = ['Line', '2 Lineg\n 2 Lg', '$\\sum_i x $', 'hi $\\sum_i x $\ntest', 'test\n $\\sum_i x $', '$\\sum_i x $\n $\\sum_i x $'] diff --git a/lib/matplotlib/tests/test_tightlayout.py b/lib/matplotlib/tests/test_tightlayout.py index f6b6d8f644cc..98fd5e70cdb9 100644 --- a/lib/matplotlib/tests/test_tightlayout.py +++ b/lib/matplotlib/tests/test_tightlayout.py @@ -331,8 +331,8 @@ def test_collapsed(): # zero (i.e. margins add up to more than the available width) that a call # to tight_layout will not get applied: fig, ax = plt.subplots(tight_layout=True) - ax.set_xlim([0, 1]) - ax.set_ylim([0, 1]) + ax.set_xlim(0, 1) + ax.set_ylim(0, 1) ax.annotate('BIG LONG STRING', xy=(1.25, 2), xytext=(10.5, 1.75), annotation_clip=False) diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py index e62379470db1..9ded7c61ce2d 100644 --- a/lib/matplotlib/widgets.py +++ b/lib/matplotlib/widgets.py @@ -273,10 +273,10 @@ def __init__(self, ax, orientation, closedmin, closedmax, self.valfmt = valfmt if orientation == "vertical": - ax.set_ylim((valmin, valmax)) + ax.set_ylim(valmin, valmax) axis = ax.yaxis else: - ax.set_xlim((valmin, valmax)) + ax.set_xlim(valmin, valmax) axis = ax.xaxis self._fmt = axis.get_major_formatter() diff --git a/lib/mpl_toolkits/axisartist/tests/test_axislines.py b/lib/mpl_toolkits/axisartist/tests/test_axislines.py index 8bc3707421b6..a1485d4f436b 100644 --- a/lib/mpl_toolkits/axisartist/tests/test_axislines.py +++ b/lib/mpl_toolkits/axisartist/tests/test_axislines.py @@ -83,8 +83,8 @@ def test_ParasiteAxesAuxTrans(): getattr(ax2, name)(xx, yy, data[:-1, :-1]) else: getattr(ax2, name)(xx, yy, data) - ax1.set_xlim((0, 5)) - ax1.set_ylim((0, 5)) + ax1.set_xlim(0, 5) + ax1.set_ylim(0, 5) ax2.contour(xx, yy, data, colors='k') diff --git a/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py b/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py index 79c7baba9bd1..cd45c8e33a6f 100644 --- a/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py +++ b/lib/mpl_toolkits/mplot3d/tests/test_axes3d.py @@ -2227,9 +2227,9 @@ def test_computed_zorder(): # plot some points ax.scatter((3, 3), (1, 3), (1, 3), c='red', zorder=10) - ax.set_xlim((0, 5.0)) - ax.set_ylim((0, 5.0)) - ax.set_zlim((0, 2.5)) + ax.set_xlim(0, 5.0) + ax.set_ylim(0, 5.0) + ax.set_zlim(0, 2.5) ax3 = fig.add_subplot(223, projection='3d') ax4 = fig.add_subplot(224, projection='3d') From edc8b20f3f05a1b16f2145ebc8e73ad9967ae4c1 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 16 Apr 2025 19:47:54 -0400 Subject: [PATCH 019/161] Ensure tuples are passed to Axes.set([xyz]lim=...) --- galleries/examples/mplot3d/box3d.py | 2 +- .../examples/specialty_plots/leftventricle_bullseye.py | 2 +- galleries/tutorials/lifecycle.py | 8 ++++---- galleries/users_explain/animations/animations.py | 2 +- lib/matplotlib/tests/test_usetex.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/galleries/examples/mplot3d/box3d.py b/galleries/examples/mplot3d/box3d.py index 807e3d496ec6..4d75c8bc2809 100644 --- a/galleries/examples/mplot3d/box3d.py +++ b/galleries/examples/mplot3d/box3d.py @@ -51,7 +51,7 @@ xmin, xmax = X.min(), X.max() ymin, ymax = Y.min(), Y.max() zmin, zmax = Z.min(), Z.max() -ax.set(xlim=[xmin, xmax], ylim=[ymin, ymax], zlim=[zmin, zmax]) +ax.set(xlim=(xmin, xmax), ylim=(ymin, ymax), zlim=(zmin, zmax)) # Plot edges edges_kw = dict(color='0.4', linewidth=1, zorder=1e3) diff --git a/galleries/examples/specialty_plots/leftventricle_bullseye.py b/galleries/examples/specialty_plots/leftventricle_bullseye.py index 3ad02edbc630..285fcdaecc5e 100644 --- a/galleries/examples/specialty_plots/leftventricle_bullseye.py +++ b/galleries/examples/specialty_plots/leftventricle_bullseye.py @@ -55,7 +55,7 @@ def bullseye_plot(ax, data, seg_bold=None, cmap="viridis", norm=None): r = np.linspace(0.2, 1, 4) - ax.set(ylim=[0, 1], xticklabels=[], yticklabels=[]) + ax.set(ylim=(0, 1), xticklabels=[], yticklabels=[]) ax.grid(False) # Remove grid # Fill segments 1-6, 7-12, 13-16. diff --git a/galleries/tutorials/lifecycle.py b/galleries/tutorials/lifecycle.py index 4aae4d6c1dbc..4c009f802cf4 100644 --- a/galleries/tutorials/lifecycle.py +++ b/galleries/tutorials/lifecycle.py @@ -169,7 +169,7 @@ ax.barh(group_names, group_data) labels = ax.get_xticklabels() plt.setp(labels, rotation=45, horizontalalignment='right') -ax.set(xlim=[-10000, 140000], xlabel='Total Revenue', ylabel='Company', +ax.set(xlim=(-10000, 140000), xlabel='Total Revenue', ylabel='Company', title='Company Revenue') # %% @@ -187,7 +187,7 @@ ax.barh(group_names, group_data) labels = ax.get_xticklabels() plt.setp(labels, rotation=45, horizontalalignment='right') -ax.set(xlim=[-10000, 140000], xlabel='Total Revenue', ylabel='Company', +ax.set(xlim=(-10000, 140000), xlabel='Total Revenue', ylabel='Company', title='Company Revenue') # %% @@ -220,7 +220,7 @@ def currency(x, pos): labels = ax.get_xticklabels() plt.setp(labels, rotation=45, horizontalalignment='right') -ax.set(xlim=[-10000, 140000], xlabel='Total Revenue', ylabel='Company', +ax.set(xlim=(-10000, 140000), xlabel='Total Revenue', ylabel='Company', title='Company Revenue') ax.xaxis.set_major_formatter(currency) @@ -248,7 +248,7 @@ def currency(x, pos): # Now we move our title up since it's getting a little cramped ax.title.set(y=1.05) -ax.set(xlim=[-10000, 140000], xlabel='Total Revenue', ylabel='Company', +ax.set(xlim=(-10000, 140000), xlabel='Total Revenue', ylabel='Company', title='Company Revenue') ax.xaxis.set_major_formatter(currency) ax.set_xticks([0, 25e3, 50e3, 75e3, 100e3, 125e3]) diff --git a/galleries/users_explain/animations/animations.py b/galleries/users_explain/animations/animations.py index a0669956ab81..dca49fc5228e 100644 --- a/galleries/users_explain/animations/animations.py +++ b/galleries/users_explain/animations/animations.py @@ -111,7 +111,7 @@ scat = ax.scatter(t[0], z[0], c="b", s=5, label=f'v0 = {v0} m/s') line2 = ax.plot(t[0], z2[0], label=f'v0 = {v02} m/s')[0] -ax.set(xlim=[0, 3], ylim=[-4, 10], xlabel='Time [s]', ylabel='Z [m]') +ax.set(xlim=(0, 3), ylim=(-4, 10), xlabel='Time [s]', ylabel='Z [m]') ax.legend() diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py index c92beed7f2c6..1d640b4adf7c 100644 --- a/lib/matplotlib/tests/test_usetex.py +++ b/lib/matplotlib/tests/test_usetex.py @@ -169,7 +169,7 @@ def test_rotation(): fig = plt.figure() ax = fig.add_axes((0, 0, 1, 1)) - ax.set(xlim=[-0.5, 5], xticks=[], ylim=[-0.5, 3], yticks=[], frame_on=False) + ax.set(xlim=(-0.5, 5), xticks=[], ylim=(-0.5, 3), yticks=[], frame_on=False) text = {val: val[0] for val in ['top', 'center', 'bottom', 'left', 'right']} text['baseline'] = 'B' From a5a4846c32f1fd08be8b103b4b3f0b3db15a9f61 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Sat, 3 May 2025 20:04:51 +0100 Subject: [PATCH 020/161] Remove cm.get_cmap --- .../next_api_changes/removals/30005-DS.rst | 7 ++++ lib/matplotlib/cm.py | 37 ------------------- lib/matplotlib/cm.pyi | 2 - 3 files changed, 7 insertions(+), 39 deletions(-) create mode 100644 doc/api/next_api_changes/removals/30005-DS.rst diff --git a/doc/api/next_api_changes/removals/30005-DS.rst b/doc/api/next_api_changes/removals/30005-DS.rst new file mode 100644 index 000000000000..6664583d3994 --- /dev/null +++ b/doc/api/next_api_changes/removals/30005-DS.rst @@ -0,0 +1,7 @@ +``matplotlib.cm.get_cmap`` +~~~~~~~~~~~~~~~~~~~~~~~~~~ + +If you have the name of a colormap as a `str`, use ``matplotlib.colormaps[name]`` instead. + +Otherwise `matplotlib.cm.ColormapRegistry.get_cmap` if you have a `str`, `None` or a +`matplotlib.colors.Colormap` object that you want to convert to a `.Colormap` object. diff --git a/lib/matplotlib/cm.py b/lib/matplotlib/cm.py index 2697666b9573..ef5bf0719d3b 100644 --- a/lib/matplotlib/cm.py +++ b/lib/matplotlib/cm.py @@ -243,43 +243,6 @@ def get_cmap(self, cmap): _bivar_colormaps = ColormapRegistry(bivar_cmaps) -# This is an exact copy of pyplot.get_cmap(). It was removed in 3.9, but apparently -# caused more user trouble than expected. Re-added for 3.9.1 and extended the -# deprecation period for two additional minor releases. -@_api.deprecated( - '3.7', - removal='3.11', - alternative="``matplotlib.colormaps[name]`` or ``matplotlib.colormaps.get_cmap()``" - " or ``pyplot.get_cmap()``" - ) -def get_cmap(name=None, lut=None): - """ - Get a colormap instance, defaulting to rc values if *name* is None. - - Parameters - ---------- - name : `~matplotlib.colors.Colormap` or str or None, default: None - If a `.Colormap` instance, it will be returned. Otherwise, the name of - a colormap known to Matplotlib, which will be resampled by *lut*. The - default, None, means :rc:`image.cmap`. - lut : int or None, default: None - If *name* is not already a Colormap instance and *lut* is not None, the - colormap will be resampled to have *lut* entries in the lookup table. - - Returns - ------- - Colormap - """ - name = mpl._val_or_rc(name, 'image.cmap') - if isinstance(name, colors.Colormap): - return name - _api.check_in_list(sorted(_colormaps), name=name) - if lut is None: - return _colormaps[name] - else: - return _colormaps[name].resampled(lut) - - def _ensure_cmap(cmap): """ Ensure that we have a `.Colormap` object. diff --git a/lib/matplotlib/cm.pyi b/lib/matplotlib/cm.pyi index c3c62095684a..366b336fe04d 100644 --- a/lib/matplotlib/cm.pyi +++ b/lib/matplotlib/cm.pyi @@ -19,6 +19,4 @@ _colormaps: ColormapRegistry = ... _multivar_colormaps: ColormapRegistry = ... _bivar_colormaps: ColormapRegistry = ... -def get_cmap(name: str | colors.Colormap | None = ..., lut: int | None = ...) -> colors.Colormap: ... - ScalarMappable = _ScalarMappable From 84daf24a6b2bf77abfce61fef616a0fd9c0bec6d Mon Sep 17 00:00:00 2001 From: David Stansby Date: Sun, 4 May 2025 09:41:31 +0100 Subject: [PATCH 021/161] Improve API note Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> --- doc/api/next_api_changes/removals/30005-DS.rst | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/api/next_api_changes/removals/30005-DS.rst b/doc/api/next_api_changes/removals/30005-DS.rst index 6664583d3994..fe67bb9a4115 100644 --- a/doc/api/next_api_changes/removals/30005-DS.rst +++ b/doc/api/next_api_changes/removals/30005-DS.rst @@ -1,7 +1,11 @@ ``matplotlib.cm.get_cmap`` ~~~~~~~~~~~~~~~~~~~~~~~~~~ -If you have the name of a colormap as a `str`, use ``matplotlib.colormaps[name]`` instead. +Colormaps are now available through the `.Coloarmap.Registry` accessible via +``matplotlib.colormaps`` or ``plt.colormaps``. -Otherwise `matplotlib.cm.ColormapRegistry.get_cmap` if you have a `str`, `None` or a -`matplotlib.colors.Colormap` object that you want to convert to a `.Colormap` object. +If you have the name of a colormap as a sting, you can use direct lookup +``matplotlib.colormaps[name]``. Alternatively, `matplotlib.colormaps.get_cmap` will +maintain the existing behavior of additionally passing through `.Colormap` instances +and converting ``None`` to the default colormap. `plt.get_cmap` will stay as a +shortcut to `matplotlib.colormaps.get_cmap`. From 9485090ed878d0e7a469eed12e258d2ee697a504 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Mon, 5 May 2025 10:15:40 +0100 Subject: [PATCH 022/161] Fix links in API note --- doc/api/next_api_changes/removals/30005-DS.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/api/next_api_changes/removals/30005-DS.rst b/doc/api/next_api_changes/removals/30005-DS.rst index fe67bb9a4115..c0a4af7c9baa 100644 --- a/doc/api/next_api_changes/removals/30005-DS.rst +++ b/doc/api/next_api_changes/removals/30005-DS.rst @@ -2,10 +2,10 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~ Colormaps are now available through the `.Coloarmap.Registry` accessible via -``matplotlib.colormaps`` or ``plt.colormaps``. +`matplotlib.colormaps` or `matplotlib.pyplot.colormaps`. -If you have the name of a colormap as a sting, you can use direct lookup -``matplotlib.colormaps[name]``. Alternatively, `matplotlib.colormaps.get_cmap` will +If you have the name of a colormap as a string, you can use a direct lookup, +``matplotlib.colormaps[name]``. Alternatively, ``matplotlib.colormaps.get_cmap`` will maintain the existing behavior of additionally passing through `.Colormap` instances -and converting ``None`` to the default colormap. `plt.get_cmap` will stay as a -shortcut to `matplotlib.colormaps.get_cmap`. +and converting ``None`` to the default colormap. `matplotlib.pyplot.get_cmap` will stay as a +shortcut to ``matplotlib.colormaps.get_cmap``. From 24f9c69bcf8f6bc9a49596b3fe6884434641b3b6 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Mon, 5 May 2025 13:39:57 +0200 Subject: [PATCH 023/161] Fix link in API note --- doc/api/next_api_changes/removals/30005-DS.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/next_api_changes/removals/30005-DS.rst b/doc/api/next_api_changes/removals/30005-DS.rst index c0a4af7c9baa..9ca4eefc8da7 100644 --- a/doc/api/next_api_changes/removals/30005-DS.rst +++ b/doc/api/next_api_changes/removals/30005-DS.rst @@ -1,7 +1,7 @@ ``matplotlib.cm.get_cmap`` ~~~~~~~~~~~~~~~~~~~~~~~~~~ -Colormaps are now available through the `.Coloarmap.Registry` accessible via +Colormaps are now available through the `.ColormapRegistry` accessible via `matplotlib.colormaps` or `matplotlib.pyplot.colormaps`. If you have the name of a colormap as a string, you can use a direct lookup, From da2063b883dbae23564d548a829f299644aa6c81 Mon Sep 17 00:00:00 2001 From: James Addison Date: Tue, 1 Apr 2025 11:38:24 +0100 Subject: [PATCH 024/161] ci: restrict `pygobject-ver` for Ubuntu 22.04 jobs Currently we continue to install `girepository-1.0` during these workflow jobs; `PyGObject` v3.52 needs `girepository-2.0` instead. --- .github/workflows/tests.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 911fa69ec38b..46bc4fb918b0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -52,17 +52,27 @@ jobs: python-version: '3.11' extra-requirements: '-c requirements/testing/minver.txt' delete-font-cache: true + # https://github.com/matplotlib/matplotlib/issues/29844 + pygobject-ver: '<3.52.0' - os: ubuntu-22.04 python-version: '3.11' CFLAGS: "-fno-lto" # Ensure that disabling LTO works. extra-requirements: '-r requirements/testing/extra.txt' + # https://github.com/matplotlib/matplotlib/issues/29844 + pygobject-ver: '<3.52.0' - os: ubuntu-22.04-arm python-version: '3.12' + # https://github.com/matplotlib/matplotlib/issues/29844 + pygobject-ver: '<3.52.0' - os: ubuntu-22.04 python-version: '3.13' + # https://github.com/matplotlib/matplotlib/issues/29844 + pygobject-ver: '<3.52.0' - name-suffix: "Free-threaded" os: ubuntu-22.04 python-version: '3.13t' + # https://github.com/matplotlib/matplotlib/issues/29844 + pygobject-ver: '<3.52.0' - os: ubuntu-24.04 python-version: '3.12' - os: macos-13 # This runner is on Intel chips. From ac5225483f9b016739607ad541ea8abcb8cb9c2c Mon Sep 17 00:00:00 2001 From: ellie Date: Fri, 9 May 2025 01:06:30 +0100 Subject: [PATCH 025/161] Update diagram in subplots_adjust documentation to clarify parameter meaning --- doc/_embedded_plots/figure_subplots_adjust.py | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/doc/_embedded_plots/figure_subplots_adjust.py b/doc/_embedded_plots/figure_subplots_adjust.py index b4b8d7d32a3d..d3de95393bfe 100644 --- a/doc/_embedded_plots/figure_subplots_adjust.py +++ b/doc/_embedded_plots/figure_subplots_adjust.py @@ -1,28 +1,30 @@ import matplotlib.pyplot as plt - def arrow(p1, p2, **props): - axs[0, 0].annotate( - "", p1, p2, xycoords='figure fraction', + overlay.annotate( + "", p1, p2, xycoords='figure fraction', arrowprops=dict(arrowstyle="<->", shrinkA=0, shrinkB=0, **props)) - fig, axs = plt.subplots(2, 2, figsize=(6.5, 4)) fig.set_facecolor('lightblue') fig.subplots_adjust(0.1, 0.1, 0.9, 0.9, 0.4, 0.4) + +overlay = fig.add_axes([0, 0, 1, 1], zorder=100) +overlay.axis("off") + for ax in axs.flat: ax.set(xticks=[], yticks=[]) arrow((0, 0.75), (0.1, 0.75)) # left -arrow((0.435, 0.75), (0.565, 0.75)) # wspace -arrow((0.9, 0.75), (1, 0.75)) # right +arrow((0.435, 0.25), (0.565, 0.25)) # wspace +arrow((0.1, 0.8), (1, 0.8)) # right fig.text(0.05, 0.7, "left", ha="center") -fig.text(0.5, 0.7, "wspace", ha="center") -fig.text(0.95, 0.7, "right", ha="center") +fig.text(0.5, 0.3, "wspace", ha="center") +fig.text(0.95, 0.83, "right", ha="center") -arrow((0.25, 0), (0.25, 0.1)) # bottom +arrow((0.75, 0), (0.75, 0.1)) # bottom arrow((0.25, 0.435), (0.25, 0.565)) # hspace -arrow((0.25, 0.9), (0.25, 1)) # top -fig.text(0.28, 0.05, "bottom", va="center") +arrow((0.80, 0.1), (0.8, 1)) # top +fig.text(0.65, 0.05, "bottom", va="center") fig.text(0.28, 0.5, "hspace", va="center") -fig.text(0.28, 0.95, "top", va="center") +fig.text(0.75, 0.95, "top", va="center") From fa3f5f55d16b3631b410d8eb43e3e0b972387b2f Mon Sep 17 00:00:00 2001 From: founta Date: Fri, 9 May 2025 07:42:22 -0400 Subject: [PATCH 026/161] add sans alias to rc() to allow users to set font.sans-serif --- lib/matplotlib/__init__.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py index ac71070e690a..9abc6c5a84dd 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -995,9 +995,9 @@ def rc(group, **kwargs): The following aliases are available to save typing for interactive users: - ===== ================= + ====== ================= Alias Property - ===== ================= + ====== ================= 'lw' 'linewidth' 'ls' 'linestyle' 'c' 'color' @@ -1005,7 +1005,8 @@ def rc(group, **kwargs): 'ec' 'edgecolor' 'mew' 'markeredgewidth' 'aa' 'antialiased' - ===== ================= + 'sans' 'sans-serif' + ====== ================= Thus you could abbreviate the above call as:: @@ -1039,6 +1040,7 @@ def rc(group, **kwargs): 'ec': 'edgecolor', 'mew': 'markeredgewidth', 'aa': 'antialiased', + 'sans': 'sans-serif', } if isinstance(group, str): From dd7f51b00956680ac768fea5fa51261c803f1548 Mon Sep 17 00:00:00 2001 From: ellie Date: Fri, 9 May 2025 14:53:49 +0100 Subject: [PATCH 027/161] Corrected subplots_adjust diagram --- doc/_embedded_plots/figure_subplots_adjust.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/_embedded_plots/figure_subplots_adjust.py b/doc/_embedded_plots/figure_subplots_adjust.py index d3de95393bfe..01afb74c9c3e 100644 --- a/doc/_embedded_plots/figure_subplots_adjust.py +++ b/doc/_embedded_plots/figure_subplots_adjust.py @@ -1,5 +1,6 @@ import matplotlib.pyplot as plt + def arrow(p1, p2, **props): overlay.annotate( "", p1, p2, xycoords='figure fraction', @@ -17,14 +18,14 @@ def arrow(p1, p2, **props): arrow((0, 0.75), (0.1, 0.75)) # left arrow((0.435, 0.25), (0.565, 0.25)) # wspace -arrow((0.1, 0.8), (1, 0.8)) # right +arrow((0, 0.8), (0.9, 0.8)) # right fig.text(0.05, 0.7, "left", ha="center") fig.text(0.5, 0.3, "wspace", ha="center") -fig.text(0.95, 0.83, "right", ha="center") +fig.text(0.05, 0.83, "right", ha="center") arrow((0.75, 0), (0.75, 0.1)) # bottom arrow((0.25, 0.435), (0.25, 0.565)) # hspace -arrow((0.80, 0.1), (0.8, 1)) # top +arrow((0.80, 0), (0.8, 0.9)) # top fig.text(0.65, 0.05, "bottom", va="center") fig.text(0.28, 0.5, "hspace", va="center") -fig.text(0.75, 0.95, "top", va="center") +fig.text(0.82, 0.05, "top", va="center") From 785140be92e09f900751e5e4ffc8546acd768d82 Mon Sep 17 00:00:00 2001 From: ellie Date: Fri, 9 May 2025 16:50:04 +0100 Subject: [PATCH 028/161] Addressed diagram feedback and simplified annotation calls --- doc/_embedded_plots/figure_subplots_adjust.py | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/doc/_embedded_plots/figure_subplots_adjust.py b/doc/_embedded_plots/figure_subplots_adjust.py index 01afb74c9c3e..6f99a3febcdc 100644 --- a/doc/_embedded_plots/figure_subplots_adjust.py +++ b/doc/_embedded_plots/figure_subplots_adjust.py @@ -1,31 +1,34 @@ import matplotlib.pyplot as plt -def arrow(p1, p2, **props): - overlay.annotate( - "", p1, p2, xycoords='figure fraction', - arrowprops=dict(arrowstyle="<->", shrinkA=0, shrinkB=0, **props)) - fig, axs = plt.subplots(2, 2, figsize=(6.5, 4)) fig.set_facecolor('lightblue') fig.subplots_adjust(0.1, 0.1, 0.9, 0.9, 0.4, 0.4) overlay = fig.add_axes([0, 0, 1, 1], zorder=100) overlay.axis("off") +xycoords='figure fraction' +arrowprops=dict(arrowstyle="<->", shrinkA=0, shrinkB=0) for ax in axs.flat: ax.set(xticks=[], yticks=[]) -arrow((0, 0.75), (0.1, 0.75)) # left -arrow((0.435, 0.25), (0.565, 0.25)) # wspace -arrow((0, 0.8), (0.9, 0.8)) # right +overlay.annotate("", (0, 0.75), (0.1, 0.75), + xycoords=xycoords, arrowprops=arrowprops) # left +overlay.annotate("", (0.435, 0.25), (0.565, 0.25), + xycoords=xycoords, arrowprops=arrowprops) # wspace +overlay.annotate("", (0, 0.8), (0.9, 0.8), + xycoords=xycoords, arrowprops=arrowprops) # right fig.text(0.05, 0.7, "left", ha="center") fig.text(0.5, 0.3, "wspace", ha="center") fig.text(0.05, 0.83, "right", ha="center") -arrow((0.75, 0), (0.75, 0.1)) # bottom -arrow((0.25, 0.435), (0.25, 0.565)) # hspace -arrow((0.80, 0), (0.8, 0.9)) # top +overlay.annotate("", (0.75, 0), (0.75, 0.1), + xycoords=xycoords, arrowprops=arrowprops) # bottom +overlay.annotate("", (0.25, 0.435), (0.25, 0.565), + xycoords=xycoords, arrowprops=arrowprops) # hspace +overlay.annotate("", (0.8, 0), (0.8, 0.9), + xycoords=xycoords, arrowprops=arrowprops) # top fig.text(0.65, 0.05, "bottom", va="center") fig.text(0.28, 0.5, "hspace", va="center") fig.text(0.82, 0.05, "top", va="center") From da6b32e02b66832556d2e668fed1392d94f965ba Mon Sep 17 00:00:00 2001 From: David Stansby Date: Fri, 9 May 2025 20:49:12 +0100 Subject: [PATCH 029/161] Enable linting of .pyi files --- lib/matplotlib/__init__.pyi | 2 ++ lib/matplotlib/_enums.pyi | 1 - lib/matplotlib/axes/_axes.pyi | 2 -- lib/matplotlib/colorizer.pyi | 1 - lib/matplotlib/colors.pyi | 8 ++++---- lib/matplotlib/contour.pyi | 2 +- lib/matplotlib/table.pyi | 2 +- lib/matplotlib/text.pyi | 2 +- pyproject.toml | 3 +-- 9 files changed, 10 insertions(+), 13 deletions(-) diff --git a/lib/matplotlib/__init__.pyi b/lib/matplotlib/__init__.pyi index 88058ffd7def..07019109f406 100644 --- a/lib/matplotlib/__init__.pyi +++ b/lib/matplotlib/__init__.pyi @@ -26,6 +26,8 @@ __all__ = [ "interactive", "is_interactive", "colormaps", + "multivar_colormaps", + "bivar_colormaps", "color_sequences", ] diff --git a/lib/matplotlib/_enums.pyi b/lib/matplotlib/_enums.pyi index 714e6cfe03fa..3ff7e208c398 100644 --- a/lib/matplotlib/_enums.pyi +++ b/lib/matplotlib/_enums.pyi @@ -1,4 +1,3 @@ -from typing import cast from enum import Enum diff --git a/lib/matplotlib/axes/_axes.pyi b/lib/matplotlib/axes/_axes.pyi index a23a0b27f01b..c3eb28d2f095 100644 --- a/lib/matplotlib/axes/_axes.pyi +++ b/lib/matplotlib/axes/_axes.pyi @@ -2,7 +2,6 @@ from matplotlib.axes._base import _AxesBase from matplotlib.axes._secondary_axes import SecondaryAxis from matplotlib.artist import Artist -from matplotlib.backend_bases import RendererBase from matplotlib.collections import ( Collection, FillBetweenPolyCollection, @@ -32,7 +31,6 @@ import matplotlib.table as mtable import matplotlib.stackplot as mstack import matplotlib.streamplot as mstream -import datetime import PIL.Image from collections.abc import Callable, Iterable, Sequence from typing import Any, Literal, overload diff --git a/lib/matplotlib/colorizer.pyi b/lib/matplotlib/colorizer.pyi index 8fcce3e5d63b..f35ebe5295e4 100644 --- a/lib/matplotlib/colorizer.pyi +++ b/lib/matplotlib/colorizer.pyi @@ -1,6 +1,5 @@ from matplotlib import cbook, colorbar, colors, artist -from typing import overload import numpy as np from numpy.typing import ArrayLike diff --git a/lib/matplotlib/colors.pyi b/lib/matplotlib/colors.pyi index 3e761c949068..eadd759bcaa3 100644 --- a/lib/matplotlib/colors.pyi +++ b/lib/matplotlib/colors.pyi @@ -196,8 +196,8 @@ class BivarColormap: M: int n_variates: int def __init__( - self, N: int = ..., M: int | None = ..., shape: Literal['square', 'circle', 'ignore', 'circleignore'] = ..., - origin: Sequence[float] = ..., name: str = ... + self, N: int = ..., M: int | None = ..., shape: Literal['square', 'circle', 'ignore', 'circleignore'] = ..., + origin: Sequence[float] = ..., name: str = ... ) -> None: ... @overload def __call__( @@ -245,8 +245,8 @@ class SegmentedBivarColormap(BivarColormap): class BivarColormapFromImage(BivarColormap): def __init__( - self, lut: np.ndarray, shape: Literal['square', 'circle', 'ignore', 'circleignore'] = ..., - origin: Sequence[float] = ..., name: str = ... + self, lut: np.ndarray, shape: Literal['square', 'circle', 'ignore', 'circleignore'] = ..., + origin: Sequence[float] = ..., name: str = ... ) -> None: ... class Normalize: diff --git a/lib/matplotlib/contour.pyi b/lib/matplotlib/contour.pyi index 7400fac50993..2a89d6016170 100644 --- a/lib/matplotlib/contour.pyi +++ b/lib/matplotlib/contour.pyi @@ -1,7 +1,7 @@ import matplotlib.cm as cm from matplotlib.artist import Artist from matplotlib.axes import Axes -from matplotlib.collections import Collection, PathCollection +from matplotlib.collections import Collection from matplotlib.colorizer import Colorizer, ColorizingArtist from matplotlib.colors import Colormap, Normalize from matplotlib.path import Path diff --git a/lib/matplotlib/table.pyi b/lib/matplotlib/table.pyi index 07d2427f66dc..167d98d3c4cb 100644 --- a/lib/matplotlib/table.pyi +++ b/lib/matplotlib/table.pyi @@ -8,7 +8,7 @@ from .transforms import Bbox from .typing import ColorType from collections.abc import Sequence -from typing import Any, Literal, TYPE_CHECKING +from typing import Any, Literal from pandas import DataFrame diff --git a/lib/matplotlib/text.pyi b/lib/matplotlib/text.pyi index 9cdfd9596a7d..41c7b761ae32 100644 --- a/lib/matplotlib/text.pyi +++ b/lib/matplotlib/text.pyi @@ -14,7 +14,7 @@ from .transforms import ( Transform, ) -from collections.abc import Callable, Iterable +from collections.abc import Iterable from typing import Any, Literal from .typing import ColorType, CoordsType diff --git a/pyproject.toml b/pyproject.toml index dc951375bba2..81a1c32baf34 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -99,8 +99,6 @@ exclude = [ "tools/gh_api.py", ".tox", ".eggs", - # TODO: fix .pyi files - "*.pyi", # TODO: fix .ipynb files "*.ipynb" ] @@ -173,6 +171,7 @@ external = [ convention = "numpy" [tool.ruff.lint.per-file-ignores] +"*.pyi" = ["E501"] "doc/conf.py" = ["E402"] "galleries/examples/animation/frame_grabbing_sgskip.py" = ["E402"] "galleries/examples/images_contours_and_fields/tricontour_demo.py" = ["E201"] From e43950c6bb626bd0d1252de9dd52282a38004c35 Mon Sep 17 00:00:00 2001 From: Barbier--Darnal Joseph Date: Fri, 9 May 2025 22:06:16 +0200 Subject: [PATCH 030/161] add matplotlib journey course to external resources --- doc/users/resources/index.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/users/resources/index.rst b/doc/users/resources/index.rst index 7e2339ee8191..a31dbc83aa9d 100644 --- a/doc/users/resources/index.rst +++ b/doc/users/resources/index.rst @@ -82,6 +82,10 @@ Tutorials `_ by Stefanie Molin +* `Matplotlib Journey: Interactive Online Course + `_ + by Yan Holtz and Joseph Barbier + ========= Galleries ========= From 22a8fcf2604500e5b43e78db0175c354990bba6a Mon Sep 17 00:00:00 2001 From: founta Date: Fri, 9 May 2025 21:11:11 -0400 Subject: [PATCH 031/161] add tests for all matplotlib.rc() aliases --- lib/matplotlib/tests/test_rcparams.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py index 1bc148a83a7e..1c7c4b62417a 100644 --- a/lib/matplotlib/tests/test_rcparams.py +++ b/lib/matplotlib/tests/test_rcparams.py @@ -654,3 +654,21 @@ def test_rcparams_path_sketch_from_file(tmp_path, value): rc_path.write_text(f"path.sketch: {value}") with mpl.rc_context(fname=rc_path): assert mpl.rcParams["path.sketch"] == (1, 2, 3) + + +@pytest.mark.parametrize('group, option, alias, value', [ + ('lines', 'linewidth', 'lw', 3), + ('lines', 'linestyle', 'ls', 'dashed'), + ('lines', 'color', 'c', 'white'), + ('axes', 'facecolor', 'fc', 'black'), + ('figure', 'edgecolor', 'ec', 'magenta'), + ('lines', 'markeredgewidth', 'mew', 1.5), + ('patch', 'antialiased', 'aa', False), + ('font', 'sans-serif', 'sans', ["Verdana"]) +]) +def test_rc_aliases(group, option, alias, value): + rc_kwargs = {alias: value,} + mpl.rc(group, **rc_kwargs) + + rcParams_key = f"{group}.{option}" + assert mpl.rcParams[rcParams_key] == value From fd687a9b33308fa65dc103c275cac8b54e85cd1f Mon Sep 17 00:00:00 2001 From: founta Date: Fri, 9 May 2025 21:16:05 -0400 Subject: [PATCH 032/161] correct space formatting error ruff was unhappy with --- lib/matplotlib/tests/test_rcparams.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py index 1c7c4b62417a..2235f98b720f 100644 --- a/lib/matplotlib/tests/test_rcparams.py +++ b/lib/matplotlib/tests/test_rcparams.py @@ -657,14 +657,14 @@ def test_rcparams_path_sketch_from_file(tmp_path, value): @pytest.mark.parametrize('group, option, alias, value', [ - ('lines', 'linewidth', 'lw', 3), - ('lines', 'linestyle', 'ls', 'dashed'), - ('lines', 'color', 'c', 'white'), - ('axes', 'facecolor', 'fc', 'black'), - ('figure', 'edgecolor', 'ec', 'magenta'), - ('lines', 'markeredgewidth', 'mew', 1.5), - ('patch', 'antialiased', 'aa', False), - ('font', 'sans-serif', 'sans', ["Verdana"]) + ('lines', 'linewidth', 'lw', 3), + ('lines', 'linestyle', 'ls', 'dashed'), + ('lines', 'color', 'c', 'white'), + ('axes', 'facecolor', 'fc', 'black'), + ('figure', 'edgecolor', 'ec', 'magenta'), + ('lines', 'markeredgewidth', 'mew', 1.5), + ('patch', 'antialiased', 'aa', False), + ('font', 'sans-serif', 'sans', ["Verdana"]) ]) def test_rc_aliases(group, option, alias, value): rc_kwargs = {alias: value,} From 03fa1ffb1b26733f109ae10ac67c8432f48ec320 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 10 May 2025 05:03:10 -0400 Subject: [PATCH 033/161] Remove meson-python pinning (#30035) Version 0.18 should restore handling of symlinks: https://github.com/mesonbuild/meson-python/pull/728 --- pyproject.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 81a1c32baf34..70b078a73d27 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,7 +46,7 @@ requires-python = ">=3.11" [project.optional-dependencies] # Should be a copy of the build dependencies below. dev = [ - "meson-python>=0.13.1,<0.17.0", + "meson-python>=0.13.1,!=0.17.*", "pybind11>=2.13.2,!=2.13.3", "setuptools_scm>=7", # Not required by us but setuptools_scm without a version, cso _if_ @@ -70,7 +70,9 @@ dev = [ build-backend = "mesonpy" # Also keep in sync with optional dependencies above. requires = [ - "meson-python>=0.13.1,<0.17.0", + # meson-python 0.17.x breaks symlinks in sdists. You can remove this pin if + # you really need it and aren't using an sdist. + "meson-python>=0.13.1,!=0.17.*", "pybind11>=2.13.2,!=2.13.3", "setuptools_scm>=7", ] From 6bf2230372cfc1d9231254919568e88e5fe8c5de Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Sat, 10 May 2025 17:20:12 +0200 Subject: [PATCH 034/161] Remove cutout for missing font file in PdfFile._embedTeXFont. If fontfile is None, an error would already have been raised earlier in dviFontName (which explicitly checks for this case). (The cutout in _embedTeXFont was introduced first, in ed0066f (2009), but support for that case appears to have been broken a bit later and the check in dviFontName was then introduced in 4fcc0e7 (2016) where it simply improved the clarity of the exception ultimately raised.) --- lib/matplotlib/backends/backend_pdf.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py index 0ab5a65f0b75..eb9d217c932c 100644 --- a/lib/matplotlib/backends/backend_pdf.py +++ b/lib/matplotlib/backends/backend_pdf.py @@ -1021,18 +1021,6 @@ def _embedTeXFont(self, fontinfo): 0, *map(Name, dviread._parse_enc(fontinfo.encodingfile))], } - # If no file is specified, stop short - if fontinfo.fontfile is None: - _log.warning( - "Because of TeX configuration (pdftex.map, see updmap option " - "pdftexDownloadBase14) the font %s is not embedded. This is " - "deprecated as of PDF 1.5 and it may cause the consumer " - "application to show something that was not intended.", - fontinfo.basefont) - fontdict['BaseFont'] = Name(fontinfo.basefont) - self.writeObject(fontdictObject, fontdict) - return fontdictObject - # We have a font file to embed - read it in and apply any effects t1font = _type1font.Type1Font(fontinfo.fontfile) if fontinfo.effects: From 206c51a65d48dcbc78fc51707234734a3a9c876f Mon Sep 17 00:00:00 2001 From: Barbier--Darnal Joseph Date: Sun, 11 May 2025 08:58:43 +0200 Subject: [PATCH 035/161] update top message matplotlibrc file --- lib/matplotlib/mpl-data/matplotlibrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/mpl-data/matplotlibrc b/lib/matplotlib/mpl-data/matplotlibrc index 72117abf7317..acb131c82e6c 100644 --- a/lib/matplotlib/mpl-data/matplotlibrc +++ b/lib/matplotlib/mpl-data/matplotlibrc @@ -1,6 +1,6 @@ #### MATPLOTLIBRC FORMAT -## NOTE FOR END USERS: DO NOT EDIT THIS FILE! +## DO NOT EDIT THIS FILE, MAKE A COPY FIRST ## ## This is a sample Matplotlib configuration file - you can find a copy ## of it on your system in site-packages/matplotlib/mpl-data/matplotlibrc From dd4d635cea676b9d888cdaf79460bce8ec7b2be6 Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Sun, 11 May 2025 23:42:02 +0200 Subject: [PATCH 036/161] Improve usetex and pgf troubleshooting docs. - Merge "Troubleshooting" and "Possible hangups". - Don't list $PATH issues twice. - Remove mention of dvipng for pgf (which doesn't use dvipng). - Be more generic re: missing latex packages (this applies to all texlive installs, and the required list is given elsewhere). --- doc/install/dependencies.rst | 2 ++ galleries/users_explain/text/pgf.py | 7 +++--- galleries/users_explain/text/usetex.py | 31 +++++++++----------------- 3 files changed, 17 insertions(+), 23 deletions(-) diff --git a/doc/install/dependencies.rst b/doc/install/dependencies.rst index f2fda95a5f77..712846771cc6 100644 --- a/doc/install/dependencies.rst +++ b/doc/install/dependencies.rst @@ -422,6 +422,8 @@ Python packages and must be installed separately. * a LaTeX distribution, e.g. `TeX Live `_ or `MikTeX `_ +.. _tex-dependencies: + LaTeX dependencies """""""""""""""""" diff --git a/galleries/users_explain/text/pgf.py b/galleries/users_explain/text/pgf.py index fd7693cf55e3..c5fa16f35ce7 100644 --- a/galleries/users_explain/text/pgf.py +++ b/galleries/users_explain/text/pgf.py @@ -209,9 +209,10 @@ Troubleshooting =============== -* On Windows, the :envvar:`PATH` environment variable may need to be modified - to include the directories containing the latex, dvipng and ghostscript - executables. See :ref:`environment-variables` and +* Make sure LaTeX is working and on your :envvar:`PATH` (for raster output, + pdftocairo or ghostscript is also required). The :envvar:`PATH` environment + variable may need to be modified (in particular on Windows) to include the + directories containing the executable. See :ref:`environment-variables` and :ref:`setting-windows-environment-variables` for details. * Sometimes the font rendering in figures that are saved to png images is diff --git a/galleries/users_explain/text/usetex.py b/galleries/users_explain/text/usetex.py index f0c266819897..e687ec7af5bf 100644 --- a/galleries/users_explain/text/usetex.py +++ b/galleries/users_explain/text/usetex.py @@ -124,24 +124,6 @@ produces PostScript without rasterizing text, so it scales properly, can be edited in Adobe Illustrator, and searched text in pdf documents. -.. _usetex-hangups: - -Possible hangups -================ - -* On Windows, the :envvar:`PATH` environment variable may need to be modified - to include the directories containing the latex, dvipng and ghostscript - executables. See :ref:`environment-variables` and - :ref:`setting-windows-environment-variables` for details. - -* Using MiKTeX with Computer Modern fonts, if you get odd \*Agg and PNG - results, go to MiKTeX/Options and update your format files. - -* On Ubuntu and Gentoo, the base texlive install does not ship with - the type1cm package. You may need to install some of the extra - packages to get all the goodies that come bundled with other LaTeX - distributions. - .. _usetex-troubleshooting: Troubleshooting @@ -150,8 +132,11 @@ * Try deleting your :file:`.matplotlib/tex.cache` directory. If you don't know where to find :file:`.matplotlib`, see :ref:`locating-matplotlib-config-dir`. -* Make sure LaTeX, dvipng and Ghostscript are each working and on your - :envvar:`PATH`. +* Make sure LaTeX, dvipng, and Ghostscript are each working and on your + :envvar:`PATH`. The :envvar:`PATH` environment variable may need to + be modified (in particular on Windows) to include the directories + containing the executables. See :ref:`environment-variables` and + :ref:`setting-windows-environment-variables` for details. * Make sure what you are trying to do is possible in a LaTeX document, that your LaTeX syntax is valid and that you are using raw strings @@ -161,6 +146,12 @@ option provides lots of flexibility, and lots of ways to cause problems. Please disable this option before reporting problems. +* Using MiKTeX with Computer Modern fonts, if you get odd \*Agg and PNG + results, go to MiKTeX/Options and update your format files. + +* Some required LaTeX packages, such as type1cm, may be missing from minimalist + TeX installs. Required packages are listed at :ref:`tex-dependencies`. + * If you still need help, please see :ref:`reporting-problems`. .. _dvipng: http://www.nongnu.org/dvipng/ From 0f0048f47e540da0d3c337f056d17a247ed7a592 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Mon, 12 May 2025 17:23:01 -0400 Subject: [PATCH 037/161] CI: try running the precommit hooks on GHA --- .github/workflows/reviewdog.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml index c803fcc6ba38..09b7886e9c99 100644 --- a/.github/workflows/reviewdog.yml +++ b/.github/workflows/reviewdog.yml @@ -6,6 +6,20 @@ permissions: contents: read jobs: + pre-commit: + name: precommit + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + fetch-depth: 0 + - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0 + with: + python-version: "3.x" + - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1 + with: + extra_args: --hook-stage manual --all-files + ruff: name: ruff runs-on: ubuntu-latest From 52da36880416aca6e5d85f479abb929fc4a87d43 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Tue, 13 May 2025 22:38:19 +0200 Subject: [PATCH 038/161] Update version switcher for 3.10.3 --- doc/_static/switcher.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/_static/switcher.json b/doc/_static/switcher.json index 8798dae4b36b..62c8ed756824 100644 --- a/doc/_static/switcher.json +++ b/doc/_static/switcher.json @@ -1,7 +1,7 @@ [ { "name": "3.10 (stable)", - "version": "3.10.1", + "version": "3.10.3", "url": "https://matplotlib.org/stable/", "preferred": true }, From 90a2302614358d6798ed87e9d41bd59a9e3c82c4 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Tue, 13 May 2025 22:40:50 +0200 Subject: [PATCH 039/161] DOC: version switcher update on release --- doc/devel/release_guide.rst | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/devel/release_guide.rst b/doc/devel/release_guide.rst index 0e0ebb98fd1d..0ca3c06084d9 100644 --- a/doc/devel/release_guide.rst +++ b/doc/devel/release_guide.rst @@ -451,7 +451,7 @@ which will copy the built docs over. If this is a final release, link the rm stable ln -s 3.7.0 stable -You will also need to edit :file:`sitemap.xml` and :file:`versions.html` to include +You will also need to edit :file:`sitemap.xml` to include the newly released version. Now commit and push everything to GitHub :: git add * @@ -465,6 +465,14 @@ If you have access, clear the CloudFlare caches. It typically takes about 5-10 minutes for the website to process the push and update the live web page (remember to clear your browser cache). +Update the version switcher +--------------------------- +The version switcher is populated from https://matplotlib.org/devdocs/_static/switcher.json. + +Since it's always taken from devdocs, update the file :file:`doc/_static/switcher.json` +on the main branch through a regular PR. Once that PR is merged, the devdocs site +will be updated automatically. + .. _release_merge_up: Merge up changes to main From 0541d6d80a4eb4be2aecb2ef6d21d03037654bdc Mon Sep 17 00:00:00 2001 From: David Stansby Date: Tue, 13 May 2025 21:50:01 +0100 Subject: [PATCH 040/161] Add other option for colormap retrieval Co-authored-by: hannah --- doc/api/next_api_changes/removals/30005-DS.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/next_api_changes/removals/30005-DS.rst b/doc/api/next_api_changes/removals/30005-DS.rst index 9ca4eefc8da7..a5ba482c848f 100644 --- a/doc/api/next_api_changes/removals/30005-DS.rst +++ b/doc/api/next_api_changes/removals/30005-DS.rst @@ -5,7 +5,7 @@ Colormaps are now available through the `.ColormapRegistry` accessible via `matplotlib.colormaps` or `matplotlib.pyplot.colormaps`. If you have the name of a colormap as a string, you can use a direct lookup, -``matplotlib.colormaps[name]``. Alternatively, ``matplotlib.colormaps.get_cmap`` will +``matplotlib.colormaps[name]`` or ``matplotlib.pyplot.colormaps[name]`` . Alternatively, ``matplotlib.colormaps.get_cmap`` will maintain the existing behavior of additionally passing through `.Colormap` instances and converting ``None`` to the default colormap. `matplotlib.pyplot.get_cmap` will stay as a shortcut to ``matplotlib.colormaps.get_cmap``. From 4865f97e812e6bb7c0309c389ed6e4377af93a54 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Tue, 13 May 2025 23:56:27 +0200 Subject: [PATCH 041/161] DOC: Additional tip to exclude undesired matches in GitHub code search Follow-up to #29620. --- doc/devel/api_changes.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/devel/api_changes.rst b/doc/devel/api_changes.rst index 61467f99f0c5..19bc530abf6b 100644 --- a/doc/devel/api_changes.rst +++ b/doc/devel/api_changes.rst @@ -67,6 +67,10 @@ have to learn new API and have to modify existing code). You can start simple and look at the search results, if there are too many incorrect matches, gradually refine your search criteria. + It can also be helpful to add ``NOT path:**/matplotlib/** NOT path:**/site-packages/**`` + to exclude matches where the matplotlib codebase is checked into another repo, + either as direct sources or as part of an environment. + *Example*: Calls of the method ``Figure.draw()`` could be matched using ``/\bfig(ure)?\.draw\(/``. This expression employs a number of patterns: From 114b0aff1ae2018131be866bb638072e8e21d6f9 Mon Sep 17 00:00:00 2001 From: hannah Date: Tue, 13 May 2025 17:15:31 -0400 Subject: [PATCH 042/161] consolidate version switcher guideance Merged #30048 then saw that guidance for the version switcher was already in the release guide so consolidating it here. --- doc/devel/release_guide.rst | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/doc/devel/release_guide.rst b/doc/devel/release_guide.rst index 0ca3c06084d9..51505539cf34 100644 --- a/doc/devel/release_guide.rst +++ b/doc/devel/release_guide.rst @@ -233,15 +233,23 @@ Update :file:`doc/users/release_notes.rst`: ../api/prev_api_changes/api_changes_X.Y.Z.rst prev_whats_new/github_stats_X.Y.Z.rst +.. _update-version-switcher: + Update version switcher -^^^^^^^^^^^^^^^^^^^^^^^ +----------------------- + +The version switcher is populated from https://matplotlib.org/devdocs/_static/switcher.json. + +Since it's always taken from devdocs, update the file :file:`doc/_static/switcher.json` +on the main branch through a regular PR: -Update ``doc/_static/switcher.json``: +- If a micro release, update the version from :samp:`{X}.{Y}.{Z-1}` to :samp:`{X}.{Y}.{Z}` +- If a meso release :samp:`{X}.{Y}.0`: + + update the dev entry to :samp:`name: {X}.{Y+1} (dev)` + + update the stable entry to :samp:`name: {X}.{Y} (stable)` + + add a new entry for the previous stable (:samp:`name: {X}.{Y-1}`). -- If a micro release, :samp:`{X}.{Y}.{Z}`, no changes are needed. -- If a meso release, :samp:`{X}.{Y}.0`, change the name of :samp:`name: {X}.{Y+1} (dev)` - and :samp:`name: {X}.{Y} (stable)` as well as adding a new version for the previous - stable (:samp:`name: {X}.{Y-1}`). +Once that PR is merged, the devdocs site will be updated automatically. Verify that docs build ---------------------- @@ -465,13 +473,7 @@ If you have access, clear the CloudFlare caches. It typically takes about 5-10 minutes for the website to process the push and update the live web page (remember to clear your browser cache). -Update the version switcher ---------------------------- -The version switcher is populated from https://matplotlib.org/devdocs/_static/switcher.json. - -Since it's always taken from devdocs, update the file :file:`doc/_static/switcher.json` -on the main branch through a regular PR. Once that PR is merged, the devdocs site -will be updated automatically. +Remember to :ref:`update the version switcher `! .. _release_merge_up: From 85f1ee16249eb9888b77f30fc9ea8f1a96d963a5 Mon Sep 17 00:00:00 2001 From: hannah Date: Tue, 13 May 2025 21:48:14 -0400 Subject: [PATCH 043/161] Update doc/devel/release_guide.rst Co-authored-by: Elliott Sales de Andrade --- doc/devel/release_guide.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/devel/release_guide.rst b/doc/devel/release_guide.rst index 51505539cf34..6c45bfa56c64 100644 --- a/doc/devel/release_guide.rst +++ b/doc/devel/release_guide.rst @@ -245,6 +245,7 @@ on the main branch through a regular PR: - If a micro release, update the version from :samp:`{X}.{Y}.{Z-1}` to :samp:`{X}.{Y}.{Z}` - If a meso release :samp:`{X}.{Y}.0`: + + update the dev entry to :samp:`name: {X}.{Y+1} (dev)` + update the stable entry to :samp:`name: {X}.{Y} (stable)` + add a new entry for the previous stable (:samp:`name: {X}.{Y-1}`). From 297f35ff9492e73baadbcfced32801e20c1a4858 Mon Sep 17 00:00:00 2001 From: "Albert Y. Shih" Date: Thu, 15 May 2025 01:23:46 -0400 Subject: [PATCH 044/161] Rename a file to remove a leading space --- .../next_api_changes/deprecations/{ 29529-TH.rst => 29529-TH.rst} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/api/next_api_changes/deprecations/{ 29529-TH.rst => 29529-TH.rst} (100%) diff --git a/doc/api/next_api_changes/deprecations/ 29529-TH.rst b/doc/api/next_api_changes/deprecations/29529-TH.rst similarity index 100% rename from doc/api/next_api_changes/deprecations/ 29529-TH.rst rename to doc/api/next_api_changes/deprecations/29529-TH.rst From 20bdd72d3cb9a4a93657091d80fdeb9d0089609c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?In=C3=AAs=20Cachola?= Date: Thu, 15 May 2025 10:54:54 +0100 Subject: [PATCH 045/161] Don't override errorbar caps with 'lines.markeredgecolor' rcParam (#29895) * Fix #29780 : color of errorbar caps affected by markeredgecolor To solve this, we needed to ensure that the caps would use the specified ecolor independently of the global mpl.rcParams['lines.markeredgecolor']. This was achieved by setting the marker edge color for the caps separately, rather than relying on the global configuration. * Taking whitespaces * Update lib/matplotlib/tests/test_axes.py * Update lib/matplotlib/tests/test_axes.py Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> * Alteration of the tests --------- Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> --- lib/matplotlib/axes/_axes.py | 2 +- lib/matplotlib/tests/test_axes.py | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py index 285eab153ecc..e480f8f29598 100644 --- a/lib/matplotlib/axes/_axes.py +++ b/lib/matplotlib/axes/_axes.py @@ -3739,7 +3739,7 @@ def _upcast_err(err): 'zorder', 'rasterized'): if key in kwargs: eb_cap_style[key] = kwargs[key] - eb_cap_style['color'] = ecolor + eb_cap_style["markeredgecolor"] = ecolor barcols = [] caplines = {'x': [], 'y': []} diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py index 5d11964cb613..9ac63239d483 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -9741,6 +9741,34 @@ def test_bar_shape_mismatch(): plt.bar(x, height) +def test_caps_color(): + + # Creates a simple plot with error bars and a specified ecolor + x = np.linspace(0, 10, 10) + mpl.rcParams['lines.markeredgecolor'] = 'green' + ecolor = 'red' + + fig, ax = plt.subplots() + errorbars = ax.errorbar(x, np.sin(x), yerr=0.1, ecolor=ecolor) + + # Tests if the caps have the specified color + for cap in errorbars[2]: + assert mcolors.same_color(cap.get_edgecolor(), ecolor) + + +def test_caps_no_ecolor(): + + # Creates a simple plot with error bars without specifying ecolor + x = np.linspace(0, 10, 10) + mpl.rcParams['lines.markeredgecolor'] = 'green' + fig, ax = plt.subplots() + errorbars = ax.errorbar(x, np.sin(x), yerr=0.1) + + # Tests if the caps have the default color (blue) + for cap in errorbars[2]: + assert mcolors.same_color(cap.get_edgecolor(), "blue") + + def test_pie_non_finite_values(): fig, ax = plt.subplots() df = [5, float('nan'), float('inf')] From 2ace1d78c6f33a16d8aa7de2028307254d3a0001 Mon Sep 17 00:00:00 2001 From: "Albert Y. Shih" Date: Wed, 14 May 2025 13:34:10 -0400 Subject: [PATCH 046/161] Fix an off-by-half-pixel bug when resampling under a nonaffine transform --- lib/matplotlib/tests/test_image.py | 39 ++++++++++++++++++++++++++++-- src/_image_wrapper.cpp | 8 +++--- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py index cededdb1b83c..c12a79bc2011 100644 --- a/lib/matplotlib/tests/test_image.py +++ b/lib/matplotlib/tests/test_image.py @@ -9,7 +9,7 @@ import urllib.request import numpy as np -from numpy.testing import assert_array_equal +from numpy.testing import assert_allclose, assert_array_equal from PIL import Image import matplotlib as mpl @@ -18,7 +18,7 @@ from matplotlib.image import (AxesImage, BboxImage, FigureImage, NonUniformImage, PcolorImage) from matplotlib.testing.decorators import check_figures_equal, image_comparison -from matplotlib.transforms import Bbox, Affine2D, TransformedBbox +from matplotlib.transforms import Bbox, Affine2D, Transform, TransformedBbox import matplotlib.ticker as mticker import pytest @@ -1641,6 +1641,41 @@ def test__resample_valid_output(): resample(np.zeros((9, 9)), out) +@pytest.mark.parametrize("data, interpolation, expected", + [(np.array([[0.1, 0.3, 0.2]]), mimage.NEAREST, + np.array([[0.1, 0.1, 0.1, 0.3, 0.3, 0.3, 0.3, 0.2, 0.2, 0.2]])), + (np.array([[0.1, 0.3, 0.2]]), mimage.BILINEAR, + np.array([[0.1, 0.1, 0.15078125, 0.21096191, 0.27033691, + 0.28476562, 0.2546875, 0.22460938, 0.20002441, 0.20002441]])), + ] +) +def test_resample_nonaffine(data, interpolation, expected): + # Test that equivalent affine and nonaffine transforms resample the same + + # Create a simple affine transform for scaling the input array + affine_transform = Affine2D().scale(sx=expected.shape[1] / data.shape[1], sy=1) + + affine_result = np.empty_like(expected) + mimage.resample(data, affine_result, affine_transform, + interpolation=interpolation) + assert_allclose(affine_result, expected) + + # Create a nonaffine version of the same transform + # by compositing with a nonaffine identity transform + class NonAffineIdentityTransform(Transform): + input_dims = 2 + output_dims = 2 + + def inverted(self): + return self + nonaffine_transform = NonAffineIdentityTransform() + affine_transform + + nonaffine_result = np.empty_like(expected) + mimage.resample(data, nonaffine_result, nonaffine_transform, + interpolation=interpolation) + assert_allclose(nonaffine_result, expected, atol=5e-3) + + def test_axesimage_get_shape(): # generate dummy image to test get_shape method ax = plt.gca() diff --git a/src/_image_wrapper.cpp b/src/_image_wrapper.cpp index 0f7b0da88de8..87d2b3b288ec 100644 --- a/src/_image_wrapper.cpp +++ b/src/_image_wrapper.cpp @@ -54,7 +54,7 @@ _get_transform_mesh(const py::object& transform, const py::ssize_t *dims) /* TODO: Could we get away with float, rather than double, arrays here? */ /* Given a non-affine transform object, create a mesh that maps - every pixel in the output image to the input image. This is used + every pixel center in the output image to the input image. This is used as a lookup table during the actual resampling. */ // If attribute doesn't exist, raises Python AttributeError @@ -66,8 +66,10 @@ _get_transform_mesh(const py::object& transform, const py::ssize_t *dims) for (auto y = 0; y < dims[0]; ++y) { for (auto x = 0; x < dims[1]; ++x) { - *p++ = (double)x; - *p++ = (double)y; + // The convention for the supplied transform is that pixel centers + // are at 0.5, 1.5, 2.5, etc. + *p++ = (double)x + 0.5; + *p++ = (double)y + 0.5; } } From 77bdca4c5148ac6ccf55acc6635ebf147ec28213 Mon Sep 17 00:00:00 2001 From: "Albert Y. Shih" Date: Wed, 14 May 2025 21:05:39 -0400 Subject: [PATCH 047/161] Updated affected baseline images --- .../test_image/log_scale_image.pdf | Bin 3780 -> 3776 bytes .../test_image/log_scale_image.png | Bin 7914 -> 7942 bytes .../test_image/log_scale_image.svg | 163 ++++++++++-------- 3 files changed, 87 insertions(+), 76 deletions(-) diff --git a/lib/matplotlib/tests/baseline_images/test_image/log_scale_image.pdf b/lib/matplotlib/tests/baseline_images/test_image/log_scale_image.pdf index b338fce6ee5ae825276f7705483805cb5bb26b31..c2641985025135cf6a050c8f49b3429c3939333b 100644 GIT binary patch delta 1737 zcmb_b{ZCU@7#3$KLaB!#8wJ{Xdjautjt|ojptSS|Q<%g}P}I(-N0?KG=qy$VQvZU2BJ8k3WgllPqWeV_Mv zp3|W|qyC+daf!O%$)iJY&mL$VKZs^_)DL;i22J4&2sh_HNtLo4%`8-*n4Vdt=Ub*XDhDE&uB)3)XiRuIpa3+PS2}xpe7@ zi_0`W;3bX~3p-a8bQaI=_~MhZYjV%7%{lWGl$~0ib*jv|Byf6AQv=i7pxL+0+8k)( zEAQ;ysP1|?K`3mVv!gFXCp7&rOHp)i26wb~LD0GB$2@<(SeSpWQk~-(ejfB&=H0GM z=AkF)eE*ZcF=IwDdkm<@gi5q_#)QfZ=zZ2+uC>=`?b84W2Sf)*0j8@loq}l`w5Yg> zAg*l!R}sSL6S>xfTKis>w@W$0?1n3@!qmKO1JW7L5NkheK*vmINNcYLWE7BiOcOC3 z2gL{|YN5zNQK}ZjdEevGWP-ZRp|8f}Er=S~)|G(l1!NeIb%0y~q!AECYtJ+wSJvQ9 z36`?m>GH5wt-{lkxt*!eHn&0;<;QW}XqdM@t~CUZc0ek?(b)Y?eXT=ZgKZ~Jo`f?N zkUM}}_s=pJ=7l790;-++Yp}_ji zicxUwr;|KW8Jk-sxI+c=Ry-veiApGrfeoqgt;>u^qW*g$lD9wKa&Bdp)@}u47a)fL z3BxoQ(+Esce3V%tIByh}7A$0p4a;vqVkkUmWIb+vvT9jn6OjZ8@iAFIoRZB-5&&6+sbuwE0Pz4)>NkHGrkQ|@ z$8@95`JxPpX_)3>IuVL~8(XG9QMxL^JPm@P6rBM@mCxKA*~O(M)NepX42a+Cm}i1( zkrd09G&Z0KS?F|?L-~()zN9_rHoc`G6^Vj@MaFD%4|>b=EtIodL6~WuZ?3Qmo6B;nI1NGJCvE7aSiy IJ3l-4KQE?xkpKVy delta 1717 zcmb_beM}Q)7^gB?D6||zq9$R#FfY}gU6=f5Z9g$)IVT&isxSVbsu*2-n{m0(CdGaPto;<&= z_lmYldmax;)nzDCrzet#=Ef%v<0l`+jg4x2qnhDS%^hFtZC_lUFaGK?u9g-2xc#y> z#pMdpFaN9_|Ja$}KJ?c(cs@>ww6Fxe)|91Wdw+pI%TJIv|iz17<-`Ut*TG;jOx*y8(u2`v# zU9R==w9rrM@iUHu6Nd=4(dCf4>7BTDx3}nM|9Sg?WSU!v7;>eL-?Tu!O&Z7eNLRg+I$M|8AOT_pB za>N$pw$!0~BRo!UeFWD-a0Mi{8{_YuYP-=&`Orp-#B#oBS zEsZ(BFuuCE^2@c|9fdki2+)VK(-`n*fj@(~e-5+_NP>~vMY804nA=i=ymsVuGVaUJ z776xY;Fz_UU(5&*jF3i&(()kc?BnFNDq;?IAjY4>_#%v#F~U;H76h8Ik+1{*qw?|Z zmk#xwvZHh}4Nse4nM9P}`d?_4U5m2oP`arLrRnrCR_jEQ^~`o3w1ok^WM?2dq>9-5 zC;BDpwbHMRFsBwx)}UesvP!nqp_wptXaRfDi8>?>(m*g<9S!_}lr51G!zfYD2%9m! zALA>Ce?3p3Ngdkqc6domK&V2qnHk z*`g^inX+ZQa43@!!x?!`bh3ABRpb)$H}=w zEg`rG0!Sf}+=~Z(Iu`gB0>6YzO^Gj4Vl*S{paafn^$K>iEaC#oM=^qoVGj3B+L77} zt4#2siFyy(0)Sr$JZeyqn3$=XN1^94{6Ean^Ta=22=u(voA35aUHpH0_cZ5`VN&6` y6sBFETj?4IYn82Z?Nm)gtss`p9l}Z|Up$sBTef_qt5TgCvLZvdc=4KoT;)F&V3u+K diff --git a/lib/matplotlib/tests/baseline_images/test_image/log_scale_image.png b/lib/matplotlib/tests/baseline_images/test_image/log_scale_image.png index 9d93c8fb00bfa8154ba15559c2ff83003f494efb..1df80c1b2045d77a8cba3bb4834c9c151aae7526 100644 GIT binary patch literal 7942 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 zd430$�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 - - + + + + + + 2025-05-14T18:02:41.587512 + image/svg+xml + + + Matplotlib v3.11.0.dev832+gc5ea66e278, https://matplotlib.org/ + + + + + - + @@ -15,7 +26,7 @@ L 576 432 L 576 0 L 0 0 z -" style="fill:#ffffff;"/> +" style="fill: #ffffff"/> @@ -24,100 +35,100 @@ L 518.4 388.8 L 518.4 43.2 L 72 43.2 z -" style="fill:#ffffff;"/> +" style="fill: #ffffff"/> - - + + +" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/> - +" style="stroke: #000000; stroke-width: 0.5"/> - + - +" style="stroke: #000000; stroke-width: 0.5"/> - + - + - + - + - + - + - + - + - + @@ -126,248 +137,248 @@ L 0 4 - +" style="stroke: #000000; stroke-width: 0.5"/> - + - +" style="stroke: #000000; stroke-width: 0.5"/> - + - + - + - + - + - +" style="stroke: #000000; stroke-width: 0.5"/> - + - +" style="stroke: #000000; stroke-width: 0.5"/> - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -375,8 +386,8 @@ L -2 0 - - + + From 0d8449f9a1bf5fc3738e7945caeaebe5cf2faca2 Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Sun, 18 May 2025 00:46:52 -0600 Subject: [PATCH 048/161] ENH: Add Petroff 6 and 8 color cycle style sheets * Add the 6 color and the 8 color Petroff color cycles from Matthew A. Petroff, Accessible Color Sequences for Data Visualization https://arxiv.org/abs/2107.02270. The 10 color cycle was added in PR 27851 which landed in Matplotlib v3.10.0. --- lib/matplotlib/_cm.py | 23 +++++++++++++++++++ lib/matplotlib/colors.py | 2 ++ .../mpl-data/stylelib/petroff6.mplstyle | 5 ++++ .../mpl-data/stylelib/petroff8.mplstyle | 5 ++++ 4 files changed, 35 insertions(+) create mode 100644 lib/matplotlib/mpl-data/stylelib/petroff6.mplstyle create mode 100644 lib/matplotlib/mpl-data/stylelib/petroff8.mplstyle diff --git a/lib/matplotlib/_cm.py b/lib/matplotlib/_cm.py index b942d1697934..d3f4632108a8 100644 --- a/lib/matplotlib/_cm.py +++ b/lib/matplotlib/_cm.py @@ -1365,6 +1365,29 @@ def _gist_yarg(x): return 1 - x (0.8509803921568627, 0.8509803921568627, 0.8509803921568627 ), # d9d9d9 ) +# Colorblind accessible palettes from +# Matthew A. Petroff, Accessible Color Sequences for Data Visualization +# https://arxiv.org/abs/2107.02270 + +_petroff6_data = ( + (0.3411764705882353, 0.5647058823529412, 0.9882352941176471), # 5790fc + (0.9725490196078431, 0.611764705882353, 0.12549019607843137), # f89c20 + (0.8941176470588236, 0.1450980392156863, 0.21176470588235294), # e42536 + (0.5882352941176471, 0.2901960784313726, 0.5450980392156862), # 964a8b + (0.611764705882353, 0.611764705882353, 0.6313725490196078), # 9c9ca1 + (0.47843137254901963, 0.12941176470588237, 0.8666666666666667), # 7a21dd +) + +_petroff8_data = ( + (0.09411764705882353, 0.27058823529411763, 0.984313725490196), # 1845fb + (1.0, 0.3686274509803922, 0.00784313725490196), # ff5e02 + (0.788235294117647, 0.12156862745098039, 0.08627450980392157), # c91f16 + (0.7843137254901961, 0.28627450980392155, 0.6627450980392157), # c849a9 + (0.6784313725490196, 0.6784313725490196, 0.49019607843137253), # adad7d + (0.5254901960784314, 0.7843137254901961, 0.8666666666666667), # 86c8dd + (0.3411764705882353, 0.5529411764705883, 1.0), # 578dff + (0.396078431372549, 0.38823529411764707, 0.39215686274509803), # 656364 +) _petroff10_data = ( (0.24705882352941178, 0.5647058823529412, 0.8549019607843137), # 3f90da diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py index 9bd808074c1f..d6636e0e8669 100644 --- a/lib/matplotlib/colors.py +++ b/lib/matplotlib/colors.py @@ -131,6 +131,8 @@ class ColorSequenceRegistry(Mapping): 'Set1': _cm._Set1_data, 'Set2': _cm._Set2_data, 'Set3': _cm._Set3_data, + 'petroff6': _cm._petroff6_data, + 'petroff8': _cm._petroff8_data, 'petroff10': _cm._petroff10_data, } diff --git a/lib/matplotlib/mpl-data/stylelib/petroff6.mplstyle b/lib/matplotlib/mpl-data/stylelib/petroff6.mplstyle new file mode 100644 index 000000000000..ff227eba45ba --- /dev/null +++ b/lib/matplotlib/mpl-data/stylelib/petroff6.mplstyle @@ -0,0 +1,5 @@ +# Color cycle survey palette from Petroff (2021): +# https://arxiv.org/abs/2107.02270 +# https://github.com/mpetroff/accessible-color-cycles +axes.prop_cycle: cycler('color', ['5790fc', 'f89c20', 'e42536', '964a8b', '9c9ca1', '7a21dd']) +patch.facecolor: 5790fc diff --git a/lib/matplotlib/mpl-data/stylelib/petroff8.mplstyle b/lib/matplotlib/mpl-data/stylelib/petroff8.mplstyle new file mode 100644 index 000000000000..0228f736ddea --- /dev/null +++ b/lib/matplotlib/mpl-data/stylelib/petroff8.mplstyle @@ -0,0 +1,5 @@ +# Color cycle survey palette from Petroff (2021): +# https://arxiv.org/abs/2107.02270 +# https://github.com/mpetroff/accessible-color-cycles +axes.prop_cycle: cycler('color', ['1845fb', 'ff5e02', 'c91f16', 'c849a9', 'adad7d', '86c8dd', '578dff', '656364']) +patch.facecolor: 1845fb From 324e7f9cade5abbc873d798c6114f4275592f506 Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Sun, 18 May 2025 01:09:29 -0600 Subject: [PATCH 049/161] TST: Add 6 and 8 color Petroff color sequences to tests * Verify they appear in plt.color_sequences. --- lib/matplotlib/tests/test_colors.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py index 8d0f3467f045..df3f65bdb2dc 100644 --- a/lib/matplotlib/tests/test_colors.py +++ b/lib/matplotlib/tests/test_colors.py @@ -1704,7 +1704,8 @@ def test_color_sequences(): assert plt.color_sequences is matplotlib.color_sequences # same registry assert list(plt.color_sequences) == [ 'tab10', 'tab20', 'tab20b', 'tab20c', 'Pastel1', 'Pastel2', 'Paired', - 'Accent', 'Dark2', 'Set1', 'Set2', 'Set3', 'petroff10'] + 'Accent', 'Dark2', 'Set1', 'Set2', 'Set3', 'petroff6', 'petroff8', + 'petroff10'] assert len(plt.color_sequences['tab10']) == 10 assert len(plt.color_sequences['tab20']) == 20 From b89e4ced8cbbe9df7556c05c1d5014f86a2f299c Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Sun, 18 May 2025 01:21:11 -0600 Subject: [PATCH 050/161] DOC: Add 'What's New' entry for 6 and 8 Petorff color cycles * Note the addition of 'petroff6' and 'petroff8' and give an example of how to load them. --- ...x_and_eight_color_petroff_color_cycles.rst | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 doc/users/next_whats_new/six_and_eight_color_petroff_color_cycles.rst diff --git a/doc/users/next_whats_new/six_and_eight_color_petroff_color_cycles.rst b/doc/users/next_whats_new/six_and_eight_color_petroff_color_cycles.rst new file mode 100644 index 000000000000..3b17b4f68868 --- /dev/null +++ b/doc/users/next_whats_new/six_and_eight_color_petroff_color_cycles.rst @@ -0,0 +1,21 @@ +Six and eight color Petroff color cycles +---------------------------------------- + +The six and eight color accessible Petroff color cycles are named 'petroff6' and +'petroff8'. +They compliment the existing 'petroff10' color cycle, added in `Matplotlib 3.10.0`_ + +For more details see +`Petroff, M. A.: "Accessible Color Sequences for Data Visualization" +`_. +To load the 'petroff6' color cycle in place of the default:: + + import matplotlib.pyplot as plt + plt.style.use('petroff6') + +or to load the 'petroff8' color cycle:: + + import matplotlib.pyplot as plt + plt.style.use('petroff8') + +.. _Matplotlib 3.10.0: https://matplotlib.org/stable/users/prev_whats_new/whats_new_3.10.0.html#new-more-accessible-color-cycle From e1cf428fd1a06b731fa2cc895d3d147399d39d21 Mon Sep 17 00:00:00 2001 From: David Stansby Date: Sun, 18 May 2025 10:51:17 +0100 Subject: [PATCH 051/161] Remove get_bbox_header --- doc/api/next_api_changes/removals/xxxxxx-DS.rst | 4 ++++ lib/matplotlib/backends/backend_ps.py | 9 --------- 2 files changed, 4 insertions(+), 9 deletions(-) create mode 100644 doc/api/next_api_changes/removals/xxxxxx-DS.rst diff --git a/doc/api/next_api_changes/removals/xxxxxx-DS.rst b/doc/api/next_api_changes/removals/xxxxxx-DS.rst new file mode 100644 index 000000000000..8ae7919afa31 --- /dev/null +++ b/doc/api/next_api_changes/removals/xxxxxx-DS.rst @@ -0,0 +1,4 @@ +``backend_ps.get_bbox_header`` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +... is removed, as it is considered an internal helper. diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py index 62952caa32e1..c1f4348016bb 100644 --- a/lib/matplotlib/backends/backend_ps.py +++ b/lib/matplotlib/backends/backend_ps.py @@ -1362,15 +1362,6 @@ def xpdf_distill(tmpfile, eps=False, ptype='letter', bbox=None, rotated=False): pstoeps(tmpfile) -@_api.deprecated("3.9") -def get_bbox_header(lbrt, rotated=False): - """ - Return a postscript header string for the given bbox lbrt=(l, b, r, t). - Optionally, return rotate command. - """ - return _get_bbox_header(lbrt), (_get_rotate_command(lbrt) if rotated else "") - - def _get_bbox_header(lbrt): """Return a PostScript header string for bounding box *lbrt*=(l, b, r, t).""" l, b, r, t = lbrt From 67b4202058dd8e76d7376765a054ae1d89cb27b4 Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Mon, 12 May 2025 20:08:56 +0200 Subject: [PATCH 052/161] Replace FT2Image by plain numpy arrays. --- .../deprecations/30044-AL.rst | 12 ++++ lib/matplotlib/_mathtext.py | 14 +++-- lib/matplotlib/ft2font.pyi | 2 +- lib/matplotlib/tests/test_ft2font.py | 5 +- src/ft2font.cpp | 59 ++++++------------- src/ft2font.h | 13 ++-- src/ft2font_wrapper.cpp | 46 +++++++++------ 7 files changed, 78 insertions(+), 73 deletions(-) create mode 100644 doc/api/next_api_changes/deprecations/30044-AL.rst diff --git a/doc/api/next_api_changes/deprecations/30044-AL.rst b/doc/api/next_api_changes/deprecations/30044-AL.rst new file mode 100644 index 000000000000..e004d5f2730f --- /dev/null +++ b/doc/api/next_api_changes/deprecations/30044-AL.rst @@ -0,0 +1,12 @@ +``FT2Image`` +~~~~~~~~~~~~ +... is deprecated. Use 2D uint8 ndarrays instead. In particular: + +- The ``FT2Image`` constructor took ``width, height`` as separate parameters + but the ndarray constructor takes ``(height, width)`` as single tuple + parameter. +- `.FT2Font.draw_glyph_to_bitmap` now (also) takes 2D uint8 arrays as input. +- ``FT2Image.draw_rect_filled`` should be replaced by directly setting pixel + values to black. +- The ``image`` attribute of the object returned by ``MathTextParser("agg").parse`` + is now a 2D uint8 array. diff --git a/lib/matplotlib/_mathtext.py b/lib/matplotlib/_mathtext.py index 3739a517978b..a528a65ca3cb 100644 --- a/lib/matplotlib/_mathtext.py +++ b/lib/matplotlib/_mathtext.py @@ -9,6 +9,7 @@ import enum import functools import logging +import math import os import re import types @@ -19,6 +20,7 @@ from typing import NamedTuple import numpy as np +from numpy.typing import NDArray from pyparsing import ( Empty, Forward, Literal, Group, NotAny, OneOrMore, Optional, ParseBaseException, ParseException, ParseExpression, ParseFatalException, @@ -30,7 +32,7 @@ from ._mathtext_data import ( latex_to_bakoma, stix_glyph_fixes, stix_virtual_fonts, tex2uni) from .font_manager import FontProperties, findfont, get_font -from .ft2font import FT2Font, FT2Image, Kerning, LoadFlags +from .ft2font import FT2Font, Kerning, LoadFlags if T.TYPE_CHECKING: @@ -99,7 +101,7 @@ class RasterParse(NamedTuple): The offsets are always zero. width, height, depth : float The global metrics. - image : FT2Image + image : 2D array of uint8 A raster image. """ ox: float @@ -107,7 +109,7 @@ class RasterParse(NamedTuple): width: float height: float depth: float - image: FT2Image + image: NDArray[np.uint8] RasterParse.__module__ = "matplotlib.mathtext" @@ -148,7 +150,7 @@ def to_raster(self, *, antialiased: bool) -> RasterParse: w = xmax - xmin h = ymax - ymin - self.box.depth d = ymax - ymin - self.box.height - image = FT2Image(int(np.ceil(w)), int(np.ceil(h + max(d, 0)))) + image = np.zeros((math.ceil(h + max(d, 0)), math.ceil(w)), np.uint8) # Ideally, we could just use self.glyphs and self.rects here, shifting # their coordinates by (-xmin, -ymin), but this yields slightly @@ -167,7 +169,9 @@ def to_raster(self, *, antialiased: bool) -> RasterParse: y = int(center - (height + 1) / 2) else: y = int(y1) - image.draw_rect_filled(int(x1), y, int(np.ceil(x2)), y + height) + x1 = math.floor(x1) + x2 = math.ceil(x2) + image[y:y+height+1, x1:x2+1] = 0xff return RasterParse(0, 0, w, h + d, d, image) diff --git a/lib/matplotlib/ft2font.pyi b/lib/matplotlib/ft2font.pyi index b12710afd801..a413cd3c1a76 100644 --- a/lib/matplotlib/ft2font.pyi +++ b/lib/matplotlib/ft2font.pyi @@ -198,7 +198,7 @@ class FT2Font(Buffer): def _get_fontmap(self, string: str) -> dict[str, FT2Font]: ... def clear(self) -> None: ... def draw_glyph_to_bitmap( - self, image: FT2Image, x: int, y: int, glyph: Glyph, antialiased: bool = ... + self, image: NDArray[np.uint8], x: int, y: int, glyph: Glyph, antialiased: bool = ... ) -> None: ... def draw_glyphs_to_bitmap(self, antialiased: bool = ...) -> None: ... def get_bitmap_offset(self) -> tuple[int, int]: ... diff --git a/lib/matplotlib/tests/test_ft2font.py b/lib/matplotlib/tests/test_ft2font.py index a9f2a56658aa..8b448e17b7fd 100644 --- a/lib/matplotlib/tests/test_ft2font.py +++ b/lib/matplotlib/tests/test_ft2font.py @@ -18,7 +18,8 @@ def test_ft2image_draw_rect_filled(): width = 23 height = 42 for x0, y0, x1, y1 in itertools.product([1, 100], [2, 200], [4, 400], [8, 800]): - im = ft2font.FT2Image(width, height) + with pytest.warns(mpl.MatplotlibDeprecationWarning): + im = ft2font.FT2Image(width, height) im.draw_rect_filled(x0, y0, x1, y1) a = np.asarray(im) assert a.dtype == np.uint8 @@ -823,7 +824,7 @@ def test_ft2font_drawing(): np.testing.assert_array_equal(image, expected) font = ft2font.FT2Font(file, hinting_factor=1, _kerning_factor=0) glyph = font.load_char(ord('M')) - image = ft2font.FT2Image(expected.shape[1], expected.shape[0]) + image = np.zeros(expected.shape, np.uint8) font.draw_glyph_to_bitmap(image, -1, 1, glyph, antialiased=False) np.testing.assert_array_equal(image, expected) diff --git a/src/ft2font.cpp b/src/ft2font.cpp index 94c554cf9f63..b2c2c0fa9bd1 100644 --- a/src/ft2font.cpp +++ b/src/ft2font.cpp @@ -63,51 +63,23 @@ void throw_ft_error(std::string message, FT_Error error) { throw std::runtime_error(os.str()); } -FT2Image::FT2Image() : m_buffer(nullptr), m_width(0), m_height(0) -{ -} - FT2Image::FT2Image(unsigned long width, unsigned long height) - : m_buffer(nullptr), m_width(0), m_height(0) + : m_buffer((unsigned char *)calloc(width * height, 1)), m_width(width), m_height(height) { - resize(width, height); } FT2Image::~FT2Image() { - delete[] m_buffer; + free(m_buffer); } -void FT2Image::resize(long width, long height) +void draw_bitmap( + py::array_t im, FT_Bitmap *bitmap, FT_Int x, FT_Int y) { - if (width <= 0) { - width = 1; - } - if (height <= 0) { - height = 1; - } - size_t numBytes = width * height; - - if ((unsigned long)width != m_width || (unsigned long)height != m_height) { - if (numBytes > m_width * m_height) { - delete[] m_buffer; - m_buffer = nullptr; - m_buffer = new unsigned char[numBytes]; - } + auto buf = im.mutable_data(0); - m_width = (unsigned long)width; - m_height = (unsigned long)height; - } - - if (numBytes && m_buffer) { - memset(m_buffer, 0, numBytes); - } -} - -void FT2Image::draw_bitmap(FT_Bitmap *bitmap, FT_Int x, FT_Int y) -{ - FT_Int image_width = (FT_Int)m_width; - FT_Int image_height = (FT_Int)m_height; + FT_Int image_width = (FT_Int)im.shape(1); + FT_Int image_height = (FT_Int)im.shape(0); FT_Int char_width = bitmap->width; FT_Int char_height = bitmap->rows; @@ -121,14 +93,14 @@ void FT2Image::draw_bitmap(FT_Bitmap *bitmap, FT_Int x, FT_Int y) if (bitmap->pixel_mode == FT_PIXEL_MODE_GRAY) { for (FT_Int i = y1; i < y2; ++i) { - unsigned char *dst = m_buffer + (i * image_width + x1); + unsigned char *dst = buf + (i * image_width + x1); unsigned char *src = bitmap->buffer + (((i - y_offset) * bitmap->pitch) + x_start); for (FT_Int j = x1; j < x2; ++j, ++dst, ++src) *dst |= *src; } } else if (bitmap->pixel_mode == FT_PIXEL_MODE_MONO) { for (FT_Int i = y1; i < y2; ++i) { - unsigned char *dst = m_buffer + (i * image_width + x1); + unsigned char *dst = buf + (i * image_width + x1); unsigned char *src = bitmap->buffer + ((i - y_offset) * bitmap->pitch); for (FT_Int j = x1; j < x2; ++j, ++dst) { int x = (j - x1 + x_start); @@ -259,7 +231,7 @@ FT2Font::FT2Font(FT_Open_Args &open_args, long hinting_factor_, std::vector &fallback_list, FT2Font::WarnFunc warn, bool warn_if_used) - : ft_glyph_warn(warn), warn_if_used(warn_if_used), image(), face(nullptr), + : ft_glyph_warn(warn), warn_if_used(warn_if_used), image({1, 1}), face(nullptr), hinting_factor(hinting_factor_), // set default kerning factor to 0, i.e., no kerning manipulation kerning_factor(0) @@ -676,7 +648,8 @@ void FT2Font::draw_glyphs_to_bitmap(bool antialiased) long width = (bbox.xMax - bbox.xMin) / 64 + 2; long height = (bbox.yMax - bbox.yMin) / 64 + 2; - image.resize(width, height); + image = py::array_t{{height, width}}; + std::memset(image.mutable_data(0), 0, image.nbytes()); for (auto & glyph : glyphs) { FT_Error error = FT_Glyph_To_Bitmap( @@ -692,11 +665,13 @@ void FT2Font::draw_glyphs_to_bitmap(bool antialiased) FT_Int x = (FT_Int)(bitmap->left - (bbox.xMin * (1. / 64.))); FT_Int y = (FT_Int)((bbox.yMax * (1. / 64.)) - bitmap->top + 1); - image.draw_bitmap(&bitmap->bitmap, x, y); + draw_bitmap(image, &bitmap->bitmap, x, y); } } -void FT2Font::draw_glyph_to_bitmap(FT2Image &im, int x, int y, size_t glyphInd, bool antialiased) +void FT2Font::draw_glyph_to_bitmap( + py::array_t im, + int x, int y, size_t glyphInd, bool antialiased) { FT_Vector sub_offset; sub_offset.x = 0; // int((xd - (double)x) * 64.0); @@ -718,7 +693,7 @@ void FT2Font::draw_glyph_to_bitmap(FT2Image &im, int x, int y, size_t glyphInd, FT_BitmapGlyph bitmap = (FT_BitmapGlyph)glyphs[glyphInd]; - im.draw_bitmap(&bitmap->bitmap, x + bitmap->left, y); + draw_bitmap(im, &bitmap->bitmap, x + bitmap->left, y); } void FT2Font::get_glyph_name(unsigned int glyph_number, std::string &buffer, diff --git a/src/ft2font.h b/src/ft2font.h index cb38e337157a..209581d8f362 100644 --- a/src/ft2font.h +++ b/src/ft2font.h @@ -22,6 +22,10 @@ extern "C" { #include FT_TRUETYPE_TABLES_H } +#include +#include +namespace py = pybind11; + /* By definition, FT_FIXED as 2 16bit values stored in a single long. */ @@ -32,7 +36,6 @@ extern "C" { class FT2Image { public: - FT2Image(); FT2Image(unsigned long width, unsigned long height); virtual ~FT2Image(); @@ -101,7 +104,9 @@ class FT2Font void get_bitmap_offset(long *x, long *y); long get_descent(); void draw_glyphs_to_bitmap(bool antialiased); - void draw_glyph_to_bitmap(FT2Image &im, int x, int y, size_t glyphInd, bool antialiased); + void draw_glyph_to_bitmap( + py::array_t im, + int x, int y, size_t glyphInd, bool antialiased); void get_glyph_name(unsigned int glyph_number, std::string &buffer, bool fallback); long get_name_index(char *name); FT_UInt get_char_index(FT_ULong charcode, bool fallback); @@ -113,7 +118,7 @@ class FT2Font return face; } - FT2Image &get_image() + py::array_t &get_image() { return image; } @@ -141,7 +146,7 @@ class FT2Font private: WarnFunc ft_glyph_warn; bool warn_if_used; - FT2Image image; + py::array_t image; FT_Face face; FT_Vector pen; /* untransformed origin */ std::vector glyphs; diff --git a/src/ft2font_wrapper.cpp b/src/ft2font_wrapper.cpp index 18f26ad4e76b..ca2db6aa0e5b 100644 --- a/src/ft2font_wrapper.cpp +++ b/src/ft2font_wrapper.cpp @@ -968,7 +968,7 @@ const char *PyFT2Font_draw_glyph_to_bitmap__doc__ = R"""( Parameters ---------- - image : FT2Image + image : 2d array of uint8 The image buffer on which to draw the glyph. x, y : int The pixel location at which to draw the glyph. @@ -983,14 +983,16 @@ const char *PyFT2Font_draw_glyph_to_bitmap__doc__ = R"""( )"""; static void -PyFT2Font_draw_glyph_to_bitmap(PyFT2Font *self, FT2Image &image, +PyFT2Font_draw_glyph_to_bitmap(PyFT2Font *self, py::buffer &image, double_or_ vxd, double_or_ vyd, PyGlyph *glyph, bool antialiased = true) { auto xd = _double_to_("x", vxd); auto yd = _double_to_("y", vyd); - self->x->draw_glyph_to_bitmap(image, xd, yd, glyph->glyphInd, antialiased); + self->x->draw_glyph_to_bitmap( + py::array_t{image}, + xd, yd, glyph->glyphInd, antialiased); } const char *PyFT2Font_get_glyph_name__doc__ = R"""( @@ -1440,12 +1442,7 @@ const char *PyFT2Font_get_image__doc__ = R"""( static py::array PyFT2Font_get_image(PyFT2Font *self) { - FT2Image &im = self->x->get_image(); - py::ssize_t dims[] = { - static_cast(im.get_height()), - static_cast(im.get_width()) - }; - return py::array_t(dims, im.get_buffer()); + return self->x->get_image(); } const char *PyFT2Font__get_type1_encoding_vector__doc__ = R"""( @@ -1565,6 +1562,10 @@ PYBIND11_MODULE(ft2font, m, py::mod_gil_not_used()) PyFT2Image__doc__) .def(py::init( [](double_or_ width, double_or_ height) { + auto warn = + py::module_::import("matplotlib._api").attr("warn_deprecated"); + warn("since"_a="3.11", "name"_a="FT2Image", "obj_type"_a="class", + "alternative"_a="a 2D uint8 ndarray"); return new FT2Image( _double_to_("width", width), _double_to_("height", height) @@ -1604,8 +1605,8 @@ PYBIND11_MODULE(ft2font, m, py::mod_gil_not_used()) .def_property_readonly("bbox", &PyGlyph_get_bbox, "The control box of the glyph."); - py::class_(m, "FT2Font", py::is_final(), py::buffer_protocol(), - PyFT2Font__doc__) + auto cls = py::class_(m, "FT2Font", py::is_final(), py::buffer_protocol(), + PyFT2Font__doc__) .def(py::init(&PyFT2Font_init), "filename"_a, "hinting_factor"_a=8, py::kw_only(), "_fallback_list"_a=py::none(), "_kerning_factor"_a=0, @@ -1639,10 +1640,20 @@ PYBIND11_MODULE(ft2font, m, py::mod_gil_not_used()) .def("get_descent", &PyFT2Font_get_descent, PyFT2Font_get_descent__doc__) .def("draw_glyphs_to_bitmap", &PyFT2Font_draw_glyphs_to_bitmap, py::kw_only(), "antialiased"_a=true, - PyFT2Font_draw_glyphs_to_bitmap__doc__) - .def("draw_glyph_to_bitmap", &PyFT2Font_draw_glyph_to_bitmap, - "image"_a, "x"_a, "y"_a, "glyph"_a, py::kw_only(), "antialiased"_a=true, - PyFT2Font_draw_glyph_to_bitmap__doc__) + PyFT2Font_draw_glyphs_to_bitmap__doc__); + // The generated docstring uses an unqualified "Buffer" as type hint, + // which causes an error in sphinx. This is fixed as of pybind11 + // master (since #5566) which now uses "collections.abc.Buffer"; + // restore the signature once that version is released. + { + py::options options{}; + options.disable_function_signatures(); + cls + .def("draw_glyph_to_bitmap", &PyFT2Font_draw_glyph_to_bitmap, + "image"_a, "x"_a, "y"_a, "glyph"_a, py::kw_only(), "antialiased"_a=true, + PyFT2Font_draw_glyph_to_bitmap__doc__); + } + cls .def("get_glyph_name", &PyFT2Font_get_glyph_name, "index"_a, PyFT2Font_get_glyph_name__doc__) .def("get_charmap", &PyFT2Font_get_charmap, PyFT2Font_get_charmap__doc__) @@ -1760,10 +1771,7 @@ PYBIND11_MODULE(ft2font, m, py::mod_gil_not_used()) "The original filename for this object.") .def_buffer([](PyFT2Font &self) -> py::buffer_info { - FT2Image &im = self.x->get_image(); - std::vector shape { im.get_height(), im.get_width() }; - std::vector strides { im.get_width(), 1 }; - return py::buffer_info(im.get_buffer(), shape, strides); + return self.x->get_image().request(); }); m.attr("__freetype_version__") = version_string; From 35c54819e8ff88d9882c12dfd0326b4f9c824f05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20P=C3=A9rez=20Robles?= <62659701+MiniX16@users.noreply.github.com> Date: Sun, 18 May 2025 14:59:24 +0200 Subject: [PATCH 053/161] test: add 3D scatter test for cmap update (#30062) --- lib/matplotlib/tests/test_collections.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/lib/matplotlib/tests/test_collections.py b/lib/matplotlib/tests/test_collections.py index 27ce8b5d69bc..642e5829a7b5 100644 --- a/lib/matplotlib/tests/test_collections.py +++ b/lib/matplotlib/tests/test_collections.py @@ -492,6 +492,28 @@ def test_polycollection_close(): ax.set_ylim3d(0, 4) +@check_figures_equal(extensions=["png"]) +def test_scalarmap_change_cmap(fig_test, fig_ref): + # Ensure that changing the colormap of a 3D scatter after draw updates the colors. + + x, y, z = np.array(list(itertools.product( + np.arange(0, 5, 1), + np.arange(0, 5, 1), + np.arange(0, 5, 1) + ))).T + c = x + y + + # test + ax_test = fig_test.add_subplot(111, projection='3d') + sc_test = ax_test.scatter(x, y, z, c=c, s=40, cmap='jet') + fig_test.canvas.draw() + sc_test.set_cmap('viridis') + + # ref + ax_ref = fig_ref.add_subplot(111, projection='3d') + ax_ref.scatter(x, y, z, c=c, s=40, cmap='viridis') + + @image_comparison(['regularpolycollection_rotate.png'], remove_text=True) def test_regularpolycollection_rotate(): xx, yy = np.mgrid[:10, :10] From 8912bbe1f1a8143443ebc96014dfba0e5d3477f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Sun, 18 May 2025 15:54:31 +0300 Subject: [PATCH 054/161] Close star polygons When '*' hatching was used and you zoomed in (especially in vector formats), the top of the star was not joined quite right. Using closepoly as the last operation fixes this. --- lib/matplotlib/hatch.py | 1 + .../test_artist/clip_path_clipping.pdf | Bin 4404 -> 4149 bytes .../test_artist/clip_path_clipping.png | Bin 63545 -> 59887 bytes .../test_artist/clip_path_clipping.svg | 281 +++++++++--------- 4 files changed, 147 insertions(+), 135 deletions(-) diff --git a/lib/matplotlib/hatch.py b/lib/matplotlib/hatch.py index 6ce68a275b4e..5e0b6d761a98 100644 --- a/lib/matplotlib/hatch.py +++ b/lib/matplotlib/hatch.py @@ -182,6 +182,7 @@ def __init__(self, hatch, density): self.shape_codes = np.full(len(self.shape_vertices), Path.LINETO, dtype=Path.code_type) self.shape_codes[0] = Path.MOVETO + self.shape_codes[-1] = Path.CLOSEPOLY super().__init__(hatch, density) _hatch_types = [ diff --git a/lib/matplotlib/tests/baseline_images/test_artist/clip_path_clipping.pdf b/lib/matplotlib/tests/baseline_images/test_artist/clip_path_clipping.pdf index 054fe8d8264f3804046311bb49ee7e87c0862888..6501d3d91ba0e3d96def23dfdfdd628cd2cc0403 100644 GIT binary patch delta 3186 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 diff --git a/lib/matplotlib/tests/baseline_images/test_artist/clip_path_clipping.png b/lib/matplotlib/tests/baseline_images/test_artist/clip_path_clipping.png index cf2ebc38391d08bd08a455200e738481355759b1..1846832dc3f398359caffecb3263f9ff95066bc7 100644 GIT binary patch literal 59887 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 literal 63545 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 - - + + + + + + 2025-05-18T15:59:59.749730 + image/svg+xml + + + Matplotlib v3.11.0.dev842+g991ee94077, https://matplotlib.org/ + + + + + - + @@ -15,7 +26,7 @@ L 576 432 L 576 0 L 0 0 z -" style="fill:#ffffff;"/> +" style="fill: #ffffff"/> @@ -24,10 +35,10 @@ L 274.909091 388.8 L 274.909091 43.2 L 72 43.2 z -" style="fill:#ffffff;"/> +" style="fill: #ffffff"/> - +" clip-path="url(#p4234805953)" style="fill: url(#h8da01be9d9); fill-opacity: 0.7; stroke: #0000ff; stroke-opacity: 0.7; stroke-width: 5"/> +" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/> - +" style="stroke: #000000; stroke-width: 0.5"/> - + - +" style="stroke: #000000; stroke-width: 0.5"/> - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -162,94 +173,94 @@ L 0 4 - +" style="stroke: #000000; stroke-width: 0.5"/> - + - +" style="stroke: #000000; stroke-width: 0.5"/> - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -262,10 +273,10 @@ L 518.4 388.8 L 518.4 43.2 L 315.490909 43.2 z -" style="fill:#ffffff;"/> +" style="fill: #ffffff"/> - +" clip-path="url(#p1824667f16)" style="fill: url(#h8da01be9d9); opacity: 0.7; stroke: #0000ff; stroke-width: 5; stroke-linejoin: miter"/> +" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/> +" style="fill: none; stroke: #000000; stroke-linejoin: miter; stroke-linecap: square"/> - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -390,84 +401,84 @@ L 518.4 43.2 - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -475,7 +486,7 @@ L 518.4 43.2 - + - + - + + +z +" style="fill: #0000ff; stroke: #0000ff; stroke-width: 1.0; stroke-linecap: butt; stroke-linejoin: miter; stroke-opacity: 0.7"/> From ead211025d96599bf058e2c5d27971b0013e1980 Mon Sep 17 00:00:00 2001 From: Oscar Gustafsson Date: Sun, 18 May 2025 15:36:07 +0200 Subject: [PATCH 055/161] Deprecate point_at_t and document that a BezierSegment can be called --- doc/api/bezier_api.rst | 1 + doc/api/next_api_changes/deprecations/30070-OG.rst | 4 ++++ lib/matplotlib/bezier.py | 8 ++++++-- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 doc/api/next_api_changes/deprecations/30070-OG.rst diff --git a/doc/api/bezier_api.rst b/doc/api/bezier_api.rst index b3764ad04b5a..45019153fa63 100644 --- a/doc/api/bezier_api.rst +++ b/doc/api/bezier_api.rst @@ -5,4 +5,5 @@ .. automodule:: matplotlib.bezier :members: :undoc-members: + :special-members: __call__ :show-inheritance: diff --git a/doc/api/next_api_changes/deprecations/30070-OG.rst b/doc/api/next_api_changes/deprecations/30070-OG.rst new file mode 100644 index 000000000000..98786bcfa1d2 --- /dev/null +++ b/doc/api/next_api_changes/deprecations/30070-OG.rst @@ -0,0 +1,4 @@ +``BezierSegment.point_at_t`` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +... is deprecated. Instead, it is possible to call the BezierSegment with an argument. diff --git a/lib/matplotlib/bezier.py b/lib/matplotlib/bezier.py index 42a6b478d729..b9b67c9a72d6 100644 --- a/lib/matplotlib/bezier.py +++ b/lib/matplotlib/bezier.py @@ -190,6 +190,9 @@ class BezierSegment: """ A d-dimensional Bézier segment. + A BezierSegment can be called with an argument, either a scalar or an array-like + object, to evaluate the curve at that/those location(s). + Parameters ---------- control_points : (N, d) array @@ -223,6 +226,8 @@ def __call__(self, t): return (np.power.outer(1 - t, self._orders[::-1]) * np.power.outer(t, self._orders)) @ self._px + @_api.deprecated( + "3.11", alternative="Call the BezierSegment object with an argument.") def point_at_t(self, t): """ Evaluate the curve at a single point, returning a tuple of *d* floats. @@ -336,10 +341,9 @@ def split_bezier_intersecting_with_closedpath( """ bz = BezierSegment(bezier) - bezier_point_at_t = bz.point_at_t t0, t1 = find_bezier_t_intersecting_with_closedpath( - bezier_point_at_t, inside_closedpath, tolerance=tolerance) + lambda t: tuple(bz(t)), inside_closedpath, tolerance=tolerance) _left, _right = split_de_casteljau(bezier, (t0 + t1) / 2.) return _left, _right From 9ef312809b984cc015e3a08461b08eef78c73c83 Mon Sep 17 00:00:00 2001 From: r3kste <138380708+r3kste@users.noreply.github.com> Date: Sat, 17 May 2025 11:48:11 +0530 Subject: [PATCH 056/161] hatch fill for pdf backend --- lib/matplotlib/backends/backend_pdf.py | 2 ++ .../test_artist/clip_path_clipping.pdf | Bin 4149 -> 4155 bytes .../baseline_images/test_artist/hatching.pdf | Bin 2626 -> 2478 bytes .../test_axes/contour_hatching.pdf | Bin 38851 -> 38826 bytes .../test_backend_pdf/hatching_legend.pdf | Bin 2703 -> 2703 bytes .../imshow_masked_interpolation.pdf | Bin 42086 -> 42076 bytes .../baseline_images/test_legend/hatching.pdf | Bin 11426 -> 11379 bytes .../test_patches/multi_color_hatch.pdf | Bin 6190 -> 6110 bytes .../test_patheffects/patheffect3.pdf | Bin 27653 -> 27738 bytes 9 files changed, 2 insertions(+) diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py index eb9d217c932c..6bf2e2bd8fd9 100644 --- a/lib/matplotlib/backends/backend_pdf.py +++ b/lib/matplotlib/backends/backend_pdf.py @@ -1577,6 +1577,8 @@ def writeHatches(self): Op.setrgb_nonstroke, 0, 0, sidelen, sidelen, Op.rectangle, Op.fill) + self.output(stroke_rgb[0], stroke_rgb[1], stroke_rgb[2], + Op.setrgb_nonstroke) self.output(lw, Op.setlinewidth) diff --git a/lib/matplotlib/tests/baseline_images/test_artist/clip_path_clipping.pdf b/lib/matplotlib/tests/baseline_images/test_artist/clip_path_clipping.pdf index 6501d3d91ba0e3d96def23dfdfdd628cd2cc0403..cac3b8f7751e08ee8b376a488f106d197e591636 100644 GIT binary patch delta 1671 zcma)*c~H|=5XTWnP)-X%m_Z~HK?*{G+~Porax|h?Xc2@UN2{Qm4HLrs;~2{k1tCgQ zj@TkH(jbRi;R>-LQ8XM%AVElqK`;RW0^uh8g=w8$)9L%;&Cb5v@9gg9Z4cLzio6B(K~(WM|C-bdug4X0E>k%~Mh!w!;=e1qR^w%VnT5+fILMm|NX81oXAg5KSA_`vNw^ODaQ;@(Uiguepl z^XD+>JS9fJA_T3>5R>@sJGoPNLVLNi-Q8m(IrI(wRDN~vS;#M@H_rarD%AF^Y*n7} zIZ~UMF?_5pFT+Qb>K%MjA)=p|7<=k$+@$tG3}(usnQwu|50AgW8_%1%oL9O_nd`%Uo0?rqnh7x4bhu3?6Y2V^ zT`CJLS*s=TQcf3^%qDD~&!rP4#W&Yh;tfiUZ*FyGeLXKY#Yc~kMHA~R@QJ6iATC?$ zOP8GRY$A>~uBaQYWHs+S)TaWHn3h%06Uk$xx=-u+DQG4?` zblk^Wg7fvD0LfKqtZmM)x6gv&X>Rug^O)e{O}4RtMEpwAXx|lc7CwY{HB4$2`M}|l z0<75@{}GA{8!atQo+s&2uxr5aT_5(w36 zeO%dJ{|fprHc=stDw^NN?bb%>Q!=N+hM;Vz2$`jZoeVW5w^}zXLNA_+P$0MZ5ps#0 z0CsW`OKxR`Z_z(kj&|E1@!nkUj)4=>AzEg-Aq-WO>{ZYD;H!{0Gu`jjt_vEj6}zy~ zu<1{# zR&H46;nSmK4KkqpEy8}p6=_*cXOj$ZJB(<*Gx{X)pNxP%LozFw^%C66WMUwNdRi_l zr$#vLZ4Lq!(Z5y@SpL>v+OaA~D0PX>XlM4c5wVd|2v}7c6XZjm2^4taHR(j`9fw2( zt(v9`A~s2U#WuFkBkrbc-F5_6^*1$*ptn?rAlq3CwyB>1;R%KoOn`*6Ls7w7BTyvn z0awcF&w`Qpna+#4*c`F!>sj<>Iu~nT zkR>NIkIot5xEMiW5%XE0i|48b*;L&j99mB%P g*2eOmK07Otzeb+CjWy|=hWlyp{M4Z9(pPrD$wIa>(NUV&Gi9B zd9tEEGMx(b{eeO<{8SF&FO8ZrqmN% zGY4m@YbG$fU!t#Dc4M89`<0uAfS@dw0~?zL#2@awUtD5%|E%|15()630<^a&m|;7c zw-~slGNr+;N~Ly0168+~4q*M&lRkLO&%-TV2f2tz=9}IWPKuHvnhUnkF!Gz~3z{&) zD#2W`rKUJl%PyIy9CHR#w-utfY!D-Nb1Vp&(0QS;pED5Ov@5p-0vABHmQ(q&i`Q@Vbi0s0y#aT0OW zA*O3|%sN(fHYhl+vNmucdZD`k1Eb2P2E*0r-$RU|V$Fg9U=gFm}-a|J-E}BMYC5 z_O0NV3n^^m+`$}h(|G#IoH)U=^VA&hosE8JuTYOZZM3nONNp5^lrtbV@;f5vdw-|e znk$RLE0go(^HOVW@!R+7eA57V23u_EJ#zD57uNg!PHdihzClo^+Kb0*nB9U6QM~e6 zBJ~S!aZ9I=a*lqEP%6*KlkSW~yBgs!6}q@?MmXnN|FC38w_xR6)vPSIzpX|1{HgFk z8l&S1>y&xAZQhz8GqvVXsPah_}BI!thq04Uc8;mF%hB`zk)eA3Dt|&ueK-SNVkvQBuyMMlHP57|X0KKJEU(09zs%P%QbFf>pwPzah_#VF5cGF0FOCkK`Wq^x>Z@V?zYe%}1@_Pt`S+xcJg-~Kz(;}FB487s;bsx9kh z)bh<~pL|35zkX4>_AIF{v$E1dt3!J)TbPMoweCsYZ;^cInqt8+tu?J2j?)%I2lF^2 zUdgCmae~#WOYu`ge1eCm$GWyZ+gN+=1$pTzhQ*rrX>G_lp!Ms^?axs!L$o=YJT7wm zd$r0=a&w01y4TxfuKy2{2<5uw;(G0}jH&3Vi5GfKObGw%vyiD+HLm}2$cLc5`L#>g zf2I~qcRP3P5U1*cl^b`-IWszb^?#!xy*Xr^!p9Jg#r3mhEc{pZ%xNI?Fak<_B$*{?r}JK3aW)z~+&n4D3F%ocrG8+SoDO6T64EJ52%|NWmX&&oU-v@!VEUhb>Y zo_XK9kb6ct(9Xd_?+U~G6~0zYsSDYPCSRT|=(~b3Jagu;SNwk_$o3rSn_0N1`RNA6 zoae48R&Qjp9iu#KKCnu(El}Hw#TO>POd&j(o9zIjDcG5{zJ@}F4LELBvdS0mZRq`Y zYiafW3u&Fxb^g}5-rBj~^ITO$&C}P?JmxN|eW1M8_u@;TKRYJpaNRqc`=#Vp{w2#L z?h$Xze%^`Pa9HU1uY9{tsmE7_HJj6vB{LEpnj!O&##a`q@I zL$E-sg1&QpXI^MGF^{U((9#rWE4r9DhIs}CW*~Kw>p1zvj7`vW7+9K_P44GZ zi#EZ~XlQ7FDQ0Q_3>Q>OjSNhY99&YAn37#Wyba;d7i`nz!f0E1l=VgLXD delta 1444 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 Jw(l~6{|C_~aG(GH literal 38851 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 V@MOwo7bCC;6bvLQt807|^k0d#37Y@_ diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pdf/hatching_legend.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pdf/hatching_legend.pdf index 18ba1d830a5bb8a5ae13f14b9de9da55a6f4f55a..57fc311ee81b5266d8e9a335b949f85abcb6e9b2 100644 GIT binary patch delta 1174 zcmV;H1Zn$^6^|9Lg#mw1!A`?4488j+`~{7jv`KnoAdMq}FF;W#OxX_W#C{(;OIi>@ zB9im`B>VZ<=3)B$NYnFvhxadFHkKA(JV?w)c#yav<6dG05_W`O1+oJ7y(Coe9pDYj zofIxwEpbKaV(kUzFnDSAgJK5nJ6E1kALQ@6zEDWS1cK~>mTG?zTlv<=ZbXq&NKknO z$4yANQSFF0v=*V6_ zI<*_?^=03@M0vUFw-oQoP|t#|s~&qG>4riQNT!l%sAm}sNn_Hsp^!|AP%sRI;8-jL zm!Y0zUKX9fbqs}ISX2emPzbi2t$zTIZwOYkGZ=&g54)Xv63J`xykp23=d^3Wp#`*_BM|nz{Y-^g}cM{0Nly@&~DPsp6Bt1?2%XlNtmgf08?L0znK!^ErhspsLyV zD|O=Bcd(s6LgMSYyR`v@3bYNo^Q1?$ir3d?;m2jKUtRCUdVSlE@`}7%_E(DcWvFMt z+f|P}kaR;K2_#cVHPo|=hNLlR+fYcRMJO1CLU1gWg3D0PGB1nH;5vpvFf6KqX($BS z&Q^fOHw3HNe;EwIf|uRS#mi*`UCVZI8Yx%UCM1V?mYnlZx;ekZH;Z`7oVVh>MYu5M zgYncwG#u(W7^g0x0n3F3u1Pe2yWl}SiH6Z!<6*W*I1KMv0HzbHx2D^ZCodgHly`~RElpL4+A~FUdD`dpBu(c^O_7$) zNJ%;uIA^CLkpVbrDiV9sA5VtbZ75a>()?IUMEcQ&usE7YKiVReOEb5ho_=WN%}@C# z|N5$@0jje{2nYccG9WN8FfcG6ZXgOUFfcGMFfcbWGm~TqcL6e!+zBTsG9WN8FfcG6 oZXgOUFfcGMFfceXHXtxCFfcG6ZXgOUFfcGMFflYaFq13_V;f@}!2kdN delta 1160 zcmV;31b6$76^|9Lg#mw%O-{o=42AbT#XCX9&SZYFY>O0@2u^@TB~VSeXexSr-W712G1er`PNC zcsV1@Fpq*coyj^#>oAeK7r7L+)x}Fu&Zd_YP5YVBt|`JbMYyI&s41mbQhwq6fz?;4 zeu3fzivJB2D^m%qNU;*d6^On7lZpZ$0yi+TtO9ER0Wp&p1S5abF_PRc3q8W1THVD4{)~&Pn`TC7N zL-B8nX#op7!vZQ7pJSTAj7dVpD-oFB8GAuxFq%qJ7 zy$m)|DsZSXIJkeOf(2c8MhNa^kVsw{uJSU#q7gXV6KolY!;)OwGkSTS!!UXCID+*8 zlRrHd!E%Yo2VX_7nl8+G@!bekQ^%}o_rO_AFJ_fbfwS6D%vxR=oaNTWtPRM(X1#SV zYl||mSI*%4nck|2jOnJY8TDw5Aga} z`%vba&-e#9{sUDWs1K9C1?2%WlNbaef77v!8!-$7&|Y6LKOjI9B}#15q|ZMjX>OZq z?)MKf+~NQO=8nDIk)Av-F!1Mh+>)EHN#hH-2)zYng?uLe6;QkcP0rN zTgiYAJZ(+bm`vuuJWMt+6)eof;37kTVH%#c4e1Q*!Y+e_911pUGdQ?M!Gujbe=P>? zVvtB)IDVkc7rHhe1B>#VzHnPbnPOyaH%9)x{?iN zPY-lykixZ(KYaR|IKM0(&gHXafBA4OpS8<}a{;YeK%7fxze1dgXs;sTTt@qp5$8gR zQAnJn6kbd{U#8coS6>AALfY-FTnc6qKu zr0!D(PeSt*$|xYMe;yuP`DllH=x~>hcF|pbfY-;%hcZ8W+OPHvx=W?kvquOB0TnbL zFfcGMFd%Lq3NSD*FfcGMH#0SpWC?cxG?Uy3Cn+=_FfcGMFd%Lq3NSD*FfcGMI5RjP aFfcGMFd%Lq3NSD*FfcGNG&wPoEDB>pbrG%r diff --git a/lib/matplotlib/tests/baseline_images/test_image/imshow_masked_interpolation.pdf b/lib/matplotlib/tests/baseline_images/test_image/imshow_masked_interpolation.pdf index 1d14a9d2f60cdec352fcaac5c33819674e211f2c..0342a2baa4b2b61979ab263e2c21af710d547c2a 100644 GIT binary patch delta 4337 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 LNJ?sN(?R?Xi7oc! literal 11426 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

Jk~xsG@uXjr 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 E1B}<*kN^Mx diff --git a/lib/matplotlib/tests/baseline_images/test_patches/multi_color_hatch.pdf b/lib/matplotlib/tests/baseline_images/test_patches/multi_color_hatch.pdf index e956cbdf248d58efed3cf24c9526a0b3573a7eb4..a9db7c30998ed6f31a4414a6d0ec1471a4ca0d8a 100644 GIT binary patch delta 2887 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 E3n%H(QUCw| diff --git a/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect3.pdf b/lib/matplotlib/tests/baseline_images/test_patheffects/patheffect3.pdf index ad98ff7223ccf468c78b842bd666c22aabc513b7..402ec545847df00280bdc341c7aeb4e43d6371b5 100644 GIT binary patch literal 27738 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 literal 27653 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 U;$x~$rZX87oPmLZyCd$u0G%FuGXMYp From c20130838a57dd912b4e73ebeecfdebcda5c697a Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Mon, 19 May 2025 15:10:17 +0200 Subject: [PATCH 057/161] Fix deprecated attribute name in backend_pdf. The attribute was called dviFontInfo (now with a leading underscore), not dviFontNames. --- doc/api/next_api_changes/deprecations/30027-AL.rst | 4 ++-- lib/matplotlib/backends/backend_pdf.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/api/next_api_changes/deprecations/30027-AL.rst b/doc/api/next_api_changes/deprecations/30027-AL.rst index 1cbd0340fda6..ed65d9391371 100644 --- a/doc/api/next_api_changes/deprecations/30027-AL.rst +++ b/doc/api/next_api_changes/deprecations/30027-AL.rst @@ -1,3 +1,3 @@ -``PdfFile.fontNames``, ``PdfFile.dviFontNames``, ``PdfFile.type1Descriptors`` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +``PdfFile.fontNames``, ``PdfFile.dviFontInfo``, ``PdfFile.type1Descriptors`` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ... are deprecated with no replacement. diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py index eb9d217c932c..73cf8bc19be2 100644 --- a/lib/matplotlib/backends/backend_pdf.py +++ b/lib/matplotlib/backends/backend_pdf.py @@ -766,7 +766,7 @@ def __init__(self, filename, metadata=None): self.writeObject(self.resourceObject, resources) fontNames = _api.deprecated("3.11")(property(lambda self: self._fontNames)) - dviFontNames = _api.deprecated("3.11")(property(lambda self: self._dviFontNames)) + dviFontInfo = _api.deprecated("3.11")(property(lambda self: self._dviFontInfo)) type1Descriptors = _api.deprecated("3.11")( property(lambda self: self._type1Descriptors)) From b41edd0a54ff7161a50b0ba35c436d87d53c181b Mon Sep 17 00:00:00 2001 From: Ruth Comer <10599679+rcomer@users.noreply.github.com> Date: Mon, 19 May 2025 19:41:22 +0100 Subject: [PATCH 058/161] FIX: cast legend handles to list --- lib/matplotlib/legend.py | 1 + lib/matplotlib/tests/test_legend.py | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py index d01a8dca0847..2fb14e52c58c 100644 --- a/lib/matplotlib/legend.py +++ b/lib/matplotlib/legend.py @@ -459,6 +459,7 @@ def __init__( labels = [*reversed(labels)] handles = [*reversed(handles)] + handles = list(handles) if len(handles) < 2: ncols = 1 self._ncols = ncols if ncols != 1 else ncol diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py index 9c708598e27c..d80c6b2ed92a 100644 --- a/lib/matplotlib/tests/test_legend.py +++ b/lib/matplotlib/tests/test_legend.py @@ -42,6 +42,18 @@ def test_legend_ordereddict(): loc='center left', bbox_to_anchor=(1, .5)) +def test_legend_generator(): + # smoketest that generator inputs work + fig, ax = plt.subplots() + ax.plot([0, 1]) + ax.plot([0, 2]) + + handles = (line for line in ax.get_lines()) + labels = (label for label in ['spam', 'eggs']) + + ax.legend(handles, labels, loc='upper left') + + @image_comparison(['legend_auto1.png'], remove_text=True) def test_legend_auto1(): """Test automatic legend placement""" From adf8951d92684736f94847a81704403b856e749c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 May 2025 19:16:02 +0000 Subject: [PATCH 059/161] Bump the actions group with 3 updates Bumps the actions group with 3 updates: [actions/setup-python](https://github.com/actions/setup-python), [github/codeql-action](https://github.com/github/codeql-action) and [codecov/codecov-action](https://github.com/codecov/codecov-action). Updates `actions/setup-python` from 5.5.0 to 5.6.0 - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v5.5.0...a26af69be951a213d495a4c3e4e4022e16d87065) Updates `github/codeql-action` from 3.28.17 to 3.28.18 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/60168efe1c415ce0f5521ea06d5c2062adbeed1b...ff0a06e83cb2de871e5a09832bc6a81e7276941f) Updates `codecov/codecov-action` from 5.4.2 to 5.4.3 - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/ad3126e916f78f00edff4ed0317cf185271ccc2d...18283e04ce6e62d37312384ff67231eb8fd56d24) --- updated-dependencies: - dependency-name: actions/setup-python dependency-version: 5.6.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions - dependency-name: github/codeql-action dependency-version: 3.28.18 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: actions - dependency-name: codecov/codecov-action dependency-version: 5.4.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: actions ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/reviewdog.yml | 2 +- .github/workflows/tests.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 774de9b116d8..0e8c723bb6f8 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -31,7 +31,7 @@ jobs: persist-credentials: false - name: Initialize CodeQL - uses: github/codeql-action/init@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17 + uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18 with: languages: ${{ matrix.language }} @@ -42,4 +42,4 @@ jobs: pip install --user -v . - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17 + uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18 diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml index 09b7886e9c99..bfad14923b82 100644 --- a/.github/workflows/reviewdog.yml +++ b/.github/workflows/reviewdog.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: fetch-depth: 0 - - uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0 + - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0 with: python-version: "3.x" - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 46bc4fb918b0..7a197a9d4aa8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -396,7 +396,7 @@ jobs: fi - name: Upload code coverage if: ${{ !cancelled() && github.event_name != 'schedule' }} - uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2 + uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3 with: name: "${{ matrix.python-version }} ${{ matrix.os }} ${{ matrix.name-suffix }}" token: ${{ secrets.CODECOV_TOKEN }} From 35c0eb0a18eb583ff7e66f29e96dc9309432cd6f Mon Sep 17 00:00:00 2001 From: Matthew Feickert Date: Mon, 19 May 2025 23:55:24 -0500 Subject: [PATCH 060/161] DOC: Add petroff6 and petroff8 to 'Named color sequences' example * Add petroff6 and petroff8 as a follow up to PR 30065. --- galleries/examples/color/color_sequences.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/galleries/examples/color/color_sequences.py b/galleries/examples/color/color_sequences.py index 9a2fd04a53d0..4fc5571a0b69 100644 --- a/galleries/examples/color/color_sequences.py +++ b/galleries/examples/color/color_sequences.py @@ -38,7 +38,8 @@ def plot_color_sequences(names, ax): built_in_color_sequences = [ 'tab10', 'tab20', 'tab20b', 'tab20c', 'Pastel1', 'Pastel2', 'Paired', - 'Accent', 'Dark2', 'Set1', 'Set2', 'Set3', 'petroff10'] + 'Accent', 'Dark2', 'Set1', 'Set2', 'Set3', 'petroff6', 'petroff8', + 'petroff10'] fig, ax = plt.subplots(figsize=(6.4, 9.6), layout='constrained') From 11c1a92aeb059733b8286a7595d48f81b15d9193 Mon Sep 17 00:00:00 2001 From: hannah Date: Mon, 19 May 2025 20:33:58 -0400 Subject: [PATCH 061/161] add plot types guidance to docs --- doc/devel/document.rst | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/doc/devel/document.rst b/doc/devel/document.rst index d40d281f8bb9..58beba593fed 100644 --- a/doc/devel/document.rst +++ b/doc/devel/document.rst @@ -1115,6 +1115,28 @@ The current width limit (induced by *pydata-sphinx-theme*) is 720px, i.e. ``figsize=(7.2, ...)``, or 896px if the page does not have subsections and thus does not have the "On this page" navigation on the right-hand side. + +Plot types guidelines +--------------------- + +The :ref:`plot_types` gallery provides an overview of the types of visualizations that +Matplotlib provides out of the box, meaning that there is a high-level API for +generating each type of chart. Additions to this gallery are generally discouraged +because this gallery is heavily curated and tightly scoped to methods on +`matplotlib.axes.Axes`. + +Format +^^^^^^ +:title: Method signature with required arguments, e.g. ``plot(x, y)`` +:description: In one sentence, describe the visualization that the method produces and + link to the API documentation, e.g. *Draws a bar chart. See ~Axes.bar*. + When necessary, add an additional sentence explaining the use case for + this function vs a very similar one, e.g. stairs vs step. +:plot: Use data with a self explanatory structure to illustrate the type of data this + plotting method is typically used for. +:code: The code should be about 5-10 lines with minimal customization. Plots in + this gallery use the ``_mpl-gallery`` stylesheet for a uniform aesthetic. + Miscellaneous ============= From c4e54cfc303c203e4acac728c17cedbea22fd2ef Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Tue, 20 May 2025 11:51:03 +0200 Subject: [PATCH 062/161] Parse FontBBox in type1font. ... instead of having to go through ft2font in createType1Descriptor just to extract the font bbox, ascender and descender. FontBBox is gauranteed to exist in the type1 font definition by the standard; its parsing as a size-4 array matches freetype's behavior (see ps_parser_load_field); and using bbox entries as ascender and descender also matches freetype's behavior (T1_Face_Init directly assigns `root->ascender = (FT_Short)(root->bbox.yMax)` and likewise for the descender; see also the docs for ascender and descender in FT_FaceRec). --- .../next_api_changes/deprecations/30088-AL.rst | 4 ++++ lib/matplotlib/_type1font.py | 10 ++++++++++ lib/matplotlib/backends/backend_pdf.py | 15 +++++++-------- 3 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 doc/api/next_api_changes/deprecations/30088-AL.rst diff --git a/doc/api/next_api_changes/deprecations/30088-AL.rst b/doc/api/next_api_changes/deprecations/30088-AL.rst new file mode 100644 index 000000000000..ae1338da7f85 --- /dev/null +++ b/doc/api/next_api_changes/deprecations/30088-AL.rst @@ -0,0 +1,4 @@ +*fontfile* parameter of ``PdfFile.createType1Descriptor`` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +This parameter is deprecated; all relevant pieces of information are now +directly extracted from the *t1font* argument. diff --git a/lib/matplotlib/_type1font.py b/lib/matplotlib/_type1font.py index b3e08f52c035..032b6a42ea63 100644 --- a/lib/matplotlib/_type1font.py +++ b/lib/matplotlib/_type1font.py @@ -579,6 +579,16 @@ def _parse(self): extras = ('(?i)([ -](regular|plain|italic|oblique|(semi)?bold|' '(ultra)?light|extra|condensed))+$') prop['FamilyName'] = re.sub(extras, '', prop['FullName']) + + # Parse FontBBox + toks = [*_tokenize(prop['FontBBox'].encode('ascii'), True)] + if ([tok.kind for tok in toks] + != ['delimiter', 'number', 'number', 'number', 'number', 'delimiter'] + or toks[-1].raw != toks[0].opposite()): + raise RuntimeError( + f"FontBBox should be a size-4 array, was {prop['FontBBox']}") + prop['FontBBox'] = [tok.value() for tok in toks[1:-1]] + # Decrypt the encrypted parts ndiscard = prop.get('lenIV', 4) cs = prop['CharStrings'] diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py index 73cf8bc19be2..073ca05bc172 100644 --- a/lib/matplotlib/backends/backend_pdf.py +++ b/lib/matplotlib/backends/backend_pdf.py @@ -1034,14 +1034,15 @@ def _embedTeXFont(self, fontinfo): fontinfo.effects.get('extend', 1.0)) fontdesc = self._type1Descriptors.get((fontinfo.fontfile, effects)) if fontdesc is None: - fontdesc = self.createType1Descriptor(t1font, fontinfo.fontfile) + fontdesc = self.createType1Descriptor(t1font) self._type1Descriptors[(fontinfo.fontfile, effects)] = fontdesc fontdict['FontDescriptor'] = fontdesc self.writeObject(fontdictObject, fontdict) return fontdictObject - def createType1Descriptor(self, t1font, fontfile): + @_api.delete_parameter("3.11", "fontfile") + def createType1Descriptor(self, t1font, fontfile=None): # Create and write the font descriptor and the font file # of a Type-1 font fontdescObject = self.reserveObject('font descriptor') @@ -1076,16 +1077,14 @@ def createType1Descriptor(self, t1font, fontfile): if 0: flags |= 1 << 18 - ft2font = get_font(fontfile) - descriptor = { 'Type': Name('FontDescriptor'), 'FontName': Name(t1font.prop['FontName']), 'Flags': flags, - 'FontBBox': ft2font.bbox, + 'FontBBox': t1font.prop['FontBBox'], 'ItalicAngle': italic_angle, - 'Ascent': ft2font.ascender, - 'Descent': ft2font.descender, + 'Ascent': t1font.prop['FontBBox'][3], + 'Descent': t1font.prop['FontBBox'][1], 'CapHeight': 1000, # TODO: find this out 'XHeight': 500, # TODO: this one too 'FontFile': fontfileObject, @@ -1093,7 +1092,7 @@ def createType1Descriptor(self, t1font, fontfile): 'StemV': 50, # TODO # (see also revision 3874; but not all TeX distros have AFM files!) # 'FontWeight': a number where 400 = Regular, 700 = Bold - } + } self.writeObject(fontdescObject, descriptor) From d77efae515271c2792c5135817b980d495b3034f Mon Sep 17 00:00:00 2001 From: Jody Klymak Date: Tue, 20 May 2025 10:09:17 -0700 Subject: [PATCH 063/161] FIX: fix submerged margins algorithm being applied twice --- lib/matplotlib/_constrained_layout.py | 8 ++++++-- .../tests/test_constrainedlayout.py | 20 +++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/_constrained_layout.py b/lib/matplotlib/_constrained_layout.py index 5623e12a3c41..f5f23581bd9d 100644 --- a/lib/matplotlib/_constrained_layout.py +++ b/lib/matplotlib/_constrained_layout.py @@ -521,11 +521,13 @@ def match_submerged_margins(layoutgrids, fig): See test_constrained_layout::test_constrained_layout12 for an example. """ + axsdone = [] for sfig in fig.subfigs: - match_submerged_margins(layoutgrids, sfig) + axsdone += match_submerged_margins(layoutgrids, sfig) axs = [a for a in fig.get_axes() - if a.get_subplotspec() is not None and a.get_in_layout()] + if (a.get_subplotspec() is not None and a.get_in_layout() and + a not in axsdone)] for ax1 in axs: ss1 = ax1.get_subplotspec() @@ -592,6 +594,8 @@ def match_submerged_margins(layoutgrids, fig): for i in ss1.rowspan[:-1]: lg1.edit_margin_min('bottom', maxsubb, cell=i) + return axs + def get_cb_parent_spans(cbax): """ diff --git a/lib/matplotlib/tests/test_constrainedlayout.py b/lib/matplotlib/tests/test_constrainedlayout.py index 7c7dd43a3115..df2dbd6f43bd 100644 --- a/lib/matplotlib/tests/test_constrainedlayout.py +++ b/lib/matplotlib/tests/test_constrainedlayout.py @@ -721,3 +721,23 @@ def test_layout_leak(): gc.collect() assert not any(isinstance(obj, mpl._layoutgrid.LayoutGrid) for obj in gc.get_objects()) + + +def test_submerged_subfig(): + """ + Test that the submerged margin logic does not get called multiple times + on same axes if it is already in a subfigure + """ + fig = plt.figure(figsize=(4, 5), layout='constrained') + figures = fig.subfigures(3, 1) + axs = [] + for f in figures.flatten(): + gs = f.add_gridspec(2, 2) + for i in range(2): + axs += [f.add_subplot(gs[i, 0])] + axs[-1].plot() + f.add_subplot(gs[:, 1]).plot() + fig.draw_without_rendering() + for ax in axs[1:]: + assert np.allclose(ax.get_position().bounds[-1], + axs[0].get_position().bounds[-1], atol=1e-6) From a3782cd84ecaca23b883ff0083c982108782862c Mon Sep 17 00:00:00 2001 From: hannah Date: Mon, 19 May 2025 21:22:21 -0400 Subject: [PATCH 064/161] add API docs content guidelines to api docs instructions Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> --- doc/devel/document.rst | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/doc/devel/document.rst b/doc/devel/document.rst index d40d281f8bb9..819c3a4bf818 100644 --- a/doc/devel/document.rst +++ b/doc/devel/document.rst @@ -399,11 +399,14 @@ expression in the Matplotlib figure. In these cases, you can use the .. _writing-docstrings: -Write docstrings -================ +Write API documentation +======================= -Most of the API documentation is written in docstrings. These are comment -blocks in source code that explain how the code works. +The API reference documentation describes the library interfaces, e.g. inputs, outputs, +and expected behavior. Most of the API documentation is written in docstrings. These are +comment blocks in source code that explain how the code works. All docstrings should +conform to the `numpydoc docstring guide`_. Much of the ReST_ syntax discussed above +(:ref:`writing-rest-pages`) can be used for links and references. .. note:: @@ -412,11 +415,11 @@ blocks in source code that explain how the code works. you may see in the source code. Pull requests updating docstrings to the current style are very welcome. -All new or edited docstrings should conform to the `numpydoc docstring guide`_. -Much of the ReST_ syntax discussed above (:ref:`writing-rest-pages`) can be -used for links and references. These docstrings eventually populate the -:file:`doc/api` directory and form the reference documentation for the -library. +The pages in :file:`doc/api` are purely technical definitions of +layout; therefore new API reference documentation should be added to the module +docstrings. This placement keeps all API reference documentation about a module in the +same file. These module docstrings eventually populate the :file:`doc/api` directory +and form the reference documentation for the library. Example docstring ----------------- From c3987ee06745d15f0a35d33de7f40101c13e39fc Mon Sep 17 00:00:00 2001 From: hannah Date: Mon, 19 May 2025 21:26:04 -0400 Subject: [PATCH 065/161] move inheritance diagrams out of miscellanious to API --- doc/devel/document.rst | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/doc/devel/document.rst b/doc/devel/document.rst index 819c3a4bf818..1c057bb8547b 100644 --- a/doc/devel/document.rst +++ b/doc/devel/document.rst @@ -869,6 +869,26 @@ Plots can also be directly placed inside docstrings. Details are in An advantage of this style over referencing an example script is that the code will also appear in interactive docstrings. +.. _inheritance-diagrams: + +Generate inheritance diagrams +----------------------------- + +Class inheritance diagrams can be generated with the Sphinx +`inheritance-diagram`_ directive. + +.. _inheritance-diagram: https://www.sphinx-doc.org/en/master/usage/extensions/inheritance.html + +Example: + +.. code-block:: rst + + .. inheritance-diagram:: matplotlib.patches matplotlib.lines matplotlib.text + :parts: 2 + +.. inheritance-diagram:: matplotlib.patches matplotlib.lines matplotlib.text + :parts: 2 + .. _writing-examples-and-tutorials: Write examples and tutorials @@ -1154,28 +1174,6 @@ Use the full path for this directive, relative to the doc root at found by users at ``http://matplotlib.org/stable/old_topic/old_info2``. For clarity, do not use relative links. - -.. _inheritance-diagrams: - -Generate inheritance diagrams ------------------------------ - -Class inheritance diagrams can be generated with the Sphinx -`inheritance-diagram`_ directive. - -.. _inheritance-diagram: https://www.sphinx-doc.org/en/master/usage/extensions/inheritance.html - -Example: - -.. code-block:: rst - - .. inheritance-diagram:: matplotlib.patches matplotlib.lines matplotlib.text - :parts: 2 - -.. inheritance-diagram:: matplotlib.patches matplotlib.lines matplotlib.text - :parts: 2 - - Navbar and style ---------------- From 9e7106b3a843b9268fab227ed20103037f57ff6f Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 17 May 2025 05:14:49 -0400 Subject: [PATCH 066/161] Move test data into a single subdirectory Consolidating these files make it easier to remove or restore them without having to track each one individually. --- .pre-commit-config.yaml | 2 +- .../{ => data}/Courier10PitchBT-Bold.pfb | Bin lib/matplotlib/tests/{ => data}/cmr10.pfb | Bin lib/matplotlib/tests/{ => data}/mpltest.ttf | Bin .../tests/{ => data}/test_inline_01.ipynb | 0 .../tests/{ => data}/test_nbagg_01.ipynb | 0 .../tests/{ => data}/tinypages/.gitignore | 0 .../tests/{ => data}/tinypages/README.md | 0 .../{ => data}/tinypages/_static/.gitignore | 0 .../{ => data}/tinypages/_static/README.txt | 0 .../tests/{ => data}/tinypages/conf.py | 0 .../{ => data}/tinypages/included_plot_21.rst | 0 .../tests/{ => data}/tinypages/index.rst | 0 .../{ => data}/tinypages/nestedpage/index.rst | 0 .../tinypages/nestedpage2/index.rst | 0 .../tests/{ => data}/tinypages/range4.py | 0 .../tests/{ => data}/tinypages/range6.py | 0 .../tests/{ => data}/tinypages/some_plots.rst | 0 lib/matplotlib/tests/meson.build | 9 ++---- lib/matplotlib/tests/test_backend_inline.py | 2 +- lib/matplotlib/tests/test_backend_nbagg.py | 2 +- lib/matplotlib/tests/test_backend_pdf.py | 2 +- lib/matplotlib/tests/test_font_manager.py | 6 ++-- lib/matplotlib/tests/test_mathtext.py | 2 +- lib/matplotlib/tests/test_sphinxext.py | 27 ++++++++---------- lib/matplotlib/tests/test_type1font.py | 6 ++-- 26 files changed, 25 insertions(+), 33 deletions(-) rename lib/matplotlib/tests/{ => data}/Courier10PitchBT-Bold.pfb (100%) rename lib/matplotlib/tests/{ => data}/cmr10.pfb (100%) rename lib/matplotlib/tests/{ => data}/mpltest.ttf (100%) rename lib/matplotlib/tests/{ => data}/test_inline_01.ipynb (100%) rename lib/matplotlib/tests/{ => data}/test_nbagg_01.ipynb (100%) rename lib/matplotlib/tests/{ => data}/tinypages/.gitignore (100%) rename lib/matplotlib/tests/{ => data}/tinypages/README.md (100%) rename lib/matplotlib/tests/{ => data}/tinypages/_static/.gitignore (100%) rename lib/matplotlib/tests/{ => data}/tinypages/_static/README.txt (100%) rename lib/matplotlib/tests/{ => data}/tinypages/conf.py (100%) rename lib/matplotlib/tests/{ => data}/tinypages/included_plot_21.rst (100%) rename lib/matplotlib/tests/{ => data}/tinypages/index.rst (100%) rename lib/matplotlib/tests/{ => data}/tinypages/nestedpage/index.rst (100%) rename lib/matplotlib/tests/{ => data}/tinypages/nestedpage2/index.rst (100%) rename lib/matplotlib/tests/{ => data}/tinypages/range4.py (100%) rename lib/matplotlib/tests/{ => data}/tinypages/range6.py (100%) rename lib/matplotlib/tests/{ => data}/tinypages/some_plots.rst (100%) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index afcdc44c1b4a..86a9a0f45440 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,7 +10,7 @@ exclude: | doc/devel/gitwash| doc/users/prev| doc/api/prev| - lib/matplotlib/tests/tinypages + lib/matplotlib/tests/data/tinypages ) repos: - repo: https://github.com/pre-commit/pre-commit-hooks diff --git a/lib/matplotlib/tests/Courier10PitchBT-Bold.pfb b/lib/matplotlib/tests/data/Courier10PitchBT-Bold.pfb similarity index 100% rename from lib/matplotlib/tests/Courier10PitchBT-Bold.pfb rename to lib/matplotlib/tests/data/Courier10PitchBT-Bold.pfb diff --git a/lib/matplotlib/tests/cmr10.pfb b/lib/matplotlib/tests/data/cmr10.pfb similarity index 100% rename from lib/matplotlib/tests/cmr10.pfb rename to lib/matplotlib/tests/data/cmr10.pfb diff --git a/lib/matplotlib/tests/mpltest.ttf b/lib/matplotlib/tests/data/mpltest.ttf similarity index 100% rename from lib/matplotlib/tests/mpltest.ttf rename to lib/matplotlib/tests/data/mpltest.ttf diff --git a/lib/matplotlib/tests/test_inline_01.ipynb b/lib/matplotlib/tests/data/test_inline_01.ipynb similarity index 100% rename from lib/matplotlib/tests/test_inline_01.ipynb rename to lib/matplotlib/tests/data/test_inline_01.ipynb diff --git a/lib/matplotlib/tests/test_nbagg_01.ipynb b/lib/matplotlib/tests/data/test_nbagg_01.ipynb similarity index 100% rename from lib/matplotlib/tests/test_nbagg_01.ipynb rename to lib/matplotlib/tests/data/test_nbagg_01.ipynb diff --git a/lib/matplotlib/tests/tinypages/.gitignore b/lib/matplotlib/tests/data/tinypages/.gitignore similarity index 100% rename from lib/matplotlib/tests/tinypages/.gitignore rename to lib/matplotlib/tests/data/tinypages/.gitignore diff --git a/lib/matplotlib/tests/tinypages/README.md b/lib/matplotlib/tests/data/tinypages/README.md similarity index 100% rename from lib/matplotlib/tests/tinypages/README.md rename to lib/matplotlib/tests/data/tinypages/README.md diff --git a/lib/matplotlib/tests/tinypages/_static/.gitignore b/lib/matplotlib/tests/data/tinypages/_static/.gitignore similarity index 100% rename from lib/matplotlib/tests/tinypages/_static/.gitignore rename to lib/matplotlib/tests/data/tinypages/_static/.gitignore diff --git a/lib/matplotlib/tests/tinypages/_static/README.txt b/lib/matplotlib/tests/data/tinypages/_static/README.txt similarity index 100% rename from lib/matplotlib/tests/tinypages/_static/README.txt rename to lib/matplotlib/tests/data/tinypages/_static/README.txt diff --git a/lib/matplotlib/tests/tinypages/conf.py b/lib/matplotlib/tests/data/tinypages/conf.py similarity index 100% rename from lib/matplotlib/tests/tinypages/conf.py rename to lib/matplotlib/tests/data/tinypages/conf.py diff --git a/lib/matplotlib/tests/tinypages/included_plot_21.rst b/lib/matplotlib/tests/data/tinypages/included_plot_21.rst similarity index 100% rename from lib/matplotlib/tests/tinypages/included_plot_21.rst rename to lib/matplotlib/tests/data/tinypages/included_plot_21.rst diff --git a/lib/matplotlib/tests/tinypages/index.rst b/lib/matplotlib/tests/data/tinypages/index.rst similarity index 100% rename from lib/matplotlib/tests/tinypages/index.rst rename to lib/matplotlib/tests/data/tinypages/index.rst diff --git a/lib/matplotlib/tests/tinypages/nestedpage/index.rst b/lib/matplotlib/tests/data/tinypages/nestedpage/index.rst similarity index 100% rename from lib/matplotlib/tests/tinypages/nestedpage/index.rst rename to lib/matplotlib/tests/data/tinypages/nestedpage/index.rst diff --git a/lib/matplotlib/tests/tinypages/nestedpage2/index.rst b/lib/matplotlib/tests/data/tinypages/nestedpage2/index.rst similarity index 100% rename from lib/matplotlib/tests/tinypages/nestedpage2/index.rst rename to lib/matplotlib/tests/data/tinypages/nestedpage2/index.rst diff --git a/lib/matplotlib/tests/tinypages/range4.py b/lib/matplotlib/tests/data/tinypages/range4.py similarity index 100% rename from lib/matplotlib/tests/tinypages/range4.py rename to lib/matplotlib/tests/data/tinypages/range4.py diff --git a/lib/matplotlib/tests/tinypages/range6.py b/lib/matplotlib/tests/data/tinypages/range6.py similarity index 100% rename from lib/matplotlib/tests/tinypages/range6.py rename to lib/matplotlib/tests/data/tinypages/range6.py diff --git a/lib/matplotlib/tests/tinypages/some_plots.rst b/lib/matplotlib/tests/data/tinypages/some_plots.rst similarity index 100% rename from lib/matplotlib/tests/tinypages/some_plots.rst rename to lib/matplotlib/tests/data/tinypages/some_plots.rst diff --git a/lib/matplotlib/tests/meson.build b/lib/matplotlib/tests/meson.build index 05336496969f..48b97a1d4b3d 100644 --- a/lib/matplotlib/tests/meson.build +++ b/lib/matplotlib/tests/meson.build @@ -99,11 +99,6 @@ py3.install_sources(python_sources, install_data( 'README', - 'Courier10PitchBT-Bold.pfb', - 'cmr10.pfb', - 'mpltest.ttf', - 'test_nbagg_01.ipynb', - 'test_inline_01.ipynb', install_tag: 'tests', install_dir: py3.get_install_dir(subdir: 'matplotlib/tests/')) @@ -112,6 +107,6 @@ install_subdir( install_tag: 'tests', install_dir: py3.get_install_dir(subdir: 'matplotlib/tests')) install_subdir( - 'tinypages', + 'data', install_tag: 'tests', - install_dir: py3.get_install_dir(subdir: 'matplotlib/tests')) + install_dir: py3.get_install_dir(subdir: 'matplotlib/tests/')) diff --git a/lib/matplotlib/tests/test_backend_inline.py b/lib/matplotlib/tests/test_backend_inline.py index 6f0d67d51756..997e1e7186b1 100644 --- a/lib/matplotlib/tests/test_backend_inline.py +++ b/lib/matplotlib/tests/test_backend_inline.py @@ -13,7 +13,7 @@ def test_ipynb(): - nb_path = Path(__file__).parent / 'test_inline_01.ipynb' + nb_path = Path(__file__).parent / 'data/test_inline_01.ipynb' with TemporaryDirectory() as tmpdir: out_path = Path(tmpdir, "out.ipynb") diff --git a/lib/matplotlib/tests/test_backend_nbagg.py b/lib/matplotlib/tests/test_backend_nbagg.py index 23af88d95086..ccf74df20aab 100644 --- a/lib/matplotlib/tests/test_backend_nbagg.py +++ b/lib/matplotlib/tests/test_backend_nbagg.py @@ -14,7 +14,7 @@ def test_ipynb(): - nb_path = Path(__file__).parent / 'test_nbagg_01.ipynb' + nb_path = Path(__file__).parent / 'data/test_nbagg_01.ipynb' with TemporaryDirectory() as tmpdir: out_path = Path(tmpdir, "out.ipynb") diff --git a/lib/matplotlib/tests/test_backend_pdf.py b/lib/matplotlib/tests/test_backend_pdf.py index 60169a38c972..dc349e8dfa35 100644 --- a/lib/matplotlib/tests/test_backend_pdf.py +++ b/lib/matplotlib/tests/test_backend_pdf.py @@ -425,6 +425,6 @@ def test_truetype_conversion(recwarn): mpl.rcParams['pdf.fonttype'] = 3 fig, ax = plt.subplots() ax.text(0, 0, "ABCDE", - font=Path(__file__).with_name("mpltest.ttf"), fontsize=80) + font=Path(__file__).parent / "data/mpltest.ttf", fontsize=80) ax.set_xticks([]) ax.set_yticks([]) diff --git a/lib/matplotlib/tests/test_font_manager.py b/lib/matplotlib/tests/test_font_manager.py index d15b892b3eea..97ee8672b1d4 100644 --- a/lib/matplotlib/tests/test_font_manager.py +++ b/lib/matplotlib/tests/test_font_manager.py @@ -164,7 +164,7 @@ def test_user_fonts_linux(tmpdir, monkeypatch): # Prepare a temporary user font directory user_fonts_dir = tmpdir.join('fonts') user_fonts_dir.ensure(dir=True) - shutil.copyfile(Path(__file__).parent / font_test_file, + shutil.copyfile(Path(__file__).parent / 'data' / font_test_file, user_fonts_dir.join(font_test_file)) with monkeypatch.context() as m: @@ -181,7 +181,7 @@ def test_user_fonts_linux(tmpdir, monkeypatch): def test_addfont_as_path(): """Smoke test that addfont() accepts pathlib.Path.""" font_test_file = 'mpltest.ttf' - path = Path(__file__).parent / font_test_file + path = Path(__file__).parent / 'data' / font_test_file try: fontManager.addfont(path) added, = (font for font in fontManager.ttflist @@ -215,7 +215,7 @@ def test_user_fonts_win32(): os.makedirs(user_fonts_dir) # Copy the test font to the user font directory - shutil.copy(Path(__file__).parent / font_test_file, user_fonts_dir) + shutil.copy(Path(__file__).parent / 'data' / font_test_file, user_fonts_dir) # Now, the font should be available fonts = findSystemFonts() diff --git a/lib/matplotlib/tests/test_mathtext.py b/lib/matplotlib/tests/test_mathtext.py index 198e640ad286..39c28dc9228c 100644 --- a/lib/matplotlib/tests/test_mathtext.py +++ b/lib/matplotlib/tests/test_mathtext.py @@ -437,7 +437,7 @@ def test_mathtext_fallback_invalid(): ("stix", ['DejaVu Sans', 'mpltest', 'STIXGeneral', 'STIXGeneral', 'STIXGeneral'])]) def test_mathtext_fallback(fallback, fontlist): mpl.font_manager.fontManager.addfont( - str(Path(__file__).resolve().parent / 'mpltest.ttf')) + (Path(__file__).resolve().parent / 'data/mpltest.ttf')) mpl.rcParams["svg.fonttype"] = 'none' mpl.rcParams['mathtext.fontset'] = 'custom' mpl.rcParams['mathtext.rm'] = 'mpltest' diff --git a/lib/matplotlib/tests/test_sphinxext.py b/lib/matplotlib/tests/test_sphinxext.py index 1aaa6baca47c..6e42378bdf6b 100644 --- a/lib/matplotlib/tests/test_sphinxext.py +++ b/lib/matplotlib/tests/test_sphinxext.py @@ -13,6 +13,9 @@ pytest.importorskip('sphinx', minversion='4.1.3') +tinypages = Path(__file__).parent / 'data/tinypages' + + def build_sphinx_html(source_dir, doctree_dir, html_dir, extra_args=None): # Build the pages with warnings turned into errors extra_args = [] if extra_args is None else extra_args @@ -33,15 +36,13 @@ def build_sphinx_html(source_dir, doctree_dir, html_dir, extra_args=None): def test_tinypages(tmp_path): - shutil.copytree(Path(__file__).parent / 'tinypages', tmp_path, - dirs_exist_ok=True) + shutil.copytree(tinypages, tmp_path, dirs_exist_ok=True) html_dir = tmp_path / '_build' / 'html' img_dir = html_dir / '_images' doctree_dir = tmp_path / 'doctrees' # Build the pages with warnings turned into errors cmd = [sys.executable, '-msphinx', '-W', '-b', 'html', - '-d', str(doctree_dir), - str(Path(__file__).parent / 'tinypages'), str(html_dir)] + '-d', str(doctree_dir), str(tinypages), str(html_dir)] # On CI, gcov emits warnings (due to agg headers being included with the # same name in multiple extension modules -- but we don't care about their # coverage anyways); hide them using GCOV_ERROR_FILE. @@ -125,9 +126,8 @@ def plot_directive_file(num): def test_plot_html_show_source_link(tmp_path): - parent = Path(__file__).parent - shutil.copyfile(parent / 'tinypages/conf.py', tmp_path / 'conf.py') - shutil.copytree(parent / 'tinypages/_static', tmp_path / '_static') + shutil.copyfile(tinypages / 'conf.py', tmp_path / 'conf.py') + shutil.copytree(tinypages / '_static', tmp_path / '_static') doctree_dir = tmp_path / 'doctrees' (tmp_path / 'index.rst').write_text(""" .. plot:: @@ -150,9 +150,8 @@ def test_plot_html_show_source_link(tmp_path): def test_show_source_link_true(tmp_path, plot_html_show_source_link): # Test that a source link is generated if :show-source-link: is true, # whether or not plot_html_show_source_link is true. - parent = Path(__file__).parent - shutil.copyfile(parent / 'tinypages/conf.py', tmp_path / 'conf.py') - shutil.copytree(parent / 'tinypages/_static', tmp_path / '_static') + shutil.copyfile(tinypages / 'conf.py', tmp_path / 'conf.py') + shutil.copytree(tinypages / '_static', tmp_path / '_static') doctree_dir = tmp_path / 'doctrees' (tmp_path / 'index.rst').write_text(""" .. plot:: @@ -170,9 +169,8 @@ def test_show_source_link_true(tmp_path, plot_html_show_source_link): def test_show_source_link_false(tmp_path, plot_html_show_source_link): # Test that a source link is NOT generated if :show-source-link: is false, # whether or not plot_html_show_source_link is true. - parent = Path(__file__).parent - shutil.copyfile(parent / 'tinypages/conf.py', tmp_path / 'conf.py') - shutil.copytree(parent / 'tinypages/_static', tmp_path / '_static') + shutil.copyfile(tinypages / 'conf.py', tmp_path / 'conf.py') + shutil.copytree(tinypages / '_static', tmp_path / '_static') doctree_dir = tmp_path / 'doctrees' (tmp_path / 'index.rst').write_text(""" .. plot:: @@ -187,8 +185,7 @@ def test_show_source_link_false(tmp_path, plot_html_show_source_link): def test_srcset_version(tmp_path): - shutil.copytree(Path(__file__).parent / 'tinypages', tmp_path, - dirs_exist_ok=True) + shutil.copytree(tinypages, tmp_path, dirs_exist_ok=True) html_dir = tmp_path / '_build' / 'html' img_dir = html_dir / '_images' doctree_dir = tmp_path / 'doctrees' diff --git a/lib/matplotlib/tests/test_type1font.py b/lib/matplotlib/tests/test_type1font.py index 9b8a2d1f07c6..b2f93ef28a26 100644 --- a/lib/matplotlib/tests/test_type1font.py +++ b/lib/matplotlib/tests/test_type1font.py @@ -5,7 +5,7 @@ def test_Type1Font(): - filename = os.path.join(os.path.dirname(__file__), 'cmr10.pfb') + filename = os.path.join(os.path.dirname(__file__), 'data', 'cmr10.pfb') font = t1f.Type1Font(filename) slanted = font.transform({'slant': 1}) condensed = font.transform({'extend': 0.5}) @@ -78,7 +78,7 @@ def test_Type1Font(): def test_Type1Font_2(): - filename = os.path.join(os.path.dirname(__file__), + filename = os.path.join(os.path.dirname(__file__), 'data', 'Courier10PitchBT-Bold.pfb') font = t1f.Type1Font(filename) assert font.prop['Weight'] == 'Bold' @@ -137,7 +137,7 @@ def test_tokenize_errors(): def test_overprecision(): # We used to output too many digits in FontMatrix entries and # ItalicAngle, which could make Type-1 parsers unhappy. - filename = os.path.join(os.path.dirname(__file__), 'cmr10.pfb') + filename = os.path.join(os.path.dirname(__file__), 'data', 'cmr10.pfb') font = t1f.Type1Font(filename) slanted = font.transform({'slant': .167}) lines = slanted.parts[0].decode('ascii').splitlines() From a7c08c82568234ebe850abb8d8de402ec8c82fd6 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 21 May 2025 07:16:46 -0400 Subject: [PATCH 067/161] Simplify some Sphinx tests (#30090) - `test_tinypages` unnecessarily calls `sphinx-build` twice. - `test_srcset_versions` doesn't need an extra copy of the source files, as it doesn't modify anything. --- lib/matplotlib/tests/test_sphinxext.py | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/lib/matplotlib/tests/test_sphinxext.py b/lib/matplotlib/tests/test_sphinxext.py index 6e42378bdf6b..6a81f56fe924 100644 --- a/lib/matplotlib/tests/test_sphinxext.py +++ b/lib/matplotlib/tests/test_sphinxext.py @@ -21,9 +21,13 @@ def build_sphinx_html(source_dir, doctree_dir, html_dir, extra_args=None): extra_args = [] if extra_args is None else extra_args cmd = [sys.executable, '-msphinx', '-W', '-b', 'html', '-d', str(doctree_dir), str(source_dir), str(html_dir), *extra_args] + # On CI, gcov emits warnings (due to agg headers being included with the + # same name in multiple extension modules -- but we don't care about their + # coverage anyways); hide them using GCOV_ERROR_FILE. proc = subprocess_run_for_testing( cmd, capture_output=True, text=True, - env={**os.environ, "MPLBACKEND": ""}) + env={**os.environ, "MPLBACKEND": "", "GCOV_ERROR_FILE": os.devnull} + ) out = proc.stdout err = proc.stderr @@ -40,18 +44,6 @@ def test_tinypages(tmp_path): html_dir = tmp_path / '_build' / 'html' img_dir = html_dir / '_images' doctree_dir = tmp_path / 'doctrees' - # Build the pages with warnings turned into errors - cmd = [sys.executable, '-msphinx', '-W', '-b', 'html', - '-d', str(doctree_dir), str(tinypages), str(html_dir)] - # On CI, gcov emits warnings (due to agg headers being included with the - # same name in multiple extension modules -- but we don't care about their - # coverage anyways); hide them using GCOV_ERROR_FILE. - proc = subprocess_run_for_testing( - cmd, capture_output=True, text=True, - env={**os.environ, "MPLBACKEND": "", "GCOV_ERROR_FILE": os.devnull} - ) - out = proc.stdout - err = proc.stderr # Build the pages with warnings turned into errors build_sphinx_html(tmp_path, doctree_dir, html_dir) @@ -185,13 +177,12 @@ def test_show_source_link_false(tmp_path, plot_html_show_source_link): def test_srcset_version(tmp_path): - shutil.copytree(tinypages, tmp_path, dirs_exist_ok=True) html_dir = tmp_path / '_build' / 'html' img_dir = html_dir / '_images' doctree_dir = tmp_path / 'doctrees' - build_sphinx_html(tmp_path, doctree_dir, html_dir, extra_args=[ - '-D', 'plot_srcset=2x']) + build_sphinx_html(tinypages, doctree_dir, html_dir, + extra_args=['-D', 'plot_srcset=2x']) def plot_file(num, suff=''): return img_dir / f'some_plots-{num}{suff}.png' From bb5bfb88b641e8266bf442ea498d05df3f8bcdc6 Mon Sep 17 00:00:00 2001 From: Marie Date: Fri, 23 May 2025 10:38:54 +0200 Subject: [PATCH 068/161] remove point troubling regex --- galleries/plot_types/basic/scatter_plot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galleries/plot_types/basic/scatter_plot.py b/galleries/plot_types/basic/scatter_plot.py index 07fa943b724f..738af15440db 100644 --- a/galleries/plot_types/basic/scatter_plot.py +++ b/galleries/plot_types/basic/scatter_plot.py @@ -2,7 +2,7 @@ ============= scatter(x, y) ============= -A scatter plot of y vs. x with varying marker size and/or color. +A scatter plot of y versus x with varying marker size and/or color. See `~matplotlib.axes.Axes.scatter`. """ From 731f45460b5fd50b1490f028701400e2b460388d Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 22 May 2025 04:04:16 -0400 Subject: [PATCH 069/161] Fix OffsetBox custom picker As with the custom picker, `Artist.contains` returns a boolean and a dictionary in a tuple. This non-empty tuple is always true, so the custom picker would always return True for any non-scroll event. It would also lose the related dictionary. --- lib/matplotlib/offsetbox.py | 4 +++- lib/matplotlib/tests/test_offsetbox.py | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/offsetbox.py b/lib/matplotlib/offsetbox.py index 6a3a122fc3e7..1e07125cdc2a 100644 --- a/lib/matplotlib/offsetbox.py +++ b/lib/matplotlib/offsetbox.py @@ -1504,7 +1504,9 @@ def __init__(self, ref_artist, use_blit=False): @staticmethod def _picker(artist, mouseevent): # A custom picker to prevent dragging on mouse scroll events - return (artist.contains(mouseevent) and mouseevent.name != "scroll_event"), {} + if mouseevent.name == "scroll_event": + return False, {} + return artist.contains(mouseevent) # A property, not an attribute, to maintain picklability. canvas = property(lambda self: self.ref_artist.get_figure(root=True).canvas) diff --git a/lib/matplotlib/tests/test_offsetbox.py b/lib/matplotlib/tests/test_offsetbox.py index f18fa7c777d1..d9791ff5bc20 100644 --- a/lib/matplotlib/tests/test_offsetbox.py +++ b/lib/matplotlib/tests/test_offsetbox.py @@ -460,3 +460,13 @@ def test_draggable_in_subfigure(): fig.canvas.draw() # Texts are non-pickable until the first draw. MouseEvent("button_press_event", fig.canvas, 1, 1)._process() assert ann._draggable.got_artist + # Stop dragging the annotation. + MouseEvent("button_release_event", fig.canvas, 1, 1)._process() + assert not ann._draggable.got_artist + # A scroll event should not initiate a drag. + MouseEvent("scroll_event", fig.canvas, 1, 1)._process() + assert not ann._draggable.got_artist + # An event outside the annotation should not initiate a drag. + bbox = ann.get_window_extent() + MouseEvent("button_press_event", fig.canvas, bbox.x1+2, bbox.y1+2)._process() + assert not ann._draggable.got_artist From 0b2c33e8ecd432767833886307b83a6ffe2a472e Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Fri, 23 May 2025 12:49:10 +0200 Subject: [PATCH 070/161] Fix tight-bbox computation of HostAxes. --- lib/mpl_toolkits/axes_grid1/parasite_axes.py | 3 +++ .../axes_grid1/tests/test_axes_grid1.py | 23 ++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/lib/mpl_toolkits/axes_grid1/parasite_axes.py b/lib/mpl_toolkits/axes_grid1/parasite_axes.py index f7bc2df6d7e0..fbc6e8141272 100644 --- a/lib/mpl_toolkits/axes_grid1/parasite_axes.py +++ b/lib/mpl_toolkits/axes_grid1/parasite_axes.py @@ -25,6 +25,9 @@ def clear(self): self._parent_axes.callbacks._connect_picklable( "ylim_changed", self._sync_lims) + def get_axes_locator(self): + return self._parent_axes.get_axes_locator() + def pick(self, mouseevent): # This most likely goes to Artist.pick (depending on axes_class given # to the factory), which only handles pick events registered on the diff --git a/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py b/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py index 496ce74d72c0..26f0aaa37de0 100644 --- a/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py +++ b/lib/mpl_toolkits/axes_grid1/tests/test_axes_grid1.py @@ -9,7 +9,7 @@ from matplotlib.backend_bases import MouseEvent from matplotlib.colors import LogNorm from matplotlib.patches import Circle, Ellipse -from matplotlib.transforms import Bbox, TransformedBbox +from matplotlib.transforms import Affine2D, Bbox, TransformedBbox from matplotlib.testing.decorators import ( check_figures_equal, image_comparison, remove_ticks_and_titles) @@ -26,6 +26,7 @@ from mpl_toolkits.axes_grid1.axes_rgb import RGBAxes from mpl_toolkits.axes_grid1.inset_locator import ( zoomed_inset_axes, mark_inset, inset_axes, BboxConnectorPatch) +from mpl_toolkits.axes_grid1.parasite_axes import HostAxes import mpl_toolkits.axes_grid1.mpl_axes import pytest @@ -467,6 +468,26 @@ def test_gettightbbox(): [-17.7, -13.9, 7.2, 5.4]) +def test_gettightbbox_parasite(): + fig = plt.figure() + + y0 = 0.3 + horiz = [Size.Scaled(1.0)] + vert = [Size.Scaled(1.0)] + ax0_div = Divider(fig, [0.1, y0, 0.8, 0.2], horiz, vert) + ax1_div = Divider(fig, [0.1, 0.5, 0.8, 0.4], horiz, vert) + + ax0 = fig.add_subplot( + xticks=[], yticks=[], axes_locator=ax0_div.new_locator(nx=0, ny=0)) + ax1 = fig.add_subplot( + axes_class=HostAxes, axes_locator=ax1_div.new_locator(nx=0, ny=0)) + aux_ax = ax1.get_aux_axes(Affine2D()) + + fig.canvas.draw() + rdr = fig.canvas.get_renderer() + assert rdr.get_canvas_width_height()[1] * y0 / fig.dpi == fig.get_tightbbox(rdr).y0 + + @pytest.mark.parametrize("click_on", ["big", "small"]) @pytest.mark.parametrize("big_on_axes,small_on_axes", [ ("gca", "gca"), From 04d26b243c1f11b1a8fb433a0c9ef8a71728e507 Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Sat, 24 May 2025 12:46:24 +0200 Subject: [PATCH 071/161] Simplify/improve error reporting from ft2font. Provide a simple macro to call a FreeType function and throw an exception if an error is returned, while also including the source file and line location for the error. For example, trying `FT2Font(open("pyproject.toml", "rb"))` now raises "FT_Open_Face (ft2font.cpp line 220) failed with error 0x2: unknown file format" instead of "Can not load face (unknown file format; error code 0x2)" --- src/ft2font.cpp | 108 ++++++++++++------------------------------------ src/ft2font.h | 31 ++++++++++++-- 2 files changed, 55 insertions(+), 84 deletions(-) diff --git a/src/ft2font.cpp b/src/ft2font.cpp index b2c2c0fa9bd1..bdfa2873ca80 100644 --- a/src/ft2font.cpp +++ b/src/ft2font.cpp @@ -43,26 +43,6 @@ FT_Library _ft2Library; -// FreeType error codes; loaded as per fterror.h. -static char const* ft_error_string(FT_Error error) { -#undef __FTERRORS_H__ -#define FT_ERROR_START_LIST switch (error) { -#define FT_ERRORDEF( e, v, s ) case v: return s; -#define FT_ERROR_END_LIST default: return NULL; } -#include FT_ERRORS_H -} - -void throw_ft_error(std::string message, FT_Error error) { - char const* s = ft_error_string(error); - std::ostringstream os(""); - if (s) { - os << message << " (" << s << "; error code 0x" << std::hex << error << ")"; - } else { // Should not occur, but don't add another error from failed lookup. - os << message << " (error code 0x" << std::hex << error << ")"; - } - throw std::runtime_error(os.str()); -} - FT2Image::FT2Image(unsigned long width, unsigned long height) : m_buffer((unsigned char *)calloc(width * height, 1)), m_width(width), m_height(height) { @@ -237,26 +217,16 @@ FT2Font::FT2Font(FT_Open_Args &open_args, kerning_factor(0) { clear(); - - FT_Error error = FT_Open_Face(_ft2Library, &open_args, 0, &face); - if (error) { - throw_ft_error("Can not load face", error); - } - - // set a default fontsize 12 pt at 72dpi - error = FT_Set_Char_Size(face, 12 * 64, 0, 72 * (unsigned int)hinting_factor, 72); - if (error) { - FT_Done_Face(face); - throw_ft_error("Could not set the fontsize", error); - } - + FT_CHECK(FT_Open_Face, _ft2Library, &open_args, 0, &face); if (open_args.stream != nullptr) { face->face_flags |= FT_FACE_FLAG_EXTERNAL_STREAM; } - - FT_Matrix transform = { 65536 / hinting_factor, 0, 0, 65536 }; - FT_Set_Transform(face, &transform, nullptr); - + try { + set_size(12., 72.); // Set a default fontsize 12 pt at 72dpi. + } catch (...) { + FT_Done_Face(face); + throw; + } // Set fallbacks std::copy(fallback_list.begin(), fallback_list.end(), std::back_inserter(fallbacks)); } @@ -293,11 +263,9 @@ void FT2Font::clear() void FT2Font::set_size(double ptsize, double dpi) { - FT_Error error = FT_Set_Char_Size( + FT_CHECK( + FT_Set_Char_Size, face, (FT_F26Dot6)(ptsize * 64), 0, (FT_UInt)(dpi * hinting_factor), (FT_UInt)dpi); - if (error) { - throw_ft_error("Could not set the fontsize", error); - } FT_Matrix transform = { 65536 / hinting_factor, 0, 0, 65536 }; FT_Set_Transform(face, &transform, nullptr); @@ -311,17 +279,12 @@ void FT2Font::set_charmap(int i) if (i >= face->num_charmaps) { throw std::runtime_error("i exceeds the available number of char maps"); } - FT_CharMap charmap = face->charmaps[i]; - if (FT_Error error = FT_Set_Charmap(face, charmap)) { - throw_ft_error("Could not set the charmap", error); - } + FT_CHECK(FT_Set_Charmap, face, face->charmaps[i]); } void FT2Font::select_charmap(unsigned long i) { - if (FT_Error error = FT_Select_Charmap(face, (FT_Encoding)i)) { - throw_ft_error("Could not set the charmap", error); - } + FT_CHECK(FT_Select_Charmap, face, (FT_Encoding)i); } int FT2Font::get_kerning(FT_UInt left, FT_UInt right, FT_Kerning_Mode mode, @@ -477,10 +440,10 @@ void FT2Font::load_char(long charcode, FT_Int32 flags, FT2Font *&ft_object, bool if (!was_found) { ft_glyph_warn(charcode, glyph_seen_fonts); if (charcode_error) { - throw_ft_error("Could not load charcode", charcode_error); + THROW_FT_ERROR("charcode loading", charcode_error); } else if (glyph_error) { - throw_ft_error("Could not load charcode", glyph_error); + THROW_FT_ERROR("charcode loading", glyph_error); } } else if (ft_object_with_glyph->warn_if_used) { ft_glyph_warn(charcode, glyph_seen_fonts); @@ -494,13 +457,9 @@ void FT2Font::load_char(long charcode, FT_Int32 flags, FT2Font *&ft_object, bool glyph_seen_fonts.insert((face != nullptr)?face->family_name: nullptr); ft_glyph_warn((FT_ULong)charcode, glyph_seen_fonts); } - if (FT_Error error = FT_Load_Glyph(face, glyph_index, flags)) { - throw_ft_error("Could not load charcode", error); - } + FT_CHECK(FT_Load_Glyph, face, glyph_index, flags); FT_Glyph thisGlyph; - if (FT_Error error = FT_Get_Glyph(face->glyph, &thisGlyph)) { - throw_ft_error("Could not get glyph", error); - } + FT_CHECK(FT_Get_Glyph, face->glyph, &thisGlyph); glyphs.push_back(thisGlyph); } } @@ -600,13 +559,9 @@ void FT2Font::load_glyph(FT_UInt glyph_index, void FT2Font::load_glyph(FT_UInt glyph_index, FT_Int32 flags) { - if (FT_Error error = FT_Load_Glyph(face, glyph_index, flags)) { - throw_ft_error("Could not load glyph", error); - } + FT_CHECK(FT_Load_Glyph, face, glyph_index, flags); FT_Glyph thisGlyph; - if (FT_Error error = FT_Get_Glyph(face->glyph, &thisGlyph)) { - throw_ft_error("Could not get glyph", error); - } + FT_CHECK(FT_Get_Glyph, face->glyph, &thisGlyph); glyphs.push_back(thisGlyph); } @@ -651,13 +606,10 @@ void FT2Font::draw_glyphs_to_bitmap(bool antialiased) image = py::array_t{{height, width}}; std::memset(image.mutable_data(0), 0, image.nbytes()); - for (auto & glyph : glyphs) { - FT_Error error = FT_Glyph_To_Bitmap( + for (auto & glyph: glyphs) { + FT_CHECK( + FT_Glyph_To_Bitmap, &glyph, antialiased ? FT_RENDER_MODE_NORMAL : FT_RENDER_MODE_MONO, nullptr, 1); - if (error) { - throw_ft_error("Could not convert glyph to bitmap", error); - } - FT_BitmapGlyph bitmap = (FT_BitmapGlyph)glyph; // now, draw to our target surface (convert position) @@ -681,16 +633,12 @@ void FT2Font::draw_glyph_to_bitmap( throw std::runtime_error("glyph num is out of range"); } - FT_Error error = FT_Glyph_To_Bitmap( - &glyphs[glyphInd], - antialiased ? FT_RENDER_MODE_NORMAL : FT_RENDER_MODE_MONO, - &sub_offset, // additional translation - 1 // destroy image - ); - if (error) { - throw_ft_error("Could not convert glyph to bitmap", error); - } - + FT_CHECK( + FT_Glyph_To_Bitmap, + &glyphs[glyphInd], + antialiased ? FT_RENDER_MODE_NORMAL : FT_RENDER_MODE_MONO, + &sub_offset, // additional translation + 1); // destroy image FT_BitmapGlyph bitmap = (FT_BitmapGlyph)glyphs[glyphInd]; draw_bitmap(im, &bitmap->bitmap, x + bitmap->left, y); @@ -715,9 +663,7 @@ void FT2Font::get_glyph_name(unsigned int glyph_number, std::string &buffer, throw std::runtime_error("Failed to convert glyph to standard name"); } } else { - if (FT_Error error = FT_Get_Glyph_Name(face, glyph_number, buffer.data(), buffer.size())) { - throw_ft_error("Could not get glyph names", error); - } + FT_CHECK(FT_Get_Glyph_Name, face, glyph_number, buffer.data(), buffer.size()); auto len = buffer.find('\0'); if (len != buffer.npos) { buffer.resize(len); diff --git a/src/ft2font.h b/src/ft2font.h index 209581d8f362..e1ebdb934329 100644 --- a/src/ft2font.h +++ b/src/ft2font.h @@ -6,6 +6,7 @@ #ifndef MPL_FT2FONT_H #define MPL_FT2FONT_H +#include #include #include #include @@ -26,12 +27,36 @@ extern "C" { #include namespace py = pybind11; -/* - By definition, FT_FIXED as 2 16bit values stored in a single long. - */ +// By definition, FT_FIXED as 2 16bit values stored in a single long. #define FIXED_MAJOR(val) (signed short)((val & 0xffff0000) >> 16) #define FIXED_MINOR(val) (unsigned short)(val & 0xffff) +// Error handling (error codes are loaded as described in fterror.h). +inline char const* ft_error_string(FT_Error error) { +#undef __FTERRORS_H__ +#define FT_ERROR_START_LIST switch (error) { +#define FT_ERRORDEF( e, v, s ) case v: return s; +#define FT_ERROR_END_LIST default: return NULL; } +#include FT_ERRORS_H +} + +// No more than 16 hex digits + "0x" + null byte for a 64-bit int error. +#define THROW_FT_ERROR(name, err) { \ + char buf[20] = {0}; \ + sprintf(buf, "%#04x", err); \ + throw std::runtime_error{ \ + name " (" \ + + std::filesystem::path(__FILE__).filename().string() \ + + " line " + std::to_string(__LINE__) + ") failed with error " \ + + std::string{buf} + ": " + std::string{ft_error_string(err)}}; \ +} (void)0 + +#define FT_CHECK(func, ...) { \ + if (auto const& error_ = func(__VA_ARGS__)) { \ + THROW_FT_ERROR(#func, error_); \ + } \ +} (void)0 + // the FreeType string rendered into a width, height buffer class FT2Image { From 05b0a4eee551783df1df7651a21ed77db68e8214 Mon Sep 17 00:00:00 2001 From: Ruth Comer <10599679+rcomer@users.noreply.github.com> Date: Mon, 26 May 2025 08:24:21 +0100 Subject: [PATCH 072/161] DOC: expand petroff10 example to include 6- and 8- styles --- galleries/examples/style_sheets/petroff10.py | 32 ++++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/galleries/examples/style_sheets/petroff10.py b/galleries/examples/style_sheets/petroff10.py index f6293fd40a6b..5683a4df296c 100644 --- a/galleries/examples/style_sheets/petroff10.py +++ b/galleries/examples/style_sheets/petroff10.py @@ -1,13 +1,13 @@ """ -===================== -Petroff10 style sheet -===================== +==================== +Petroff style sheets +==================== -This example demonstrates the "petroff10" style, which implements the 10-color -sequence developed by Matthew A. Petroff [1]_ for accessible data visualization. -The style balances aesthetics with accessibility considerations, making it -suitable for various types of plots while ensuring readability and distinction -between data series. +This example demonstrates the "petroffN" styles, which implement the 6-, 8- and +10-color sequences developed by Matthew A. Petroff [1]_ for accessible data +visualization. The styles balance aesthetics with accessibility considerations, +making them suitable for various types of plots while ensuring readability and +distinction between data series. .. [1] https://arxiv.org/abs/2107.02270 @@ -35,9 +35,15 @@ def image_and_patch_example(ax): c = plt.Circle((5, 5), radius=5, label='patch') ax.add_patch(c) -plt.style.use('petroff10') -fig, (ax1, ax2) = plt.subplots(ncols=2, figsize=(12, 5)) -fig.suptitle("'petroff10' style sheet") -colored_lines_example(ax1) -image_and_patch_example(ax2) + +fig = plt.figure(figsize=(6.4, 9.6), layout='compressed') +sfigs = fig.subfigures(nrows=3) + +for style, sfig in zip(['petroff6', 'petroff8', 'petroff10'], sfigs): + sfig.suptitle(f"'{style}' style sheet") + with plt.style.context(style): + ax1, ax2 = sfig.subplots(ncols=2) + colored_lines_example(ax1) + image_and_patch_example(ax2) + plt.show() From 4af03f44b6be8dce3651d7a93a593e110998dbe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trygve=20Magnus=20R=C3=A6der?= Date: Mon, 26 May 2025 20:16:00 +0200 Subject: [PATCH 073/161] Update to docs with regards to colorbar and colorizer --- .../images_contours_and_fields/multi_image.py | 46 ++++++------------- .../users_explain/colors/colorbar_only.py | 37 ++++++++++----- lib/matplotlib/colorbar.py | 12 +++-- lib/matplotlib/figure.py | 9 ++-- 4 files changed, 51 insertions(+), 53 deletions(-) diff --git a/galleries/examples/images_contours_and_fields/multi_image.py b/galleries/examples/images_contours_and_fields/multi_image.py index 4e6f6cc54a79..9769dbf5219d 100644 --- a/galleries/examples/images_contours_and_fields/multi_image.py +++ b/galleries/examples/images_contours_and_fields/multi_image.py @@ -11,15 +11,16 @@ value *x* in the image). If we want one colorbar to be representative for multiple images, we have -to explicitly ensure consistent data coloring by using the same data -normalization for all the images. We ensure this by explicitly creating a -``norm`` object that we pass to all the image plotting methods. +to explicitly ensure consistent data coloring by using the same +data-to-color pipeline for all the images. We ensure this by explicitly +creating a `matplotlib.colorizer.Colorizer` object that we pass to all +the image plotting methods. """ import matplotlib.pyplot as plt import numpy as np -from matplotlib import colors +import matplotlib as mpl np.random.seed(19680801) @@ -31,12 +32,13 @@ fig, axs = plt.subplots(2, 2) fig.suptitle('Multiple images') -# create a single norm to be shared across all images -norm = colors.Normalize(vmin=np.min(datasets), vmax=np.max(datasets)) +# create a single norm and colorizer to be shared across all images +norm = mpl.colors.Normalize(vmin=np.min(datasets), vmax=np.max(datasets)) +colorizer = mpl.colorizer.Colorizer(norm=norm) images = [] for ax, data in zip(axs.flat, datasets): - images.append(ax.imshow(data, norm=norm)) + images.append(ax.imshow(data, colorizer=colorizer)) fig.colorbar(images[0], ax=axs, orientation='horizontal', fraction=.1) @@ -45,30 +47,10 @@ # %% # The colors are now kept consistent across all images when changing the # scaling, e.g. through zooming in the colorbar or via the "edit axis, -# curves and images parameters" GUI of the Qt backend. This is sufficient -# for most practical use cases. -# -# Advanced: Additionally sync the colormap -# ---------------------------------------- -# -# Sharing a common norm object guarantees synchronized scaling because scale -# changes modify the norm object in-place and thus propagate to all images -# that use this norm. This approach does not help with synchronizing colormaps -# because changing the colormap of an image (e.g. through the "edit axis, -# curves and images parameters" GUI of the Qt backend) results in the image -# referencing the new colormap object. Thus, the other images are not updated. -# -# To update the other images, sync the -# colormaps using the following code:: -# -# def sync_cmaps(changed_image): -# for im in images: -# if changed_image.get_cmap() != im.get_cmap(): -# im.set_cmap(changed_image.get_cmap()) -# -# for im in images: -# im.callbacks.connect('changed', sync_cmaps) -# +# curves and images parameters" GUI of the Qt backend. Additionally, +# if the colormap of the colorizer is changed, (e.g. through the "edit +# axis, curves and images parameters" GUI of the Qt backend) this change +# propagates to the other plots and the colorbar. # # .. admonition:: References # @@ -77,6 +59,6 @@ # # - `matplotlib.axes.Axes.imshow` / `matplotlib.pyplot.imshow` # - `matplotlib.figure.Figure.colorbar` / `matplotlib.pyplot.colorbar` +# - `matplotlib.colorizer.Colorizer` # - `matplotlib.colors.Normalize` -# - `matplotlib.cm.ScalarMappable.set_cmap` # - `matplotlib.cbook.CallbackRegistry.connect` diff --git a/galleries/users_explain/colors/colorbar_only.py b/galleries/users_explain/colors/colorbar_only.py index a3f1d62042f4..ee97e91162ae 100644 --- a/galleries/users_explain/colors/colorbar_only.py +++ b/galleries/users_explain/colors/colorbar_only.py @@ -8,10 +8,11 @@ This tutorial shows how to build and customize standalone colorbars, i.e. without an attached plot. -A `~.Figure.colorbar` needs a "mappable" (`matplotlib.cm.ScalarMappable`) -object (typically, an image) which indicates the colormap and the norm to be -used. In order to create a colorbar without an attached image, one can instead -use a `.ScalarMappable` with no associated data. +A `~.Figure.colorbar` needs a "mappable" (`matplotlib.colorizer.ColorizingArtist`) +object (typically, an image) which contains a colorizer +(`matplotlib.colorizer.Colorizer`) that holds the data-to-color pipeline (norm and +colormap). In order to create a colorbar without an attached image, one can instead +use a `.ColorizingArtist` with no associated data. """ import matplotlib.pyplot as plt @@ -23,9 +24,11 @@ # ------------------------- # Here, we create a basic continuous colorbar with ticks and labels. # -# The arguments to the `~.Figure.colorbar` call are the `.ScalarMappable` -# (constructed using the *norm* and *cmap* arguments), the axes where the -# colorbar should be drawn, and the colorbar's orientation. +# The arguments to the `~.Figure.colorbar` call are a `.ColorizingArtist`, +# the axes where the colorbar should be drawn, and the colorbar's orientation. +# To crate a `.ColorizingArtist` one must first make `.Colorizer` that holds the +# desired *norm* and *cmap*. +# # # For more information see the `~matplotlib.colorbar` API. @@ -33,7 +36,9 @@ norm = mpl.colors.Normalize(vmin=5, vmax=10) -fig.colorbar(mpl.cm.ScalarMappable(norm=norm, cmap="cool"), +colorizer = mpl.colorizer.Colorizer(norm=norm, cmap="cool") + +fig.colorbar(mpl.colorizer.ColorizingArtist(colorizer), cax=ax, orientation='horizontal', label='Some Units') # %% @@ -47,7 +52,9 @@ fig, ax = plt.subplots(layout='constrained') -fig.colorbar(mpl.cm.ScalarMappable(norm=mpl.colors.Normalize(0, 1), cmap='magma'), +colorizer = mpl.colorizer.Colorizer(norm=mpl.colors.Normalize(0, 1), cmap='magma') + +fig.colorbar(mpl.colorizer.ColorizingArtist(colorizer), ax=ax, orientation='vertical', label='a colorbar label') # %% @@ -65,7 +72,9 @@ bounds = [-1, 2, 5, 7, 12, 15] norm = mpl.colors.BoundaryNorm(bounds, cmap.N, extend='both') -fig.colorbar(mpl.cm.ScalarMappable(norm=norm, cmap="viridis"), +colorizer = mpl.colorizer.Colorizer(norm=norm, cmap='viridis') + +fig.colorbar(mpl.colorizer.ColorizingArtist(colorizer), cax=ax, orientation='horizontal', label="Discrete intervals with extend='both' keyword") @@ -94,8 +103,10 @@ bounds = [1, 2, 4, 7, 8] norm = mpl.colors.BoundaryNorm(bounds, cmap.N) +colorizer = mpl.colorizer.Colorizer(norm=norm, cmap=cmap) + fig.colorbar( - mpl.cm.ScalarMappable(cmap=cmap, norm=norm), + mpl.colorizer.ColorizingArtist(colorizer), cax=ax, orientation='horizontal', extend='both', spacing='proportional', @@ -116,8 +127,10 @@ bounds = [-1.0, -0.5, 0.0, 0.5, 1.0] norm = mpl.colors.BoundaryNorm(bounds, cmap.N) +colorizer = mpl.colorizer.Colorizer(norm=norm, cmap=cmap) + fig.colorbar( - mpl.cm.ScalarMappable(cmap=cmap, norm=norm), + mpl.colorizer.ColorizingArtist(colorizer), cax=ax, orientation='horizontal', extend='both', extendfrac='auto', spacing='uniform', diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py index db33698c5514..19bdbe605d88 100644 --- a/lib/matplotlib/colorbar.py +++ b/lib/matplotlib/colorbar.py @@ -16,8 +16,9 @@ import numpy as np import matplotlib as mpl -from matplotlib import _api, cbook, collections, cm, colors, contour, ticker +from matplotlib import _api, cbook, collections, colors, contour, ticker import matplotlib.artist as martist +import matplotlib.colorizer as mcolorizer import matplotlib.patches as mpatches import matplotlib.path as mpath import matplotlib.spines as mspines @@ -199,12 +200,12 @@ class Colorbar: Draw a colorbar in an existing Axes. Typically, colorbars are created using `.Figure.colorbar` or - `.pyplot.colorbar` and associated with `.ScalarMappable`\s (such as an + `.pyplot.colorbar` and associated with `.ColorizingArtist`\s (such as an `.AxesImage` generated via `~.axes.Axes.imshow`). In order to draw a colorbar not associated with other elements in the figure, e.g. when showing a colormap by itself, one can create an empty - `.ScalarMappable`, or directly pass *cmap* and *norm* instead of *mappable* + `.ColorizingArtist`, or directly pass *cmap* and *norm* instead of *mappable* to `Colorbar`. Useful public methods are :meth:`set_label` and :meth:`add_lines`. @@ -244,7 +245,7 @@ def __init__( ax : `~matplotlib.axes.Axes` The `~.axes.Axes` instance in which the colorbar is drawn. - mappable : `.ScalarMappable` + mappable : `.ColorizingArtist` The mappable whose colormap and norm will be used. To show the colors versus index instead of on a 0-1 scale, set the @@ -288,7 +289,8 @@ def __init__( colorbar and at the right for a vertical. """ if mappable is None: - mappable = cm.ScalarMappable(norm=norm, cmap=cmap) + colorizer = mcolorizer.Colorizer(norm=norm, cmap=cmap) + mappable = mcolorizer.ColorizingArtist(colorizer) self.mappable = mappable cmap = mappable.cmap diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py index bf4e2253324f..c15da7597acd 100644 --- a/lib/matplotlib/figure.py +++ b/lib/matplotlib/figure.py @@ -1200,17 +1200,18 @@ def colorbar( Parameters ---------- mappable - The `matplotlib.cm.ScalarMappable` (i.e., `.AxesImage`, + The `matplotlib.colorizer.ColorizingArtist` (i.e., `.AxesImage`, `.ContourSet`, etc.) described by this colorbar. This argument is mandatory for the `.Figure.colorbar` method but optional for the `.pyplot.colorbar` function, which sets the default to the current image. - Note that one can create a `.ScalarMappable` "on-the-fly" to - generate colorbars not attached to a previously drawn artist, e.g. + Note that one can create a `.colorizer.ColorizingArtist` "on-the-fly" + to generate colorbars not attached to a previously drawn artist, e.g. :: - fig.colorbar(cm.ScalarMappable(norm=norm, cmap=cmap), ax=ax) + cr = colorizer.Colorizer(norm=norm, cmap=cmap) + fig.colorbar(colorizer.ColorizingArtist(cr), ax=ax) cax : `~matplotlib.axes.Axes`, optional Axes into which the colorbar will be drawn. If `None`, then a new From 46255ae65bf61d0defae7729ec826189c7016189 Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Fri, 23 May 2025 14:08:57 +0200 Subject: [PATCH 074/161] Use fix-cm instead of type1cm. ... to fix unicode glyph sizing issues for svg & patheffects. --- doc/install/dependencies.rst | 3 ++- lib/matplotlib/mpl-data/matplotlibrc | 2 +- .../mpl-data/stylelib/classic.mplstyle | 4 ++-- lib/matplotlib/tests/test_backend_svg.py | 2 +- lib/matplotlib/tests/test_usetex.py | 7 +++++++ lib/matplotlib/texmanager.py | 19 ++++++++++++------- 6 files changed, 25 insertions(+), 12 deletions(-) diff --git a/doc/install/dependencies.rst b/doc/install/dependencies.rst index 712846771cc6..4b006d9016e2 100644 --- a/doc/install/dependencies.rst +++ b/doc/install/dependencies.rst @@ -443,7 +443,8 @@ will often automatically include these collections. | | `lm `_, | | | `txfonts `_ | +-----------------------------+--------------------------------------------------+ -| collection-latex | `geometry `_, | +| collection-latex | `fix-cm `_, | +| | `geometry `_, | | | `hyperref `_, | | | `latex `_, | | | latex-bin, | diff --git a/lib/matplotlib/mpl-data/matplotlibrc b/lib/matplotlib/mpl-data/matplotlibrc index acb131c82e6c..780dcd377041 100644 --- a/lib/matplotlib/mpl-data/matplotlibrc +++ b/lib/matplotlib/mpl-data/matplotlibrc @@ -339,7 +339,7 @@ # become quite long. # The following packages are always loaded with usetex, # so beware of package collisions: - # geometry, inputenc, type1cm. + # color, fix-cm, geometry, graphicx, textcomp. # PostScript (PSNFSS) font packages may also be # loaded, depending on your font settings. diff --git a/lib/matplotlib/mpl-data/stylelib/classic.mplstyle b/lib/matplotlib/mpl-data/stylelib/classic.mplstyle index 6cba66076ac7..92624503f99e 100644 --- a/lib/matplotlib/mpl-data/stylelib/classic.mplstyle +++ b/lib/matplotlib/mpl-data/stylelib/classic.mplstyle @@ -122,8 +122,8 @@ text.latex.preamble : # IMPROPER USE OF THIS FEATURE WILL LEAD TO LATEX FAILURE # Note that it has to be put on a single line, which may # become quite long. # The following packages are always loaded with usetex, so - # beware of package collisions: color, geometry, graphicx, - # type1cm, textcomp. + # beware of package collisions: + # color, fix-cm, geometry, graphicx, textcomp. # Adobe Postscript (PSSNFS) font packages may also be # loaded, depending on your font settings. diff --git a/lib/matplotlib/tests/test_backend_svg.py b/lib/matplotlib/tests/test_backend_svg.py index d2d4042870a1..2c64b7c24b3e 100644 --- a/lib/matplotlib/tests/test_backend_svg.py +++ b/lib/matplotlib/tests/test_backend_svg.py @@ -216,7 +216,7 @@ def test_unicode_won(): tree = xml.etree.ElementTree.fromstring(buf) ns = 'http://www.w3.org/2000/svg' - won_id = 'SFSS3583-8e' + won_id = 'SFSS1728-8e' assert len(tree.findall(f'.//{{{ns}}}path[@d][@id="{won_id}"]')) == 1 assert f'#{won_id}' in tree.find(f'.//{{{ns}}}use').attrib.values() diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py index c7658c4f42ac..0b6d6d5e5535 100644 --- a/lib/matplotlib/tests/test_usetex.py +++ b/lib/matplotlib/tests/test_usetex.py @@ -185,3 +185,10 @@ def test_rotation(): # 'My' checks full height letters plus descenders. ax.text(x, y, f"$\\mathrm{{My {text[ha]}{text[va]} {angle}}}$", rotation=angle, horizontalalignment=ha, verticalalignment=va) + + +def test_unicode_sizing(): + tp = mpl.textpath.TextToPath() + scale1 = tp.get_glyphs_tex(mpl.font_manager.FontProperties(), "W")[0][0][3] + scale2 = tp.get_glyphs_tex(mpl.font_manager.FontProperties(), r"\textwon")[0][0][3] + assert scale1 == scale2 diff --git a/lib/matplotlib/texmanager.py b/lib/matplotlib/texmanager.py index 94fc94e9e840..020a26e31cbe 100644 --- a/lib/matplotlib/texmanager.py +++ b/lib/matplotlib/texmanager.py @@ -67,6 +67,13 @@ class TexManager: _grey_arrayd = {} _font_families = ('serif', 'sans-serif', 'cursive', 'monospace') + # Check for the cm-super package (which registers unicode computer modern + # support just by being installed) without actually loading any package + # (because we already load the incompatible fix-cm). + _check_cmsuper_installed = ( + r'\IfFileExists{type1ec.sty}{}{\PackageError{matplotlib-support}{' + r'Missing cm-super package, required by Matplotlib}{}}' + ) _font_preambles = { 'new century schoolbook': r'\renewcommand{\rmdefault}{pnc}', 'bookman': r'\renewcommand{\rmdefault}{pbk}', @@ -80,13 +87,10 @@ class TexManager: 'helvetica': r'\usepackage{helvet}', 'avant garde': r'\usepackage{avant}', 'courier': r'\usepackage{courier}', - # Loading the type1ec package ensures that cm-super is installed, which - # is necessary for Unicode computer modern. (It also allows the use of - # computer modern at arbitrary sizes, but that's just a side effect.) - 'monospace': r'\usepackage{type1ec}', - 'computer modern roman': r'\usepackage{type1ec}', - 'computer modern sans serif': r'\usepackage{type1ec}', - 'computer modern typewriter': r'\usepackage{type1ec}', + 'monospace': _check_cmsuper_installed, + 'computer modern roman': _check_cmsuper_installed, + 'computer modern sans serif': _check_cmsuper_installed, + 'computer modern typewriter': _check_cmsuper_installed, } _font_types = { 'new century schoolbook': 'serif', @@ -200,6 +204,7 @@ def _get_tex_source(cls, tex, fontsize): font_preamble, fontcmd = cls._get_font_preamble_and_command() baselineskip = 1.25 * fontsize return "\n".join([ + r"\RequirePackage{fix-cm}", r"\documentclass{article}", r"% Pass-through \mathdefault, which is used in non-usetex mode", r"% to use the default text font but was historically suppressed", From b18407b13a89e7b13c238bf7b13a06222fc18626 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 May 2025 17:20:42 +0200 Subject: [PATCH 075/161] Bump scientific-python/circleci-artifacts-redirector-action (#30113) Bumps the actions group with 1 update: [scientific-python/circleci-artifacts-redirector-action](https://github.com/scientific-python/circleci-artifacts-redirector-action). Updates `scientific-python/circleci-artifacts-redirector-action` from 1.0.0 to 1.1.0 - [Release notes](https://github.com/scientific-python/circleci-artifacts-redirector-action/releases) - [Commits](https://github.com/scientific-python/circleci-artifacts-redirector-action/compare/4e13a10d89177f4bfc8007a7064bdbeda848d8d1...7eafdb60666f57706a5525a2f5eb76224dc8779b) --- updated-dependencies: - dependency-name: scientific-python/circleci-artifacts-redirector-action dependency-version: 1.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/circleci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/circleci.yml b/.github/workflows/circleci.yml index f0ae304882e7..d61db3f14345 100644 --- a/.github/workflows/circleci.yml +++ b/.github/workflows/circleci.yml @@ -11,7 +11,7 @@ jobs: steps: - name: GitHub Action step uses: - scientific-python/circleci-artifacts-redirector-action@4e13a10d89177f4bfc8007a7064bdbeda848d8d1 # v1.0.0 + scientific-python/circleci-artifacts-redirector-action@7eafdb60666f57706a5525a2f5eb76224dc8779b # v1.1.0 with: repo-token: ${{ secrets.GITHUB_TOKEN }} api-token: ${{ secrets.CIRCLECI_TOKEN }} From 42f1905ce52625034f6b029a7e3e4737f3cf13b3 Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Thu, 29 May 2025 17:24:16 +0200 Subject: [PATCH 076/161] Fix _is_tensorflow_array. (#30114) The previous implementation was clearly wrong (the isinstance check would raise TypeError as the second argument would be a bool), but the tests didn't catch that because the bug led to _is_tensorflow_array returning False, then _unpack_to_numpy returning the original input, and then assert_array_equal implicitly converting `result` by calling `__array__` on it. Fix the test by explicitly checking that `result` is indeed a numpy array, and also fix _is_tensorflow_array with more restrictive exception catching (also applied to _is_torch_array, _is_jax_array, and _is_pandas_dataframe, while we're at it). --- lib/matplotlib/cbook.py | 78 +++++++++++++++--------------- lib/matplotlib/tests/test_cbook.py | 3 ++ 2 files changed, 43 insertions(+), 38 deletions(-) diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py index 10048f1be782..3100cc4da81d 100644 --- a/lib/matplotlib/cbook.py +++ b/lib/matplotlib/cbook.py @@ -2331,42 +2331,56 @@ def _picklable_class_constructor(mixin_class, fmt, attr_name, base_class): def _is_torch_array(x): - """Check if 'x' is a PyTorch Tensor.""" + """Return whether *x* is a PyTorch Tensor.""" try: - # we're intentionally not attempting to import torch. If somebody - # has created a torch array, torch should already be in sys.modules - return isinstance(x, sys.modules['torch'].Tensor) - except Exception: # TypeError, KeyError, AttributeError, maybe others? - # we're attempting to access attributes on imported modules which - # may have arbitrary user code, so we deliberately catch all exceptions - return False + # We're intentionally not attempting to import torch. If somebody + # has created a torch array, torch should already be in sys.modules. + tp = sys.modules.get("torch").Tensor + except AttributeError: + return False # Module not imported or a nonstandard module with no Tensor attr. + return (isinstance(tp, type) # Just in case it's a very nonstandard module. + and isinstance(x, tp)) def _is_jax_array(x): - """Check if 'x' is a JAX Array.""" + """Return whether *x* is a JAX Array.""" try: - # we're intentionally not attempting to import jax. If somebody - # has created a jax array, jax should already be in sys.modules - return isinstance(x, sys.modules['jax'].Array) - except Exception: # TypeError, KeyError, AttributeError, maybe others? - # we're attempting to access attributes on imported modules which - # may have arbitrary user code, so we deliberately catch all exceptions - return False + # We're intentionally not attempting to import jax. If somebody + # has created a jax array, jax should already be in sys.modules. + tp = sys.modules.get("jax").Array + except AttributeError: + return False # Module not imported or a nonstandard module with no Array attr. + return (isinstance(tp, type) # Just in case it's a very nonstandard module. + and isinstance(x, tp)) + + +def _is_pandas_dataframe(x): + """Check if *x* is a Pandas DataFrame.""" + try: + # We're intentionally not attempting to import Pandas. If somebody + # has created a Pandas DataFrame, Pandas should already be in sys.modules. + tp = sys.modules.get("pandas").DataFrame + except AttributeError: + return False # Module not imported or a nonstandard module with no Array attr. + return (isinstance(tp, type) # Just in case it's a very nonstandard module. + and isinstance(x, tp)) def _is_tensorflow_array(x): - """Check if 'x' is a TensorFlow Tensor or Variable.""" + """Return whether *x* is a TensorFlow Tensor or Variable.""" try: - # we're intentionally not attempting to import TensorFlow. If somebody - # has created a TensorFlow array, TensorFlow should already be in sys.modules - # we use `is_tensor` to not depend on the class structure of TensorFlow - # arrays, as `tf.Variables` are not instances of `tf.Tensor` - # (they both convert the same way) - return isinstance(x, sys.modules['tensorflow'].is_tensor(x)) - except Exception: # TypeError, KeyError, AttributeError, maybe others? - # we're attempting to access attributes on imported modules which - # may have arbitrary user code, so we deliberately catch all exceptions + # We're intentionally not attempting to import TensorFlow. If somebody + # has created a TensorFlow array, TensorFlow should already be in + # sys.modules we use `is_tensor` to not depend on the class structure + # of TensorFlow arrays, as `tf.Variables` are not instances of + # `tf.Tensor` (they both convert the same way). + is_tensor = sys.modules.get("tensorflow").is_tensor + except AttributeError: return False + try: + return is_tensor(x) + except Exception: + return False # Just in case it's a very nonstandard module. def _unpack_to_numpy(x): @@ -2421,15 +2435,3 @@ def _auto_format_str(fmt, value): return fmt % (value,) except (TypeError, ValueError): return fmt.format(value) - - -def _is_pandas_dataframe(x): - """Check if 'x' is a Pandas DataFrame.""" - try: - # we're intentionally not attempting to import Pandas. If somebody - # has created a Pandas DataFrame, Pandas should already be in sys.modules - return isinstance(x, sys.modules['pandas'].DataFrame) - except Exception: # TypeError, KeyError, AttributeError, maybe others? - # we're attempting to access attributes on imported modules which - # may have arbitrary user code, so we deliberately catch all exceptions - return False diff --git a/lib/matplotlib/tests/test_cbook.py b/lib/matplotlib/tests/test_cbook.py index 7cb057cf4723..9b97d8e7e231 100644 --- a/lib/matplotlib/tests/test_cbook.py +++ b/lib/matplotlib/tests/test_cbook.py @@ -1000,6 +1000,7 @@ def __array__(self): torch_tensor = torch.Tensor(data) result = cbook._unpack_to_numpy(torch_tensor) + assert isinstance(result, np.ndarray) # compare results, do not check for identity: the latter would fail # if not mocked, and the implementation does not guarantee it # is the same Python object, just the same values. @@ -1028,6 +1029,7 @@ def __array__(self): jax_array = jax.Array(data) result = cbook._unpack_to_numpy(jax_array) + assert isinstance(result, np.ndarray) # compare results, do not check for identity: the latter would fail # if not mocked, and the implementation does not guarantee it # is the same Python object, just the same values. @@ -1057,6 +1059,7 @@ def __array__(self): tf_tensor = tensorflow.Tensor(data) result = cbook._unpack_to_numpy(tf_tensor) + assert isinstance(result, np.ndarray) # compare results, do not check for identity: the latter would fail # if not mocked, and the implementation does not guarantee it # is the same Python object, just the same values. From ea5d85f67d4aeda04a94e3842217f89130e62cea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Thu, 29 May 2025 18:01:29 +0300 Subject: [PATCH 077/161] Add some types to _mathtext.py Mypy 1.16.0 flags errors here: lib/matplotlib/_mathtext.py:2531: error: "Node" has no attribute "width" [attr-defined] lib/matplotlib/_mathtext.py:2608: error: List item 0 has incompatible type "Kern"; expected "Hlist | Vlist" [list-item] The check for the attribute _metrics is equivalent to checking for an instance of Char, since only Char and its subclasses set self._metrics. Mypy infers an unnecessarily tight type list[Hlist | Vlist] for spaced_nucleus so we give it a more general one. --- lib/matplotlib/_mathtext.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/matplotlib/_mathtext.py b/lib/matplotlib/_mathtext.py index a528a65ca3cb..19ddbb6d0883 100644 --- a/lib/matplotlib/_mathtext.py +++ b/lib/matplotlib/_mathtext.py @@ -2524,10 +2524,10 @@ def subsuper(self, s: str, loc: int, toks: ParseResults) -> T.Any: if len(new_children): # remove last kern if (isinstance(new_children[-1], Kern) and - hasattr(new_children[-2], '_metrics')): + isinstance(new_children[-2], Char)): new_children = new_children[:-1] last_char = new_children[-1] - if hasattr(last_char, '_metrics'): + if isinstance(last_char, Char): last_char.width = last_char._metrics.advance # create new Hlist without kerning nucleus = Hlist(new_children, do_kern=False) @@ -2603,7 +2603,7 @@ def subsuper(self, s: str, loc: int, toks: ParseResults) -> T.Any: # Do we need to add a space after the nucleus? # To find out, check the flag set by operatorname - spaced_nucleus = [nucleus, x] + spaced_nucleus: list[Node] = [nucleus, x] if self._in_subscript_or_superscript: spaced_nucleus += [self._make_space(self._space_widths[r'\,'])] self._in_subscript_or_superscript = False From 48a9d7ccb8024912e67c4317c9ef39ce8badf16b Mon Sep 17 00:00:00 2001 From: Oscar Gustafsson Date: Thu, 29 May 2025 11:52:24 +0200 Subject: [PATCH 078/161] CI: Skip jobs on forks --- .github/workflows/cibuildwheel.yml | 38 +++++++++++++++------------ .github/workflows/codeql-analysis.yml | 1 + .github/workflows/conflictcheck.yml | 1 + 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index 9ced8e2f5060..a05d3ccc330c 100644 --- a/.github/workflows/cibuildwheel.yml +++ b/.github/workflows/cibuildwheel.yml @@ -24,14 +24,16 @@ permissions: jobs: build_sdist: if: >- - github.event_name == 'push' || - github.event_name == 'pull_request' && ( - ( - github.event.action == 'labeled' && - github.event.label.name == 'CI: Run cibuildwheel' - ) || - contains(github.event.pull_request.labels.*.name, - 'CI: Run cibuildwheel') + github.repository == 'matplotlib/matplotlib' && ( + github.event_name == 'push' || + github.event_name == 'pull_request' && ( + ( + github.event.action == 'labeled' && + github.event.label.name == 'CI: Run cibuildwheel' + ) || + contains(github.event.pull_request.labels.*.name, + 'CI: Run cibuildwheel') + ) ) name: Build sdist runs-on: ubuntu-latest @@ -78,14 +80,16 @@ jobs: build_wheels: if: >- - github.event_name == 'push' || - github.event_name == 'pull_request' && ( - ( - github.event.action == 'labeled' && - github.event.label.name == 'CI: Run cibuildwheel' - ) || - contains(github.event.pull_request.labels.*.name, - 'CI: Run cibuildwheel') + github.repository == 'matplotlib/matplotlib' && ( + github.event_name == 'push' || + github.event_name == 'pull_request' && ( + ( + github.event.action == 'labeled' && + github.event.label.name == 'CI: Run cibuildwheel' + ) || + contains(github.event.pull_request.labels.*.name, + 'CI: Run cibuildwheel') + ) ) needs: build_sdist name: Build wheels on ${{ matrix.os }} for ${{ matrix.cibw_archs }} @@ -183,7 +187,7 @@ jobs: if-no-files-found: error publish: - if: github.event_name == 'push' && github.ref_type == 'tag' + if: github.repository == 'matplotlib/matplotlib' && github.event_name == 'push' && github.ref_type == 'tag' name: Upload release to PyPI needs: [build_sdist, build_wheels] runs-on: ubuntu-latest diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 0e8c723bb6f8..3f71e1369834 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -12,6 +12,7 @@ on: jobs: analyze: + if: github.repository == 'matplotlib/matplotlib' name: Analyze runs-on: ubuntu-latest permissions: diff --git a/.github/workflows/conflictcheck.yml b/.github/workflows/conflictcheck.yml index c426c4d6c399..f4a687cd28d7 100644 --- a/.github/workflows/conflictcheck.yml +++ b/.github/workflows/conflictcheck.yml @@ -11,6 +11,7 @@ on: jobs: main: + if: github.repository == 'matplotlib/matplotlib' runs-on: ubuntu-latest permissions: pull-requests: write From 76d8b3cfdd9247834f25f4c2aacd7f6dc863e5b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Thu, 22 Jul 2021 16:26:04 +0300 Subject: [PATCH 079/161] Type-1 subsetting This reduces pdf file sizes when usetex is active, at the cost of some complexity in the code. We implement a charstring bytecode interpreter to keep track of subroutine calls in font programs. Give dviread.DviFont a fake filename attribute and a get_fontmap method for character tracking. In backend_pdf.py, refactor _get_subsetted_psname so it calls a method _get_subset_prefix, and reuse that to create tags for Type-1 fonts. Mark the methods static since they don't use anything from the instance. Recommend merging to main to give people time to test this, not to a 3.10 point release. Closes #127. Co-Authored-By: Elliott Sales de Andrade --- doc/users/next_whats_new/type1_subset.rst | 9 + lib/matplotlib/_type1font.py | 345 +++++++++++++++++- lib/matplotlib/backends/backend_pdf.py | 84 +++-- lib/matplotlib/dviread.py | 23 +- lib/matplotlib/dviread.pyi | 2 + .../font-bitstream-charter.pdf | Bin 0 -> 12990 bytes .../test_backend_pdf/font-dejavusans.pdf | Bin 0 -> 33413 bytes .../test_backend_pdf/font-heuristica.pdf | Bin 0 -> 56185 bytes lib/matplotlib/tests/test_backend_pdf.py | 52 ++- lib/matplotlib/tests/test_usetex.py | 64 ++++ 10 files changed, 536 insertions(+), 43 deletions(-) create mode 100644 doc/users/next_whats_new/type1_subset.rst create mode 100644 lib/matplotlib/tests/baseline_images/test_backend_pdf/font-bitstream-charter.pdf create mode 100644 lib/matplotlib/tests/baseline_images/test_backend_pdf/font-dejavusans.pdf create mode 100644 lib/matplotlib/tests/baseline_images/test_backend_pdf/font-heuristica.pdf diff --git a/doc/users/next_whats_new/type1_subset.rst b/doc/users/next_whats_new/type1_subset.rst new file mode 100644 index 000000000000..b0ab0a4337e6 --- /dev/null +++ b/doc/users/next_whats_new/type1_subset.rst @@ -0,0 +1,9 @@ +PDF files created with usetex now embed subsets of Type 1 fonts +--------------------------------------------------------------- + +When using the PDF backend with the usetex feature, +Matplotlib calls TeX to render the text and formulas in the figure. +The fonts that get used are usually "Type 1" fonts. +They used to be embedded in full +but are now limited to the glyphs that are actually used in the figure. +This reduces the size of the resulting PDF files. diff --git a/lib/matplotlib/_type1font.py b/lib/matplotlib/_type1font.py index 032b6a42ea63..e6b9148663ef 100644 --- a/lib/matplotlib/_type1font.py +++ b/lib/matplotlib/_type1font.py @@ -3,7 +3,7 @@ This version reads pfa and pfb files and splits them for embedding in pdf files. It also supports SlantFont and ExtendFont transformations, -similarly to pdfTeX and friends. There is no support yet for subsetting. +similarly to pdfTeX and friends. Usage:: @@ -11,6 +11,7 @@ clear_part, encrypted_part, finale = font.parts slanted_font = font.transform({'slant': 0.167}) extended_font = font.transform({'extend': 1.2}) + subset_font = font.subset([ord(c) for c in 'Hello World']) Sources: @@ -25,6 +26,7 @@ import binascii import functools +import itertools import logging import re import string @@ -637,8 +639,7 @@ def _parse_subrs(self, tokens, _data): return array, next(tokens).endpos() - @staticmethod - def _parse_charstrings(tokens, _data): + def _parse_charstrings(self, tokens, _data): count_token = next(tokens) if not count_token.is_number(): raise RuntimeError( @@ -660,7 +661,12 @@ def _parse_charstrings(tokens, _data): f"Token following /{glyphname} in CharStrings definition " f"must be a number, was {nbytes_token}" ) - next(tokens) # usually RD or |- + token = next(tokens) + if not token.is_keyword(self._abbr['RD']): + raise RuntimeError( + f"Token preceding charstring must be {self._abbr['RD']}, " + f"was {token}" + ) binary_token = tokens.send(1+nbytes_token.value()) charstrings[glyphname] = binary_token.value() @@ -691,8 +697,7 @@ def _parse_encoding(tokens, _data): continue encoding[index_token.value()] = name_token.value() - @staticmethod - def _parse_othersubrs(tokens, data): + def _parse_othersubrs(self, tokens, data): init_pos = None while True: token = next(tokens) @@ -700,7 +705,7 @@ def _parse_othersubrs(tokens, data): init_pos = token.pos if token.is_delim(): _expression(token, tokens, data) - elif token.is_keyword('def', 'ND', '|-'): + elif token.is_keyword('def', self._abbr['ND']): return data[init_pos:token.endpos()], token.endpos() def transform(self, effects): @@ -755,7 +760,7 @@ def transform(self, effects): fontmatrix = ( f"[{' '.join(_format_approx(x, 6) for x in array)}]" ) - replacements = ( + newparts = self._replace( [(x, f'/FontName/{fontname} def') for x in self._pos['FontName']] + [(x, f'/ItalicAngle {italicangle} def') @@ -765,11 +770,63 @@ def transform(self, effects): + [(x, '') for x in self._pos.get('UniqueID', [])] ) + return Type1Font(( + newparts[0], + self._encrypt(newparts[1], 'eexec'), + self.parts[2] + )) + + def with_encoding(self, encoding): + """ + Change the encoding of the font. + + Parameters + ---------- + encoding : dict + A dictionary mapping character codes to glyph names. + + Returns + ------- + `Type1Font` + """ + newparts = self._replace( + [(x, '') for x in self._pos.get('UniqueID', [])] + + [(self._pos['Encoding'][0], self._postscript_encoding(encoding))] + ) + return Type1Font(( + newparts[0], + self._encrypt(newparts[1], 'eexec'), + self.parts[2] + )) + + def _replace(self, replacements): + """ + Change the font according to `replacements` + + Parameters + ---------- + replacements : list of ((int, int), str) + Each element is ((pos0, pos1), replacement) where pos0 and + pos1 are indices to the original font data (parts[0] and the + decrypted part concatenated). The data in the interval + pos0:pos1 will be replaced by the replacement text. To + accommodate binary data, the replacement is taken to be in + Latin-1 encoding. + + The case where pos0 is inside parts[0] and pos1 inside + the decrypted part is not supported. + + Returns + ------- + (bytes, bytes) + The new parts[0] and decrypted part (which needs to be + encrypted in the transformed font). + """ data = bytearray(self.parts[0]) data.extend(self.decrypted) len0 = len(self.parts[0]) for (pos0, pos1), value in sorted(replacements, reverse=True): - data[pos0:pos1] = value.encode('ascii', 'replace') + data[pos0:pos1] = value.encode('latin-1') if pos0 < len(self.parts[0]): if pos1 >= len(self.parts[0]): raise RuntimeError( @@ -778,13 +835,275 @@ def transform(self, effects): ) len0 += len(value) - pos1 + pos0 - data = bytes(data) - return Type1Font(( - data[:len0], - self._encrypt(data[len0:], 'eexec'), + return bytes(data[:len0]), bytes(data[len0:]) + + def subset(self, characters, name_prefix): + """ + Return a new font that only defines the given characters. + + Parameters + ---------- + characters : sequence of bytes + The subset of characters to include. These are indices into the + font's encoding array. The encoding array of a Type-1 font can + only include 256 characters, but other glyphs may be accessed + via the seac operator. + name_prefix : str + Prefix to prepend to the font name. + + Returns + ------- + `Type1Font` + """ + characters = frozenset(characters) + if _log.isEnabledFor(logging.DEBUG): + _log.debug( + "Subsetting font %s to characters %s = %s", + self.prop['FontName'], + sorted(characters), + [self.prop['Encoding'].get(code) for code in sorted(characters)], + ) + encoding = {code: glyph + for code, glyph in self.prop['Encoding'].items() + if code in characters} + encoding[0] = '.notdef' + # todo and done include strings (glyph names) + todo = set(encoding.values()) + done = set() + seen_subrs = {0, 1, 2, 3} + while todo: + glyph = todo.pop() + called_glyphs, called_subrs = _CharstringSimulator(self).run(glyph) + todo.update(called_glyphs - done) + seen_subrs.update(called_subrs) + done.add(glyph) + + charstrings = self._subset_charstrings(done) + subrs = self._subset_subrs(seen_subrs) + newparts = self._replace( + [(x, f'/FontName /{name_prefix}{self.prop["FontName"]} def') + for x in self._pos['FontName']] + + [(self._pos['CharStrings'][0], charstrings), + (self._pos['Subrs'][0], subrs), + (self._pos['Encoding'][0], self._postscript_encoding(encoding)) + ] + [(x, '') for x in self._pos.get('UniqueID', [])] + ) + return type(self)(( + newparts[0], + self._encrypt(newparts[1], 'eexec'), self.parts[2] )) + @staticmethod + def _charstring_tokens(data): + """Parse a Type-1 charstring + + Yield opcode names and integer parameters. + """ + data = iter(data) + for byte in data: + if 32 <= byte <= 246: + yield byte - 139 + elif 247 <= byte <= 250: + byte2 = next(data) + yield (byte-247) * 256 + byte2 + 108 + elif 251 <= byte <= 254: + byte2 = next(data) + yield -(byte-251)*256 - byte2 - 108 + elif byte == 255: + bs = bytes(itertools.islice(data, 4)) + yield struct.unpack('>i', bs)[0] + elif byte == 12: + byte1 = next(data) + yield { + 0: 'dotsection', + 1: 'vstem3', + 2: 'hstem3', + 6: 'seac', + 7: 'sbw', + 12: 'div', + 16: 'callothersubr', + 17: 'pop', + 33: 'setcurrentpoint' + }[byte1] + else: + yield { + 1: 'hstem', + 3: 'vstem', + 4: 'vmoveto', + 5: 'rlineto', + 6: 'hlineto', + 7: 'vlineto', + 8: 'rrcurveto', + 9: 'closepath', + 10: 'callsubr', + 11: 'return', + 13: 'hsbw', + 14: 'endchar', + 21: 'rmoveto', + 22: 'hmoveto', + 30: 'vhcurveto', + 31: 'hvcurveto' + }[byte] + + def _postscript_encoding(self, encoding): + """Return a PostScript encoding array for the encoding.""" + return '\n'.join([ + '/Encoding 256 array\n0 1 255 { 1 index exch /.notdef put} for', + *( + f'dup {i} /{glyph} put' + for i, glyph in sorted(encoding.items()) + if glyph != '.notdef' + ), + 'readonly def\n', + ]) + + def _subset_charstrings(self, glyphs): + """Return a PostScript CharStrings array for the glyphs.""" + charstrings = self.prop['CharStrings'] + lenIV = self.prop.get('lenIV', 4) + ordered = sorted(glyphs) + encrypted = [ + self._encrypt(charstrings[glyph], 'charstring', lenIV).decode('latin-1') + for glyph in ordered + ] + RD, ND = self._abbr['RD'], self._abbr['ND'] + return '\n'.join([ + f'/CharStrings {len(ordered)} dict dup begin', + *( + f'/{glyph} {len(enc)} {RD} {enc} {ND}' + for glyph, enc in zip(ordered, encrypted) + ), + 'end\n', + ]) + + def _subset_subrs(self, indices): + """Return a PostScript Subrs array for the subroutines.""" + # we can't remove subroutines, we just replace unused ones with a stub + subrs = self.prop['Subrs'] + n_subrs = len(subrs) + lenIV = self.prop.get('lenIV', 4) + stub = self._encrypt(b'\x0b', 'charstring', lenIV).decode('latin-1') + encrypted = [ + self._encrypt(subrs[i], 'charstring', lenIV).decode('latin-1') + if i in indices + else stub + for i in range(n_subrs) + ] + RD, ND, NP = self._abbr['RD'], self._abbr['ND'], self._abbr['NP'] + return '\n'.join([ + f'/Subrs {n_subrs} array', + *( + f'dup {i} {len(enc)} {RD} {enc} {NP}' + for i, enc in enumerate(encrypted) + ), + ]) + + +class _CharstringSimulator: + __slots__ = ('font', 'buildchar_stack', 'postscript_stack', 'glyphs', 'subrs') + + def __init__(self, font): + self.font = font + self.buildchar_stack = [] + self.postscript_stack = [] + self.glyphs = set() + self.subrs = set() + + def run(self, glyph_or_subr): + """Run the charstring interpreter on a glyph or subroutine. + + This does not actually execute the code but simulates it to find out + which subroutines get called when executing the glyph or subroutine. + + Parameters + ---------- + glyph_or_subr : str or int + The name of the glyph or the index of the subroutine to simulate. + + Returns + ------- + glyphs : set[str] + The set of glyph names called by the glyph or subroutine. + subrs : set[int] + The set of subroutines called by the glyph or subroutine. + """ + if isinstance(glyph_or_subr, str): + program = self.font.prop['CharStrings'][glyph_or_subr] + self.glyphs.add(glyph_or_subr) + else: + program = self.font.prop['Subrs'][glyph_or_subr] + self.subrs.add(glyph_or_subr) + for opcode in self.font._charstring_tokens(program): + if opcode in ('return', 'endchar'): + return self.glyphs, self.subrs + self._step(opcode) + else: + font_name = self.font.prop.get('FontName', '(unknown)') + _log.info( + f"Glyph or subr {glyph_or_subr} in font {font_name} does not end " + "with return or endchar" + ) + return self.glyphs, self.subrs + + def _step(self, opcode): + """Run one step in the charstring interpreter.""" + match opcode: + case _ if isinstance(opcode, int): + self.buildchar_stack.append(opcode) + case ( + 'hsbw' | 'sbw' | 'closepath' | 'hlineto' | 'hmoveto' | 'hcurveto' | + 'hvcurveto' | 'rlineto' | 'rmoveto' | 'rrcurveto' | 'vhcurveto' | + 'vlineto' | 'vmoveto' | 'dotsection' | 'hstem' | 'hstem3' | + 'vstem' | 'vstem3' | 'setcurrentpoint' + ): + self.buildchar_stack.clear() + case 'seac': # Standard Encoding Accented Character + codes = self.buildchar_stack[3:5] + self.glyphs.update(_StandardEncoding[int(x)] for x in codes) + self.buildchar_stack.clear() + case 'div': + num1, num2 = self.buildchar_stack[-2:] + if num2 == 0: + _log.warning( + f"Division by zero in font {self.font.prop['FontName']}" + ) + self.buildchar_stack[-2:] = [0] + else: + self.buildchar_stack[-2:] = [num1/num2] + case 'callothersubr': + n, othersubr = self.buildchar_stack[-2:] + if not isinstance(n, int): + _log.warning( + f"callothersubr {othersubr} with non-integer argument " + f"count in font {self.font.prop['FontName']}" + ) + n = int(n) + args = self.buildchar_stack[-2-n:-2] + if othersubr == 3: + self.postscript_stack.append(args[0]) + else: + self.postscript_stack.extend(args[::-1]) + self.buildchar_stack[-2-n:] = [] + case 'callsubr': + subr = self.buildchar_stack.pop() + if not isinstance(subr, int): + _log.warning( + f"callsubr with non-integer argument {subr} in font " + f"{self.font.prop['FontName']}" + ) + subr = int(subr) + self.run(subr) + case 'pop': + if not self.postscript_stack: + _log.warning( + f"pop with empty stack in font {self.font.prop['FontName']}" + ) + self.postscript_stack.append(0) + self.buildchar_stack.append(self.postscript_stack.pop()) + case _: + raise RuntimeError(f'opcode {opcode}') + _StandardEncoding = { **{ord(letter): letter for letter in string.ascii_letters}, diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py index 073ca05bc172..f61be9b51e8c 100644 --- a/lib/matplotlib/backends/backend_pdf.py +++ b/lib/matplotlib/backends/backend_pdf.py @@ -808,7 +808,14 @@ def newTextnote(self, text, positionRect=[-100, -100, 0, 0]): } self.pageAnnotations.append(theNote) - def _get_subsetted_psname(self, ps_name, charmap): + @staticmethod + def _get_subset_prefix(charset): + """ + Get a prefix for a subsetted font name. + + The prefix is six uppercase letters followed by a plus sign; + see PDF reference section 5.5.3 Font Subsets. + """ def toStr(n, base): if n < base: return string.ascii_uppercase[n] @@ -818,11 +825,15 @@ def toStr(n, base): ) # encode to string using base 26 - hashed = hash(frozenset(charmap.keys())) % ((sys.maxsize + 1) * 2) + hashed = hash(charset) % ((sys.maxsize + 1) * 2) prefix = toStr(hashed, 26) # get first 6 characters from prefix - return prefix[:6] + "+" + ps_name + return prefix[:6] + "+" + + @staticmethod + def _get_subsetted_psname(ps_name, charmap): + return PdfFile._get_subset_prefix(frozenset(charmap.keys())) + ps_name def finalize(self): """Write out the various deferred objects and the pdf end matter.""" @@ -994,39 +1005,29 @@ def _embedTeXFont(self, fontinfo): _log.debug('Embedding TeX font %s - fontinfo=%s', fontinfo.dvifont.texname, fontinfo.__dict__) - # Widths - widthsObject = self.reserveObject('font widths') - tfm = fontinfo.dvifont._tfm - # convert from TeX's 12.20 representation to 1/1000 text space units. - widths = [(1000 * metrics.tex_width) >> 20 - if (metrics := tfm.get_metrics(char)) else 0 - for char in range(max(tfm._glyph_metrics, default=-1) + 1)] - self.writeObject(widthsObject, widths) - # Font dictionary fontdictObject = self.reserveObject('font dictionary') fontdict = { 'Type': Name('Font'), 'Subtype': Name('Type1'), - 'FirstChar': 0, - 'LastChar': len(widths) - 1, - 'Widths': widthsObject, - } - - # Encoding (if needed) - if fontinfo.encodingfile is not None: - fontdict['Encoding'] = { - 'Type': Name('Encoding'), - 'Differences': [ - 0, *map(Name, dviread._parse_enc(fontinfo.encodingfile))], - } + } # We have a font file to embed - read it in and apply any effects t1font = _type1font.Type1Font(fontinfo.fontfile) + if fontinfo.encodingfile is not None: + t1font = t1font.with_encoding( + {i: c for i, c in enumerate(dviread._parse_enc(fontinfo.encodingfile))} + ) + if fontinfo.effects: t1font = t1font.transform(fontinfo.effects) + chars = frozenset(self._character_tracker.used[fontinfo.dvifont.fname]) + t1font = t1font.subset(chars, self._get_subset_prefix(chars)) fontdict['BaseFont'] = Name(t1font.prop['FontName']) - + encoding = t1font.prop['Encoding'] + fc = fontdict['FirstChar'] = min(encoding.keys(), default=0) + lc = fontdict['LastChar'] = max(encoding.keys(), default=255) + fontdict['Encoding'] = self._generate_encoding(encoding) # Font descriptors may be shared between differently encoded # Type-1 fonts, so only create a new descriptor if there is no # existing descriptor for this font. @@ -1038,9 +1039,32 @@ def _embedTeXFont(self, fontinfo): self._type1Descriptors[(fontinfo.fontfile, effects)] = fontdesc fontdict['FontDescriptor'] = fontdesc + # Use TeX Font Metrics file to get glyph widths (TeX uses its 12.20 fixed point + # representation and we want 1/1000 text space units) + tfm = fontinfo.dvifont._tfm + widths = [(1000 * metrics.tex_width) >> 20 + if (metrics := tfm.get_metrics(char)) else 0 + for char in range(fc, lc + 1)] + fontdict['Widths'] = widthsObject = self.reserveObject('glyph widths') + self.writeObject(widthsObject, widths) self.writeObject(fontdictObject, fontdict) return fontdictObject + + def _generate_encoding(self, encoding): + prev = -2 + result = [] + for code, name in sorted(encoding.items()): + if code != prev + 1: + result.append(code) + prev = code + result.append(Name(name)) + return { + 'Type': Name('Encoding'), + 'Differences': result + } + + @_api.delete_parameter("3.11", "fontfile") def createType1Descriptor(self, t1font, fontfile=None): # Create and write the font descriptor and the font file @@ -1077,6 +1101,14 @@ def createType1Descriptor(self, t1font, fontfile=None): if 0: flags |= 1 << 18 + encoding = t1font.prop['Encoding'] + charset = ''.join( + sorted( + f'/{c}' for c in encoding.values() + if c != '.notdef' + ) + ) + descriptor = { 'Type': Name('FontDescriptor'), 'FontName': Name(t1font.prop['FontName']), @@ -1090,6 +1122,7 @@ def createType1Descriptor(self, t1font, fontfile=None): 'FontFile': fontfileObject, 'FontFamily': t1font.prop['FamilyName'], 'StemV': 50, # TODO + 'CharSet': charset, # (see also revision 3874; but not all TeX distros have AFM files!) # 'FontWeight': a number where 400 = Regular, 700 = Bold } @@ -2267,6 +2300,7 @@ def draw_tex(self, gc, x, y, s, prop, angle, *, mtext=None): seq += [['font', pdfname, dvifont.size]] oldfont = dvifont seq += [['text', x1, y1, [bytes([glyph])], x1+width]] + self.file._character_tracker.track(dvifont, chr(glyph)) # Find consecutive text strings with constant y coordinate and # combine into a sequence of strings and kerns, or just one diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py index a588979f5fad..9e8b6a5facf5 100644 --- a/lib/matplotlib/dviread.py +++ b/lib/matplotlib/dviread.py @@ -17,17 +17,17 @@ ... """ -from collections import namedtuple import dataclasses import enum -from functools import cache, lru_cache, partial, wraps import logging import os -from pathlib import Path import re import struct import subprocess import sys +from collections import namedtuple +from functools import cache, lru_cache, partial, wraps +from pathlib import Path import numpy as np @@ -583,6 +583,9 @@ class DviFont: Attributes ---------- texname : bytes + fname : str + Compatibility shim so that DviFont can be used with + ``_backend_pdf_ps.CharacterTracker``; not a real filename. size : float Size of the font in Adobe points, converted from the slightly smaller TeX points. @@ -602,6 +605,18 @@ def __init__(self, scale, tfm, texname, vf): (1000 * self._tfm.width.get(char, 0)) >> 20 for char in range(max(self._tfm.width, default=-1) + 1)])) + @property + def fname(self): + """A fake filename""" + return self.texname.decode('latin-1') + + def _get_fontmap(self, string): + """Get the mapping from characters to the font that includes them. + + Each value maps to self; there is no fallback mechanism for DviFont. + """ + return {char: self for char in string} + def __eq__(self, other): return (type(self) is type(other) and self.texname == other.texname and self.size == other.size) @@ -1161,8 +1176,8 @@ def _fontfile(cls, suffix, texname): if __name__ == '__main__': - from argparse import ArgumentParser import itertools + from argparse import ArgumentParser import fontTools.agl diff --git a/lib/matplotlib/dviread.pyi b/lib/matplotlib/dviread.pyi index 41799c083218..12a9215b5308 100644 --- a/lib/matplotlib/dviread.pyi +++ b/lib/matplotlib/dviread.pyi @@ -66,6 +66,8 @@ class DviFont: def __ne__(self, other: object) -> bool: ... @property def widths(self) -> list[int]: ... + @property + def fname(self) -> str: ... class Vf(Dvi): def __init__(self, filename: str | os.PathLike) -> None: ... diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pdf/font-bitstream-charter.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pdf/font-bitstream-charter.pdf new file mode 100644 index 0000000000000000000000000000000000000000..c8f9411fb3d9256e278e458f49cf0949f48714aa GIT binary patch literal 12990 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 Y=E2?pVC>(+1Z)J*;3+6X<;76{58ap6h5!Hn literal 0 HcmV?d00001 diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pdf/font-dejavusans.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pdf/font-dejavusans.pdf new file mode 100644 index 0000000000000000000000000000000000000000..fd907dee6687a4fb28076f05a417096fd8a1fa30 GIT binary patch literal 33413 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 literal 0 HcmV?d00001 diff --git a/lib/matplotlib/tests/baseline_images/test_backend_pdf/font-heuristica.pdf b/lib/matplotlib/tests/baseline_images/test_backend_pdf/font-heuristica.pdf new file mode 100644 index 0000000000000000000000000000000000000000..ca9b38d09b894232f1d1fe040974ac6b73169595 GIT binary patch literal 56185 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 AHUIzs literal 0 HcmV?d00001 diff --git a/lib/matplotlib/tests/test_backend_pdf.py b/lib/matplotlib/tests/test_backend_pdf.py index dc349e8dfa35..f126fb543e78 100644 --- a/lib/matplotlib/tests/test_backend_pdf.py +++ b/lib/matplotlib/tests/test_backend_pdf.py @@ -16,7 +16,7 @@ from matplotlib.backends._backend_pdf_ps import get_glyphs_subset, font_as_file from matplotlib.backends.backend_pdf import PdfPages from matplotlib.patches import Rectangle -from matplotlib.testing import _gen_multi_font_text +from matplotlib.testing import _gen_multi_font_text, _has_tex_package from matplotlib.testing.decorators import check_figures_equal, image_comparison from matplotlib.testing._markers import needs_usetex @@ -428,3 +428,53 @@ def test_truetype_conversion(recwarn): font=Path(__file__).parent / "data/mpltest.ttf", fontsize=80) ax.set_xticks([]) ax.set_yticks([]) + + +@pytest.mark.skipif(not _has_tex_package("heuristica"), + reason="LaTeX lacks heuristica package") +@image_comparison(["font-heuristica.pdf"]) +def test_font_heuristica(): + # Heuristica uses the callothersubr operator for some glyphs + mpl.rcParams['text.latex.preamble'] = '\n'.join(( + r'\usepackage{heuristica}', + r'\usepackage[T1]{fontenc}', + r'\usepackage[utf8]{inputenc}' + )) + fig, ax = plt.subplots() + ax.text(0.1, 0.1, r"BHTem fi ffl 1234", usetex=True, fontsize=50) + ax.set_xticks([]) + ax.set_yticks([]) + + +@pytest.mark.skipif(not _has_tex_package("DejaVuSans"), + reason="LaTeX lacks DejaVuSans package") +@image_comparison(["font-dejavusans.pdf"]) +def test_font_dejavusans(): + # DejaVuSans uses the seac operator to compose characters with diacritics + mpl.rcParams['text.latex.preamble'] = '\n'.join(( + r'\usepackage{DejaVuSans}', + r'\usepackage[T1]{fontenc}', + r'\usepackage[utf8]{inputenc}' + )) + + fig, ax = plt.subplots() + ax.text(0.1, 0.1, r"\textsf{ñäö ABCDabcd}", usetex=True, fontsize=50) + ax.text(0.1, 0.3, r"\textsf{fi ffl 1234}", usetex=True, fontsize=50) + ax.set_xticks([]) + ax.set_yticks([]) + + +@pytest.mark.skipif(not _has_tex_package("charter"), + reason="LaTeX lacks charter package") +@image_comparison(["font-bitstream-charter.pdf"]) +def test_font_bitstream_charter(): + mpl.rcParams['text.latex.preamble'] = '\n'.join(( + r'\usepackage{charter}', + r'\usepackage[T1]{fontenc}', + r'\usepackage[utf8]{inputenc}' + )) + fig, ax = plt.subplots() + ax.text(0.1, 0.1, r"åüš ABCDabcd", usetex=True, fontsize=50) + ax.text(0.1, 0.3, r"fi ffl 1234", usetex=True, fontsize=50) + ax.set_xticks([]) + ax.set_yticks([]) diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py index 0b6d6d5e5535..e76b9d28297f 100644 --- a/lib/matplotlib/tests/test_usetex.py +++ b/lib/matplotlib/tests/test_usetex.py @@ -1,3 +1,4 @@ +import re from tempfile import TemporaryFile import numpy as np @@ -156,6 +157,69 @@ def test_missing_psfont(fmt, monkeypatch): fig.savefig(tmpfile, format=fmt) +def test_pdf_type1_font_subsetting(): + """Test that fonts in PDF output are properly subsetted""" + pikepdf = pytest.importorskip("pikepdf") + + mpl.rcParams["text.usetex"] = True + mpl.rcParams["text.latex.preamble"] = r"\usepackage{amssymb}" + fig, ax = plt.subplots() + ax.text(0.2, 0.7, r"$\int_{-\infty}^{\aleph}\sqrt{\alpha\beta\gamma}\mathrm{d}x$") + ax.text(0.2, 0.5, r"$\mathfrak{x}\circledcirc\mathfrak{y}\in\mathbb{R}$") + + with TemporaryFile() as tmpfile: + fig.savefig(tmpfile, format="pdf") + tmpfile.seek(0) + pdf = pikepdf.Pdf.open(tmpfile) + + length = {} + page = pdf.pages[0] + for font_name, font in page.Resources.Font.items(): + assert font.Subtype == "/Type1", ( + f"Font {font_name}={font} is not a Type 1 font" + ) + + # Subsetted font names have a 6-character tag followed by a '+' + base_font = str(font["/BaseFont"]).removeprefix("/") + assert re.match(r"^[A-Z]{6}\+", base_font), ( + f"Font {font_name}={base_font} lacks a subset indicator tag" + ) + assert "/FontFile" in font.FontDescriptor, ( + f"Type 1 font {font_name}={base_font} is not embedded" + ) + _, original_name = base_font.split("+", 1) + length[original_name] = len(bytes(font["/FontDescriptor"]["/FontFile"])) + + print("Embedded font stream lengths:", length) + # We should have several fonts, each much smaller than the original. + # I get under 10kB on my system for each font, but allow 15kB in case + # of differences in the font files. + assert { + 'CMEX10', + 'CMMI12', + 'CMR12', + 'CMSY10', + 'CMSY8', + 'EUFM10', + 'MSAM10', + 'MSBM10', + }.issubset(length), "Missing expected fonts in the PDF" + for font_name, length in length.items(): + assert length < 15_000, ( + f"Font {font_name}={length} is larger than expected" + ) + + # For comparison, lengths without subsetting on my system: + # 'CMEX10': 29686 + # 'CMMI12': 36176 + # 'CMR12': 32157 + # 'CMSY10': 32004 + # 'CMSY8': 32061 + # 'EUFM10': 20546 + # 'MSAM10': 31199 + # 'MSBM10': 34129 + + try: _old_gs_version = mpl._get_executable_info('gs').version < parse_version('9.55') except mpl.ExecutableNotFoundError: From 22198e9de2285d76bec1a3013011568076947f8a Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Thu, 15 May 2025 16:44:48 -0400 Subject: [PATCH 080/161] DOC: tweak wording in docstring Co-authored-by: Elliott Sales de Andrade --- lib/matplotlib/tests/test_usetex.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/tests/test_usetex.py b/lib/matplotlib/tests/test_usetex.py index e76b9d28297f..95eb69325622 100644 --- a/lib/matplotlib/tests/test_usetex.py +++ b/lib/matplotlib/tests/test_usetex.py @@ -158,7 +158,7 @@ def test_missing_psfont(fmt, monkeypatch): def test_pdf_type1_font_subsetting(): - """Test that fonts in PDF output are properly subsetted""" + """Test that fonts in PDF output are properly subset.""" pikepdf = pytest.importorskip("pikepdf") mpl.rcParams["text.usetex"] = True From 53355cae4f15bd672cc9829719f6a7c68fb5a8f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Fri, 30 May 2025 13:43:13 +0300 Subject: [PATCH 081/161] Simplify match expression Co-authored-by: Elliott Sales de Andrade --- lib/matplotlib/_type1font.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/_type1font.py b/lib/matplotlib/_type1font.py index e6b9148663ef..33b22adbae73 100644 --- a/lib/matplotlib/_type1font.py +++ b/lib/matplotlib/_type1font.py @@ -1049,7 +1049,7 @@ def run(self, glyph_or_subr): def _step(self, opcode): """Run one step in the charstring interpreter.""" match opcode: - case _ if isinstance(opcode, int): + case int(): self.buildchar_stack.append(opcode) case ( 'hsbw' | 'sbw' | 'closepath' | 'hlineto' | 'hmoveto' | 'hcurveto' | From c77a459690da733028a60dce5f0991db3bc5701f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Sat, 31 May 2025 07:56:54 +0300 Subject: [PATCH 082/161] Use one font descriptor for each Type-1 font The old optimization where the same font file and descriptor could be shared by multiple differently-encoded fonts is wrong in the presence of subsetting, unless we also take the exact glyph subset into account. It is very unlikely for the exact same subset to be used by different encodings, so just remove the optimization. Rearrange _embedTeXFont in neater blocks. --- lib/matplotlib/backends/backend_pdf.py | 32 +++++++++----------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py index f61be9b51e8c..c729b27b1b53 100644 --- a/lib/matplotlib/backends/backend_pdf.py +++ b/lib/matplotlib/backends/backend_pdf.py @@ -722,8 +722,6 @@ def __init__(self, filename, metadata=None): self._internal_font_seq = (Name(f'F{i}') for i in itertools.count(1)) self._fontNames = {} # maps filenames to internal font names self._dviFontInfo = {} # maps dvi font names to embedding information - # differently encoded Type-1 fonts may share the same descriptor - self._type1Descriptors = {} self._character_tracker = _backend_pdf_ps.CharacterTracker() self.alphaStates = {} # maps alpha values to graphics state objects @@ -767,8 +765,6 @@ def __init__(self, filename, metadata=None): fontNames = _api.deprecated("3.11")(property(lambda self: self._fontNames)) dviFontInfo = _api.deprecated("3.11")(property(lambda self: self._dviFontInfo)) - type1Descriptors = _api.deprecated("3.11")( - property(lambda self: self._type1Descriptors)) def newPage(self, width, height): self.endStream() @@ -1005,48 +1001,42 @@ def _embedTeXFont(self, fontinfo): _log.debug('Embedding TeX font %s - fontinfo=%s', fontinfo.dvifont.texname, fontinfo.__dict__) - # Font dictionary + # The font dictionary is the top-level object describing a font fontdictObject = self.reserveObject('font dictionary') fontdict = { 'Type': Name('Font'), 'Subtype': Name('Type1'), } - # We have a font file to embed - read it in and apply any effects + # Read the font file and apply any encoding changes and effects t1font = _type1font.Type1Font(fontinfo.fontfile) if fontinfo.encodingfile is not None: t1font = t1font.with_encoding( {i: c for i, c in enumerate(dviread._parse_enc(fontinfo.encodingfile))} ) - if fontinfo.effects: t1font = t1font.transform(fontinfo.effects) + + # Reduce the font to only the glyphs used in the document, get the encoding + # for that subset, and compute various properties based on the encoding. chars = frozenset(self._character_tracker.used[fontinfo.dvifont.fname]) t1font = t1font.subset(chars, self._get_subset_prefix(chars)) fontdict['BaseFont'] = Name(t1font.prop['FontName']) + # createType1Descriptor writes the font data as a side effect + fontdict['FontDescriptor'] = self.createType1Descriptor(t1font) encoding = t1font.prop['Encoding'] + fontdict['Encoding'] = self._generate_encoding(encoding) fc = fontdict['FirstChar'] = min(encoding.keys(), default=0) lc = fontdict['LastChar'] = max(encoding.keys(), default=255) - fontdict['Encoding'] = self._generate_encoding(encoding) - # Font descriptors may be shared between differently encoded - # Type-1 fonts, so only create a new descriptor if there is no - # existing descriptor for this font. - effects = (fontinfo.effects.get('slant', 0.0), - fontinfo.effects.get('extend', 1.0)) - fontdesc = self._type1Descriptors.get((fontinfo.fontfile, effects)) - if fontdesc is None: - fontdesc = self.createType1Descriptor(t1font) - self._type1Descriptors[(fontinfo.fontfile, effects)] = fontdesc - fontdict['FontDescriptor'] = fontdesc - - # Use TeX Font Metrics file to get glyph widths (TeX uses its 12.20 fixed point - # representation and we want 1/1000 text space units) + + # Convert glyph widths from TeX 12.20 fixed point to 1/1000 text space units tfm = fontinfo.dvifont._tfm widths = [(1000 * metrics.tex_width) >> 20 if (metrics := tfm.get_metrics(char)) else 0 for char in range(fc, lc + 1)] fontdict['Widths'] = widthsObject = self.reserveObject('glyph widths') self.writeObject(widthsObject, widths) + self.writeObject(fontdictObject, fontdict) return fontdictObject From 335e6b417100422f5d04631c8e27158e6a3a320e Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Sat, 31 May 2025 13:20:56 +0200 Subject: [PATCH 083/161] Fix FT_CHECK compat with cibuildwheel. (#30123) --- src/ft2font.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ft2font.h b/src/ft2font.h index e1ebdb934329..8db0239ed4fd 100644 --- a/src/ft2font.h +++ b/src/ft2font.h @@ -6,7 +6,6 @@ #ifndef MPL_FT2FONT_H #define MPL_FT2FONT_H -#include #include #include #include @@ -42,11 +41,12 @@ inline char const* ft_error_string(FT_Error error) { // No more than 16 hex digits + "0x" + null byte for a 64-bit int error. #define THROW_FT_ERROR(name, err) { \ + std::string path{__FILE__}; \ char buf[20] = {0}; \ - sprintf(buf, "%#04x", err); \ + snprintf(buf, sizeof buf, "%#04x", err); \ throw std::runtime_error{ \ name " (" \ - + std::filesystem::path(__FILE__).filename().string() \ + + path.substr(path.find_last_of("/\\") + 1) \ + " line " + std::to_string(__LINE__) + ") failed with error " \ + std::string{buf} + ": " + std::string{ft_error_string(err)}}; \ } (void)0 From 2a82d0c3a462f0c34d115785c30408b48d94ee3f Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sat, 31 May 2025 08:39:30 -0400 Subject: [PATCH 084/161] Clean up AFM code (#30121) Since AFM is now private, we can delete unused methods without deprecation. Additionally, add `AFM.get_glyph_name` so that the PostScript mathtext code doesn't need to special case AFM files. --- lib/matplotlib/_afm.py | 145 +++++++------------------- lib/matplotlib/backends/backend_ps.py | 7 +- lib/matplotlib/tests/test_afm.py | 8 ++ lib/matplotlib/tests/test_text.py | 7 -- 4 files changed, 49 insertions(+), 118 deletions(-) diff --git a/lib/matplotlib/_afm.py b/lib/matplotlib/_afm.py index 558efe16392f..9094206c2d7c 100644 --- a/lib/matplotlib/_afm.py +++ b/lib/matplotlib/_afm.py @@ -1,5 +1,5 @@ """ -A python interface to Adobe Font Metrics Files. +A Python interface to Adobe Font Metrics Files. Although a number of other Python implementations exist, and may be more complete than this, it was decided not to go with them because they were @@ -16,19 +16,11 @@ >>> from pathlib import Path >>> afm_path = Path(mpl.get_data_path(), 'fonts', 'afm', 'ptmr8a.afm') >>> ->>> from matplotlib.afm import AFM +>>> from matplotlib._afm import AFM >>> with afm_path.open('rb') as fh: ... afm = AFM(fh) ->>> afm.string_width_height('What the heck?') -(6220.0, 694) >>> afm.get_fontname() 'Times-Roman' ->>> afm.get_kern_dist('A', 'f') -0 ->>> afm.get_kern_dist('A', 'y') --92.0 ->>> afm.get_bbox_char('!') -[130, -9, 238, 676] As in the Adobe Font Metrics File Format Specification, all dimensions are given in units of 1/1000 of the scale factor (point size) of the font @@ -87,20 +79,23 @@ def _to_bool(s): def _parse_header(fh): """ - Read the font metrics header (up to the char metrics) and returns - a dictionary mapping *key* to *val*. *val* will be converted to the - appropriate python type as necessary; e.g.: + Read the font metrics header (up to the char metrics). - * 'False'->False - * '0'->0 - * '-168 -218 1000 898'-> [-168, -218, 1000, 898] + Returns + ------- + dict + A dictionary mapping *key* to *val*. Dictionary keys are: - Dictionary keys are + StartFontMetrics, FontName, FullName, FamilyName, Weight, ItalicAngle, + IsFixedPitch, FontBBox, UnderlinePosition, UnderlineThickness, Version, + Notice, EncodingScheme, CapHeight, XHeight, Ascender, Descender, + StartCharMetrics - StartFontMetrics, FontName, FullName, FamilyName, Weight, - ItalicAngle, IsFixedPitch, FontBBox, UnderlinePosition, - UnderlineThickness, Version, Notice, EncodingScheme, CapHeight, - XHeight, Ascender, Descender, StartCharMetrics + *val* will be converted to the appropriate Python type as necessary, e.g.,: + + * 'False' -> False + * '0' -> 0 + * '-168 -218 1000 898' -> [-168, -218, 1000, 898] """ header_converters = { b'StartFontMetrics': _to_float, @@ -185,11 +180,9 @@ def _parse_header(fh): def _parse_char_metrics(fh): """ - Parse the given filehandle for character metrics information and return - the information as dicts. + Parse the given filehandle for character metrics information. - It is assumed that the file cursor is on the line behind - 'StartCharMetrics'. + It is assumed that the file cursor is on the line behind 'StartCharMetrics'. Returns ------- @@ -239,14 +232,15 @@ def _parse_char_metrics(fh): def _parse_kern_pairs(fh): """ - Return a kern pairs dictionary; keys are (*char1*, *char2*) tuples and - values are the kern pair value. For example, a kern pairs line like - ``KPX A y -50`` - - will be represented as:: + Return a kern pairs dictionary. - d[ ('A', 'y') ] = -50 + Returns + ------- + dict + Keys are (*char1*, *char2*) tuples and values are the kern pair value. For + example, a kern pairs line like ``KPX A y -50`` will be represented as:: + d['A', 'y'] = -50 """ line = next(fh) @@ -279,8 +273,7 @@ def _parse_kern_pairs(fh): def _parse_composites(fh): """ - Parse the given filehandle for composites information return them as a - dict. + Parse the given filehandle for composites information. It is assumed that the file cursor is on the line behind 'StartComposites'. @@ -363,36 +356,6 @@ def __init__(self, fh): self._metrics, self._metrics_by_name = _parse_char_metrics(fh) self._kern, self._composite = _parse_optional(fh) - def get_bbox_char(self, c, isord=False): - if not isord: - c = ord(c) - return self._metrics[c].bbox - - def string_width_height(self, s): - """ - Return the string width (including kerning) and string height - as a (*w*, *h*) tuple. - """ - if not len(s): - return 0, 0 - total_width = 0 - namelast = None - miny = 1e9 - maxy = 0 - for c in s: - if c == '\n': - continue - wx, name, bbox = self._metrics[ord(c)] - - total_width += wx + self._kern.get((namelast, name), 0) - l, b, w, h = bbox - miny = min(miny, b) - maxy = max(maxy, b + h) - - namelast = name - - return total_width, maxy - miny - def get_str_bbox_and_descent(self, s): """Return the string bounding box and the maximal descent.""" if not len(s): @@ -423,45 +386,29 @@ def get_str_bbox_and_descent(self, s): return left, miny, total_width, maxy - miny, -miny - def get_str_bbox(self, s): - """Return the string bounding box.""" - return self.get_str_bbox_and_descent(s)[:4] - - def get_name_char(self, c, isord=False): - """Get the name of the character, i.e., ';' is 'semicolon'.""" - if not isord: - c = ord(c) - return self._metrics[c].name + def get_glyph_name(self, glyph_ind): # For consistency with FT2Font. + """Get the name of the glyph, i.e., ord(';') is 'semicolon'.""" + return self._metrics[glyph_ind].name - def get_width_char(self, c, isord=False): + def get_char_index(self, c): # For consistency with FT2Font. """ - Get the width of the character from the character metric WX field. + Return the glyph index corresponding to a character code point. + + Note, for AFM fonts, we treat the glyph index the same as the codepoint. """ - if not isord: - c = ord(c) + return c + + def get_width_char(self, c): + """Get the width of the character code from the character metric WX field.""" return self._metrics[c].width def get_width_from_char_name(self, name): """Get the width of the character from a type1 character name.""" return self._metrics_by_name[name].width - def get_height_char(self, c, isord=False): - """Get the bounding box (ink) height of character *c* (space is 0).""" - if not isord: - c = ord(c) - return self._metrics[c].bbox[-1] - - def get_kern_dist(self, c1, c2): - """ - Return the kerning pair distance (possibly 0) for chars *c1* and *c2*. - """ - name1, name2 = self.get_name_char(c1), self.get_name_char(c2) - return self.get_kern_dist_from_name(name1, name2) - def get_kern_dist_from_name(self, name1, name2): """ - Return the kerning pair distance (possibly 0) for chars - *name1* and *name2*. + Return the kerning pair distance (possibly 0) for chars *name1* and *name2*. """ return self._kern.get((name1, name2), 0) @@ -493,7 +440,7 @@ def get_familyname(self): return re.sub(extras, '', name) @property - def family_name(self): + def family_name(self): # For consistency with FT2Font. """The font family name, e.g., 'Times'.""" return self.get_familyname() @@ -516,17 +463,3 @@ def get_xheight(self): def get_underline_thickness(self): """Return the underline thickness as float.""" return self._header[b'UnderlineThickness'] - - def get_horizontal_stem_width(self): - """ - Return the standard horizontal stem width as float, or *None* if - not specified in AFM file. - """ - return self._header.get(b'StdHW', None) - - def get_vertical_stem_width(self): - """ - Return the standard vertical stem width as float, or *None* if - not specified in AFM file. - """ - return self._header.get(b'StdVW', None) diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py index c1f4348016bb..f6b8455a15a7 100644 --- a/lib/matplotlib/backends/backend_ps.py +++ b/lib/matplotlib/backends/backend_ps.py @@ -24,7 +24,6 @@ import matplotlib as mpl from matplotlib import _api, cbook, _path, _text_helpers -from matplotlib._afm import AFM from matplotlib.backend_bases import ( _Backend, FigureCanvasBase, FigureManagerBase, RendererBase) from matplotlib.cbook import is_writable_file_like, file_requires_unicode @@ -787,7 +786,7 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None): width = font.get_width_from_char_name(name) except KeyError: name = 'question' - width = font.get_width_char('?') + width = font.get_width_char(ord('?')) kern = font.get_kern_dist_from_name(last_name, name) last_name = name thisx += kern * scale @@ -835,9 +834,7 @@ def draw_mathtext(self, gc, x, y, s, prop, angle): lastfont = font.postscript_name, fontsize self._pswriter.write( f"/{font.postscript_name} {fontsize} selectfont\n") - glyph_name = ( - font.get_name_char(chr(num)) if isinstance(font, AFM) else - font.get_glyph_name(font.get_char_index(num))) + glyph_name = font.get_glyph_name(font.get_char_index(num)) self._pswriter.write( f"{ox:g} {oy:g} moveto\n" f"/{glyph_name} glyphshow\n") diff --git a/lib/matplotlib/tests/test_afm.py b/lib/matplotlib/tests/test_afm.py index e5c6a83937cd..80cf8ac60feb 100644 --- a/lib/matplotlib/tests/test_afm.py +++ b/lib/matplotlib/tests/test_afm.py @@ -135,3 +135,11 @@ def test_malformed_header(afm_data, caplog): _afm._parse_header(fh) assert len(caplog.records) == 1 + + +def test_afm_kerning(): + fn = fm.findfont("Helvetica", fontext="afm") + with open(fn, 'rb') as fh: + afm = _afm.AFM(fh) + assert afm.get_kern_dist_from_name('A', 'V') == -70.0 + assert afm.get_kern_dist_from_name('V', 'A') == -80.0 diff --git a/lib/matplotlib/tests/test_text.py b/lib/matplotlib/tests/test_text.py index 79a9e2d66c46..407d7a96be4d 100644 --- a/lib/matplotlib/tests/test_text.py +++ b/lib/matplotlib/tests/test_text.py @@ -208,13 +208,6 @@ def test_antialiasing(): mpl.rcParams['text.antialiased'] = False # Should not affect existing text. -def test_afm_kerning(): - fn = mpl.font_manager.findfont("Helvetica", fontext="afm") - with open(fn, 'rb') as fh: - afm = mpl._afm.AFM(fh) - assert afm.string_width_height('VAVAVAVAVAVA') == (7174.0, 718) - - @image_comparison(['text_contains.png']) def test_contains(): fig = plt.figure() From 155ae8a496e6a3faad6a9d7b3c7f5aa2853532b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trygve=20Magnus=20R=C3=A6der?= Date: Sun, 1 Jun 2025 14:13:44 +0200 Subject: [PATCH 085/161] Updates based on code review --- .../examples/images_contours_and_fields/multi_image.py | 10 +++++----- galleries/users_explain/colors/colorbar_only.py | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/galleries/examples/images_contours_and_fields/multi_image.py b/galleries/examples/images_contours_and_fields/multi_image.py index 9769dbf5219d..11be73f3a267 100644 --- a/galleries/examples/images_contours_and_fields/multi_image.py +++ b/galleries/examples/images_contours_and_fields/multi_image.py @@ -20,7 +20,8 @@ import matplotlib.pyplot as plt import numpy as np -import matplotlib as mpl +import matplotlib.colorizer as mcolorizer +import matplotlib.colors as mcolors np.random.seed(19680801) @@ -32,9 +33,9 @@ fig, axs = plt.subplots(2, 2) fig.suptitle('Multiple images') -# create a single norm and colorizer to be shared across all images -norm = mpl.colors.Normalize(vmin=np.min(datasets), vmax=np.max(datasets)) -colorizer = mpl.colorizer.Colorizer(norm=norm) +# create a colorizer with a predefined norm to be shared across all images +norm = mcolors.Normalize(vmin=np.min(datasets), vmax=np.max(datasets)) +colorizer = mcolorizer.Colorizer(norm=norm) images = [] for ax, data in zip(axs.flat, datasets): @@ -61,4 +62,3 @@ # - `matplotlib.figure.Figure.colorbar` / `matplotlib.pyplot.colorbar` # - `matplotlib.colorizer.Colorizer` # - `matplotlib.colors.Normalize` -# - `matplotlib.cbook.CallbackRegistry.connect` diff --git a/galleries/users_explain/colors/colorbar_only.py b/galleries/users_explain/colors/colorbar_only.py index ee97e91162ae..34de2bc78888 100644 --- a/galleries/users_explain/colors/colorbar_only.py +++ b/galleries/users_explain/colors/colorbar_only.py @@ -8,11 +8,11 @@ This tutorial shows how to build and customize standalone colorbars, i.e. without an attached plot. -A `~.Figure.colorbar` needs a "mappable" (`matplotlib.colorizer.ColorizingArtist`) -object (typically, an image) which contains a colorizer -(`matplotlib.colorizer.Colorizer`) that holds the data-to-color pipeline (norm and -colormap). In order to create a colorbar without an attached image, one can instead +A `~.Figure.colorbar` requires a `matplotlib.colorizer.ColorizingArtist` which +contains a `matplotlib.colorizer.Colorizer` that holds the data-to-color pipeline +(norm and colormap). To create a colorbar without an attached plot one can use a `.ColorizingArtist` with no associated data. + """ import matplotlib.pyplot as plt From 6083ecd880c950a705ba74107ff18b447e2c53dc Mon Sep 17 00:00:00 2001 From: David Stansby Date: Mon, 2 Jun 2025 10:02:01 +0100 Subject: [PATCH 086/161] Remove apply_theta_transforms argument (#30004) * Remove apply_theta_transforms argument * Improve formatting * Rename xxxxxx-DS.rst to 30004-DS.rst * Delete extra line --- .../next_api_changes/removals/30004-DS.rst | 10 ++++ .../next_api_changes/removals/xxxxxx-DS.rst | 4 -- .../axisartist/demo_axis_direction.py | 2 +- .../axisartist/demo_curvelinear_grid.py | 3 +- .../examples/axisartist/demo_floating_axes.py | 5 +- .../examples/axisartist/demo_floating_axis.py | 3 +- .../examples/axisartist/simple_axis_pad.py | 3 +- lib/matplotlib/projections/polar.py | 55 +++---------------- lib/matplotlib/projections/polar.pyi | 3 - lib/matplotlib/tests/test_transforms.py | 3 +- lib/matplotlib/text.py | 4 +- .../axisartist/tests/test_floating_axes.py | 4 +- .../tests/test_grid_helper_curvelinear.py | 6 +- 13 files changed, 29 insertions(+), 76 deletions(-) create mode 100644 doc/api/next_api_changes/removals/30004-DS.rst delete mode 100644 doc/api/next_api_changes/removals/xxxxxx-DS.rst diff --git a/doc/api/next_api_changes/removals/30004-DS.rst b/doc/api/next_api_changes/removals/30004-DS.rst new file mode 100644 index 000000000000..f5fdf214366c --- /dev/null +++ b/doc/api/next_api_changes/removals/30004-DS.rst @@ -0,0 +1,10 @@ +``apply_theta_transforms`` option in ``PolarTransform`` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Applying theta transforms in `~matplotlib.projections.polar.PolarTransform` and +`~matplotlib.projections.polar.InvertedPolarTransform` has been removed, and +the ``apply_theta_transforms`` keyword argument removed from both classes. + +If you need to retain the behaviour where theta values +are transformed, chain the ``PolarTransform`` with a `~matplotlib.transforms.Affine2D` +transform that performs the theta shift and/or sign shift. diff --git a/doc/api/next_api_changes/removals/xxxxxx-DS.rst b/doc/api/next_api_changes/removals/xxxxxx-DS.rst deleted file mode 100644 index 8ae7919afa31..000000000000 --- a/doc/api/next_api_changes/removals/xxxxxx-DS.rst +++ /dev/null @@ -1,4 +0,0 @@ -``backend_ps.get_bbox_header`` -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -... is removed, as it is considered an internal helper. diff --git a/galleries/examples/axisartist/demo_axis_direction.py b/galleries/examples/axisartist/demo_axis_direction.py index 8c57b6c5a351..9540599c6a7b 100644 --- a/galleries/examples/axisartist/demo_axis_direction.py +++ b/galleries/examples/axisartist/demo_axis_direction.py @@ -22,7 +22,7 @@ def setup_axes(fig, rect): grid_helper = GridHelperCurveLinear( ( Affine2D().scale(np.pi/180., 1.) + - PolarAxes.PolarTransform(apply_theta_transforms=False) + PolarAxes.PolarTransform() ), extreme_finder=angle_helper.ExtremeFinderCycle( 20, 20, diff --git a/galleries/examples/axisartist/demo_curvelinear_grid.py b/galleries/examples/axisartist/demo_curvelinear_grid.py index 40853dee12cb..fb1fbdd011ce 100644 --- a/galleries/examples/axisartist/demo_curvelinear_grid.py +++ b/galleries/examples/axisartist/demo_curvelinear_grid.py @@ -54,8 +54,7 @@ def curvelinear_test2(fig): # PolarAxes.PolarTransform takes radian. However, we want our coordinate # system in degree - tr = Affine2D().scale(np.pi/180, 1) + PolarAxes.PolarTransform( - apply_theta_transforms=False) + tr = Affine2D().scale(np.pi/180, 1) + PolarAxes.PolarTransform() # Polar projection, which involves cycle, and also has limits in # its coordinates, needs a special method to find the extremes # (min, max of the coordinate within the view). diff --git a/galleries/examples/axisartist/demo_floating_axes.py b/galleries/examples/axisartist/demo_floating_axes.py index 632f6d237aa6..add03e266d3e 100644 --- a/galleries/examples/axisartist/demo_floating_axes.py +++ b/galleries/examples/axisartist/demo_floating_axes.py @@ -54,7 +54,7 @@ def setup_axes2(fig, rect): With custom locator and formatter. Note that the extreme values are swapped. """ - tr = PolarAxes.PolarTransform(apply_theta_transforms=False) + tr = PolarAxes.PolarTransform() pi = np.pi angle_ticks = [(0, r"$0$"), @@ -99,8 +99,7 @@ def setup_axes3(fig, rect): # scale degree to radians tr_scale = Affine2D().scale(np.pi/180., 1.) - tr = tr_rotate + tr_scale + PolarAxes.PolarTransform( - apply_theta_transforms=False) + tr = tr_rotate + tr_scale + PolarAxes.PolarTransform() grid_locator1 = angle_helper.LocatorHMS(4) tick_formatter1 = angle_helper.FormatterHMS() diff --git a/galleries/examples/axisartist/demo_floating_axis.py b/galleries/examples/axisartist/demo_floating_axis.py index 5296b682367b..0894bf8f4ce1 100644 --- a/galleries/examples/axisartist/demo_floating_axis.py +++ b/galleries/examples/axisartist/demo_floating_axis.py @@ -22,8 +22,7 @@ def curvelinear_test2(fig): """Polar projection, but in a rectangular box.""" # see demo_curvelinear_grid.py for details - tr = Affine2D().scale(np.pi / 180., 1.) + PolarAxes.PolarTransform( - apply_theta_transforms=False) + tr = Affine2D().scale(np.pi / 180., 1.) + PolarAxes.PolarTransform() extreme_finder = angle_helper.ExtremeFinderCycle(20, 20, diff --git a/galleries/examples/axisartist/simple_axis_pad.py b/galleries/examples/axisartist/simple_axis_pad.py index 95f30ce1ffbc..f40a1aa9f273 100644 --- a/galleries/examples/axisartist/simple_axis_pad.py +++ b/galleries/examples/axisartist/simple_axis_pad.py @@ -21,8 +21,7 @@ def setup_axes(fig, rect): """Polar projection, but in a rectangular box.""" # see demo_curvelinear_grid.py for details - tr = Affine2D().scale(np.pi/180., 1.) + PolarAxes.PolarTransform( - apply_theta_transforms=False) + tr = Affine2D().scale(np.pi/180., 1.) + PolarAxes.PolarTransform() extreme_finder = angle_helper.ExtremeFinderCycle(20, 20, lon_cycle=360, diff --git a/lib/matplotlib/projections/polar.py b/lib/matplotlib/projections/polar.py index 71224fb3affe..948b3a6e704f 100644 --- a/lib/matplotlib/projections/polar.py +++ b/lib/matplotlib/projections/polar.py @@ -15,20 +15,6 @@ from matplotlib.spines import Spine -def _apply_theta_transforms_warn(): - _api.warn_deprecated( - "3.9", - message=( - "Passing `apply_theta_transforms=True` (the default) " - "is deprecated since Matplotlib %(since)s. " - "Support for this will be removed in Matplotlib in %(removal)s. " - "To prevent this warning, set `apply_theta_transforms=False`, " - "and make sure to shift theta values before being passed to " - "this transform." - ) - ) - - class PolarTransform(mtransforms.Transform): r""" The base polar transform. @@ -48,8 +34,7 @@ class PolarTransform(mtransforms.Transform): input_dims = output_dims = 2 - def __init__(self, axis=None, use_rmin=True, *, - apply_theta_transforms=True, scale_transform=None): + def __init__(self, axis=None, use_rmin=True, *, scale_transform=None): """ Parameters ---------- @@ -64,15 +49,12 @@ def __init__(self, axis=None, use_rmin=True, *, super().__init__() self._axis = axis self._use_rmin = use_rmin - self._apply_theta_transforms = apply_theta_transforms self._scale_transform = scale_transform - if apply_theta_transforms: - _apply_theta_transforms_warn() __str__ = mtransforms._make_str_method( "_axis", - use_rmin="_use_rmin", - apply_theta_transforms="_apply_theta_transforms") + use_rmin="_use_rmin" + ) def _get_rorigin(self): # Get lower r limit after being scaled by the radial scale transform @@ -82,11 +64,6 @@ def _get_rorigin(self): def transform_non_affine(self, values): # docstring inherited theta, r = np.transpose(values) - # PolarAxes does not use the theta transforms here, but apply them for - # backwards-compatibility if not being used by it. - if self._apply_theta_transforms and self._axis is not None: - theta *= self._axis.get_theta_direction() - theta += self._axis.get_theta_offset() if self._use_rmin and self._axis is not None: r = (r - self._get_rorigin()) * self._axis.get_rsign() r = np.where(r >= 0, r, np.nan) @@ -148,10 +125,7 @@ def transform_path_non_affine(self, path): def inverted(self): # docstring inherited - return PolarAxes.InvertedPolarTransform( - self._axis, self._use_rmin, - apply_theta_transforms=self._apply_theta_transforms - ) + return PolarAxes.InvertedPolarTransform(self._axis, self._use_rmin) class PolarAffine(mtransforms.Affine2DBase): @@ -209,8 +183,7 @@ class InvertedPolarTransform(mtransforms.Transform): """ input_dims = output_dims = 2 - def __init__(self, axis=None, use_rmin=True, - *, apply_theta_transforms=True): + def __init__(self, axis=None, use_rmin=True): """ Parameters ---------- @@ -225,26 +198,16 @@ def __init__(self, axis=None, use_rmin=True, super().__init__() self._axis = axis self._use_rmin = use_rmin - self._apply_theta_transforms = apply_theta_transforms - if apply_theta_transforms: - _apply_theta_transforms_warn() __str__ = mtransforms._make_str_method( "_axis", - use_rmin="_use_rmin", - apply_theta_transforms="_apply_theta_transforms") + use_rmin="_use_rmin") def transform_non_affine(self, values): # docstring inherited x, y = values.T r = np.hypot(x, y) theta = (np.arctan2(y, x) + 2 * np.pi) % (2 * np.pi) - # PolarAxes does not use the theta transforms here, but apply them for - # backwards-compatibility if not being used by it. - if self._apply_theta_transforms and self._axis is not None: - theta -= self._axis.get_theta_offset() - theta *= self._axis.get_theta_direction() - theta %= 2 * np.pi if self._use_rmin and self._axis is not None: r += self._axis.get_rorigin() r *= self._axis.get_rsign() @@ -252,10 +215,7 @@ def transform_non_affine(self, values): def inverted(self): # docstring inherited - return PolarAxes.PolarTransform( - self._axis, self._use_rmin, - apply_theta_transforms=self._apply_theta_transforms - ) + return PolarAxes.PolarTransform(self._axis, self._use_rmin) class ThetaFormatter(mticker.Formatter): @@ -895,7 +855,6 @@ def _set_lim_and_transforms(self): # data. This one is aware of rmin self.transProjection = self.PolarTransform( self, - apply_theta_transforms=False, scale_transform=self.transScale ) # Add dependency on rorigin. diff --git a/lib/matplotlib/projections/polar.pyi b/lib/matplotlib/projections/polar.pyi index de1cbc293900..fc1d508579b5 100644 --- a/lib/matplotlib/projections/polar.pyi +++ b/lib/matplotlib/projections/polar.pyi @@ -18,7 +18,6 @@ class PolarTransform(mtransforms.Transform): axis: PolarAxes | None = ..., use_rmin: bool = ..., *, - apply_theta_transforms: bool = ..., scale_transform: mtransforms.Transform | None = ..., ) -> None: ... def inverted(self) -> InvertedPolarTransform: ... @@ -35,8 +34,6 @@ class InvertedPolarTransform(mtransforms.Transform): self, axis: PolarAxes | None = ..., use_rmin: bool = ..., - *, - apply_theta_transforms: bool = ..., ) -> None: ... def inverted(self) -> PolarTransform: ... diff --git a/lib/matplotlib/tests/test_transforms.py b/lib/matplotlib/tests/test_transforms.py index 99647e99bbde..b4db34db5a91 100644 --- a/lib/matplotlib/tests/test_transforms.py +++ b/lib/matplotlib/tests/test_transforms.py @@ -891,8 +891,7 @@ def test_str_transform(): Affine2D().scale(1.0))), PolarTransform( PolarAxes(0.125,0.1;0.775x0.8), - use_rmin=True, - apply_theta_transforms=False)), + use_rmin=True)), CompositeGenericTransform( CompositeGenericTransform( PolarAffine( diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py index 3b0de58814d9..acde4fb179a2 100644 --- a/lib/matplotlib/text.py +++ b/lib/matplotlib/text.py @@ -1553,9 +1553,7 @@ def _get_xy_transform(self, renderer, coords): return self.axes.transData elif coords == 'polar': from matplotlib.projections import PolarAxes - tr = PolarAxes.PolarTransform(apply_theta_transforms=False) - trans = tr + self.axes.transData - return trans + return PolarAxes.PolarTransform() + self.axes.transData try: bbox_name, unit = coords.split() diff --git a/lib/mpl_toolkits/axisartist/tests/test_floating_axes.py b/lib/mpl_toolkits/axisartist/tests/test_floating_axes.py index 362384221bdd..feb667af013e 100644 --- a/lib/mpl_toolkits/axisartist/tests/test_floating_axes.py +++ b/lib/mpl_toolkits/axisartist/tests/test_floating_axes.py @@ -26,7 +26,7 @@ def test_curvelinear3(): fig = plt.figure(figsize=(5, 5)) tr = (mtransforms.Affine2D().scale(np.pi / 180, 1) + - mprojections.PolarAxes.PolarTransform(apply_theta_transforms=False)) + mprojections.PolarAxes.PolarTransform()) grid_helper = GridHelperCurveLinear( tr, extremes=(0, 360, 10, 3), @@ -75,7 +75,7 @@ def test_curvelinear4(): fig = plt.figure(figsize=(5, 5)) tr = (mtransforms.Affine2D().scale(np.pi / 180, 1) + - mprojections.PolarAxes.PolarTransform(apply_theta_transforms=False)) + mprojections.PolarAxes.PolarTransform()) grid_helper = GridHelperCurveLinear( tr, extremes=(120, 30, 10, 0), diff --git a/lib/mpl_toolkits/axisartist/tests/test_grid_helper_curvelinear.py b/lib/mpl_toolkits/axisartist/tests/test_grid_helper_curvelinear.py index 1b266044bdd0..7d6554782fe6 100644 --- a/lib/mpl_toolkits/axisartist/tests/test_grid_helper_curvelinear.py +++ b/lib/mpl_toolkits/axisartist/tests/test_grid_helper_curvelinear.py @@ -82,8 +82,7 @@ def test_polar_box(): # PolarAxes.PolarTransform takes radian. However, we want our coordinate # system in degree - tr = (Affine2D().scale(np.pi / 180., 1.) + - PolarAxes.PolarTransform(apply_theta_transforms=False)) + tr = Affine2D().scale(np.pi / 180., 1.) + PolarAxes.PolarTransform() # polar projection, which involves cycle, and also has limits in # its coordinates, needs a special method to find the extremes @@ -145,8 +144,7 @@ def test_axis_direction(): # PolarAxes.PolarTransform takes radian. However, we want our coordinate # system in degree - tr = (Affine2D().scale(np.pi / 180., 1.) + - PolarAxes.PolarTransform(apply_theta_transforms=False)) + tr = Affine2D().scale(np.pi / 180., 1.) + PolarAxes.PolarTransform() # polar projection, which involves cycle, and also has limits in # its coordinates, needs a special method to find the extremes From fea06c94baa25b64c33fc3acbc214c32cecc4ac0 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Sat, 13 Jul 2024 10:53:22 +0200 Subject: [PATCH 087/161] ENH: Add grouped_bar() method --- doc/_embedded_plots/grouped_bar.py | 15 ++ doc/api/axes_api.rst | 1 + doc/api/pyplot_summary.rst | 1 + doc/users/next_whats_new/grouped_bar.rst | 25 ++ lib/matplotlib/axes/_axes.py | 326 +++++++++++++++++++++++ lib/matplotlib/axes/_axes.pyi | 19 ++ lib/matplotlib/pyplot.py | 28 ++ tools/boilerplate.py | 1 + 8 files changed, 416 insertions(+) create mode 100644 doc/_embedded_plots/grouped_bar.py create mode 100644 doc/users/next_whats_new/grouped_bar.rst diff --git a/doc/_embedded_plots/grouped_bar.py b/doc/_embedded_plots/grouped_bar.py new file mode 100644 index 000000000000..f02e269328d2 --- /dev/null +++ b/doc/_embedded_plots/grouped_bar.py @@ -0,0 +1,15 @@ +import matplotlib.pyplot as plt + +categories = ['A', 'B'] +data0 = [1.0, 3.0] +data1 = [1.4, 3.4] +data2 = [1.8, 3.8] + +fig, ax = plt.subplots(figsize=(4, 2.2)) +ax.grouped_bar( + [data0, data1, data2], + tick_labels=categories, + labels=['dataset 0', 'dataset 1', 'dataset 2'], + colors=['#1f77b4', '#58a1cf', '#abd0e6'], +) +ax.legend() diff --git a/doc/api/axes_api.rst b/doc/api/axes_api.rst index 4bbcbe081194..b742ce9b7a55 100644 --- a/doc/api/axes_api.rst +++ b/doc/api/axes_api.rst @@ -67,6 +67,7 @@ Basic Axes.bar Axes.barh Axes.bar_label + Axes.grouped_bar Axes.stem Axes.eventplot diff --git a/doc/api/pyplot_summary.rst b/doc/api/pyplot_summary.rst index cdd57bfe6276..c4a860fd2590 100644 --- a/doc/api/pyplot_summary.rst +++ b/doc/api/pyplot_summary.rst @@ -60,6 +60,7 @@ Basic bar barh bar_label + grouped_bar stem eventplot pie diff --git a/doc/users/next_whats_new/grouped_bar.rst b/doc/users/next_whats_new/grouped_bar.rst new file mode 100644 index 000000000000..64f2905fbf0c --- /dev/null +++ b/doc/users/next_whats_new/grouped_bar.rst @@ -0,0 +1,25 @@ +Grouped bar charts +------------------ + +The new method `~.Axes.grouped_bar()` simplifies the creation of grouped bar charts +significantly. It supports different input data types (lists of datasets, dicts of +datasets, data in 2D arrays, pandas DataFrames), and allows for easy customization +of placement via controllable distances between bars and between bar groups. + +Example: + +.. plot:: + :include-source: true + + import matplotlib.pyplot as plt + + categories = ['A', 'B'] + datasets = { + 'dataset 0': [1.0, 3.0], + 'dataset 1': [1.4, 3.4], + 'dataset 2': [1.8, 3.8], + } + + fig, ax = plt.subplots(figsize=(4, 2.2)) + ax.grouped_bar(datasets, tick_labels=categories) + ax.legend() diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py index e480f8f29598..e10c1808176a 100644 --- a/lib/matplotlib/axes/_axes.py +++ b/lib/matplotlib/axes/_axes.py @@ -64,6 +64,23 @@ def _make_axes_method(func): return func +class _GroupedBarReturn: + """ + A provisional result object for `.Axes.grouped_bar`. + + This is a placeholder for a future better return type. We try to build in + backward compatibility / migration possibilities. + + The only public interfaces are the ``bar_containers`` attribute and the + ``remove()`` method. + """ + def __init__(self, bar_containers): + self.bar_containers = bar_containers + + def remove(self): + [b.remove() for b in self.bars] + + @_docstring.interpd class Axes(_AxesBase): """ @@ -2414,6 +2431,7 @@ def bar(self, x, height, width=0.8, bottom=None, *, align="center", See Also -------- barh : Plot a horizontal bar plot. + grouped_bar : Plot multiple datasets as grouped bar plot. Notes ----- @@ -3014,6 +3032,314 @@ def broken_barh(self, xranges, yrange, **kwargs): return col + @_docstring.interpd + def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing=0, + tick_labels=None, labels=None, orientation="vertical", colors=None, + **kwargs): + """ + Make a grouped bar plot. + + .. note:: + This function is new in v3.11, and the API is still provisional. + We may still fine-tune some aspects based on user-feedback. + + This is a convenience function to plot bars for multiple datasets. + In particular, it simplifies positioning of the bars compared to individual + `~.Axes.bar` plots. + + Bar plots present categorical data as a sequence of bars, one bar per category. + We call one set of such values a *dataset* and it's bars all share the same + color. Grouped bar plots show multiple such datasets, where the values per + category are grouped together. The category names are drawn as tick labels + below the bar groups. Each dataset has a distinct bar color, and can optionally + get a label that is used for the legend. + + Here is an example call structure and the corresponding plot: + + .. code-block:: python + + grouped_bar([dataset_1, dataset_2, dataset_3], + tick_labels=['A', 'B'], + labels=['dataset 1', 'dataset 2', 'dataset 3']) + + .. plot:: _embedded_plots/grouped_bar.py + + Parameters + ---------- + heights : list of array-like or dict of array-like or 2D array \ +or pandas.DataFrame + The heights for all x and groups. One of: + + - list of array-like: A list of datasets, each dataset must have + the same number of elements. + + .. code-block:: none + + # category_A, category_B + dataset_0 = [ds0_A, ds0_B] + dataset_1 = [ds1_A, ds1_B] + dataset_2 = [ds2_A, ds2_B] + + Example call:: + + grouped_bar([dataset_0, dataset_1, dataset_2]) + + - dict of array-like: A mapping from names to datasets. Each dataset + (dict value) must have the same number of elements. + + This is similar to passing a list of array-like, with the addition that + each dataset gets a name. + + Example call: + + .. code-block:: python + + grouped_bar({'ds0': dataset_0, 'ds1': dataset_1, 'ds2': dataset_2]}) + + The names are used as *labels*, i.e. the following two calls are + equivalent: + + .. code-block:: python + + data_dict = {'ds0': dataset_0, 'ds1': dataset_1, 'ds2': dataset_2]} + grouped_bar(data_dict) + grouped_bar(data_dict.values(), labels=data_dict.keys()) + + When using a dict-like input, you must not pass *labels* explicitly. + + - a 2D array: The rows are the categories, the columns are the different + datasets. + + .. code-block:: none + + dataset_0 dataset_1 dataset_2 + category_A ds0_a ds1_a ds2_a + category_B ds0_b ds1_b ds2_b + + Example call: + + .. code-block:: python + + group_labels = ["group_A", "group_B"] + dataset_labels = ["dataset_0", "dataset_1", "dataset_2"] + array = np.random.random((2, 3)) + + Note that this is consistent with pandas. These two calls produce + the same bar plot structure: + + .. code-block:: python + + grouped_bar(array, tick_labels=categories, labels=dataset_labels) + df = pd.DataFrame(array, index=categories, columns=dataset_labels) + df.plot.bar() + + - a `pandas.DataFrame`. + + .. code-block:: python + + df = pd.DataFrame( + np.random.random((2, 3)) + index=["group_A", "group_B"], + columns=["dataset_0", "dataset_1", "dataset_2"] + ) + grouped_bar(df) + + Note that ``grouped_bar(df)`` produces a structurally equivalent plot like + ``df.plot.bar()``. + + positions : array-like, optional + The center positions of the bar groups. The values have to be equidistant. + If not given, a sequence of integer positions 0, 1, 2, ... is used. + + tick_labels : list of str, optional + The category labels, which are placed on ticks at the center *positions* + of the bar groups. + + If not set, the axis ticks (positions and labels) are left unchanged. + + labels : list of str, optional + The labels of the datasets, i.e. the bars within one group. + These will show up in the legend. + + group_spacing : float, default: 1.5 + The space between two bar groups in units of bar width. + + The default value of 1.5 thus means that there's a gap of + 1.5 bar widths between bar groups. + + bar_spacing : float, default: 0 + The space between bars in units of bar width. + + orientation : {"vertical", "horizontal"}, default: "vertical" + The direction of the bars. + + colors : list of :mpltype:`color`, optional + A sequence of colors to be cycled through and used to color bars + of the different datasets. The sequence need not be exactly the + same length as the number of provided y, in which case the colors + will repeat from the beginning. + + If not specified, the colors from the Axes property cycle will be used. + + **kwargs : `.Rectangle` properties + + %(Rectangle:kwdoc)s + + Returns + ------- + _GroupedBarReturn + + A provisional result object. This will be refined in the future. + For now, the guaranteed API on the returned object is limited to + + - the attribute ``bar_containers``, which is a list of + `.BarContainer`, i.e. the results of the individual `~.Axes.bar` + calls for each dataset. + + - a ``remove()`` method, that remove all bars from the Axes. + See also `.Artist.remove()`. + + See Also + -------- + bar : A lower-level API for bar plots, with more degrees of freedom like + individual bar sizes and colors. + + Notes + ----- + For a better understanding, we compare the `~.Axes.grouped_bar` API with + those of `~.Axes.bar` and `~.Axes.boxplot`. + + **Comparison to bar()** + + `~.Axes.grouped_bar` intentionally deviates from the `~.Axes.bar` API in some + aspects. ``bar(x, y)`` is a lower-level API and places bars with height *y* + at explicit positions *x*. It also allows to specify individual bar widths + and colors. This kind of detailed control and flexibility is difficult to + manage and often not needed when plotting multiple datasets as grouped bar + plot. Therefore, ``grouped_bar`` focusses on the abstraction of bar plots + as visualization of categorical data. + + The following examples may help to transfer from ``bar`` to + ``grouped_bar``. + + Positions are de-emphasized due to categories, and default to integer values. + If you have used ``range(N)`` as positions, you can leave that value out:: + + bar(range(N), heights) + grouped_bar([heights]) + + If needed, positions can be passed as keyword arguments:: + + bar(x, heights) + grouped_bar([heights], positions=x) + + To place category labels in `~.Axes.bar` you could use the argument + *tick_label* or use a list of category names as *x*. + `~.Axes.grouped_bar` expects them in the argument *tick_labels*:: + + bar(range(N), heights, tick_label=["A", "B"]) + bar(["A", "B"], heights) + grouped_bar([heights], tick_labels=["A", "B"]) + + Dataset labels, which are shown in the legend, are still passed via the + *label* parameter:: + + bar(..., label="dataset") + grouped_bar(..., label=["dataset"]) + + **Comparison to boxplot()** + + Both, `~.Axes.grouped_bar` and `~.Axes.boxplot` visualize categorical data + from multiple datasets. The basic API on *tick_labels* and *positions* + is the same, so that you can easily switch between plotting all + individual values as `~.Axes.grouped_bar` or the statistical distribution + per category as `~.Axes.boxplot`:: + + grouped_bar(values, positions=..., tick_labels=...) + boxplot(values, positions=..., tick_labels=...) + + """ + if cbook._is_pandas_dataframe(heights): + if labels is None: + labels = heights.columns.tolist() + if tick_labels is None: + tick_labels = heights.index.tolist() + heights = heights.to_numpy().T + elif hasattr(heights, 'keys'): # dict + if labels is not None: + raise ValueError( + "'labels' cannot be used if 'heights' are a mapping") + labels = heights.keys() + heights = list(heights.values()) + elif hasattr(heights, 'shape'): # numpy array + heights = heights.T + + num_datasets = len(heights) + dataset_0 = next(iter(heights)) + num_groups = len(dataset_0) + + if positions is None: + group_centers = np.arange(num_groups) + group_distance = 1 + else: + group_centers = np.asanyarray(positions) + if len(group_centers) > 1: + d = np.diff(group_centers) + if not np.allclose(d, d.mean()): + raise ValueError("'positions' must be equidistant") + group_distance = d[0] + else: + group_distance = 1 + + for i, dataset in enumerate(heights): + if len(dataset) != num_groups: + raise ValueError( + f"'x' indicates {num_groups} groups, but dataset {i} " + f"has {len(dataset)} groups" + ) + + _api.check_in_list(["vertical", "horizontal"], orientation=orientation) + + if colors is None: + colors = itertools.cycle([None]) + else: + # Note: This is equivalent to the behavior in stackplot + # TODO: do we want to be more restrictive and check lengths? + colors = itertools.cycle(colors) + + bar_width = (group_distance / + (num_datasets + (num_datasets - 1) * bar_spacing + group_spacing)) + bar_spacing_abs = bar_spacing * bar_width + margin_abs = 0.5 * group_spacing * bar_width + + if labels is None: + labels = [None] * num_datasets + else: + assert len(labels) == num_datasets + + # place the bars, but only use numerical positions, categorical tick labels + # are handled separately below + bar_containers = [] + for i, (hs, label, color) in enumerate( + zip(heights, labels, colors)): + lefts = (group_centers - 0.5 * group_distance + margin_abs + + i * (bar_width + bar_spacing_abs)) + if orientation == "vertical": + bc = self.bar(lefts, hs, width=bar_width, align="edge", + label=label, color=color, **kwargs) + else: + bc = self.barh(lefts, hs, height=bar_width, align="edge", + label=label, color=color, **kwargs) + bar_containers.append(bc) + + if tick_labels is not None: + if orientation == "vertical": + self.xaxis.set_ticks(group_centers, labels=tick_labels) + else: + self.yaxis.set_ticks(group_centers, labels=tick_labels) + + return _GroupedBarReturn(bar_containers) + @_preprocess_data() def stem(self, *args, linefmt=None, markerfmt=None, basefmt=None, bottom=0, label=None, orientation='vertical'): diff --git a/lib/matplotlib/axes/_axes.pyi b/lib/matplotlib/axes/_axes.pyi index c3eb28d2f095..f606a65753f4 100644 --- a/lib/matplotlib/axes/_axes.pyi +++ b/lib/matplotlib/axes/_axes.pyi @@ -37,6 +37,12 @@ from typing import Any, Literal, overload import numpy as np from numpy.typing import ArrayLike from matplotlib.typing import ColorType, MarkerType, LineStyleType +import pandas as pd + + +class _GroupedBarReturn: + def __init__(self, bar_containers: list[BarContainer]) -> None: ... + def remove(self) -> None: ... class Axes(_AxesBase): def get_title(self, loc: Literal["left", "center", "right"] = ...) -> str: ... @@ -265,6 +271,19 @@ class Axes(_AxesBase): data=..., **kwargs ) -> PolyCollection: ... + def grouped_bar( + self, + heights : Sequence[ArrayLike] | dict[str, ArrayLike] | np.ndarray | pd.DataFrame, + *, + positions : ArrayLike | None = ..., + tick_labels : Sequence[str] | None = ..., + labels : Sequence[str] | None = ..., + group_spacing : float | None = ..., + bar_spacing : float | None = ..., + orientation: Literal["vertical", "horizontal"] = ..., + colors: Iterable[ColorType] | None = ..., + **kwargs + ) -> list[BarContainer]: ... def stem( self, *args: ArrayLike | str, diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py index 78fc962d9c5c..cf5c9b4b739f 100644 --- a/lib/matplotlib/pyplot.py +++ b/lib/matplotlib/pyplot.py @@ -93,6 +93,7 @@ import PIL.Image from numpy.typing import ArrayLike + import pandas as pd import matplotlib.axes import matplotlib.artist @@ -3404,6 +3405,33 @@ def grid( gca().grid(visible=visible, which=which, axis=axis, **kwargs) +# Autogenerated by boilerplate.py. Do not edit as changes will be lost. +@_copy_docstring_and_deprecators(Axes.grouped_bar) +def grouped_bar( + heights: Sequence[ArrayLike] | dict[str, ArrayLike] | np.ndarray | pd.DataFrame, + *, + positions: ArrayLike | None = None, + group_spacing: float | None = 1.5, + bar_spacing: float | None = 0, + tick_labels: Sequence[str] | None = None, + labels: Sequence[str] | None = None, + orientation: Literal["vertical", "horizontal"] = "vertical", + colors: Iterable[ColorType] | None = None, + **kwargs, +) -> list[BarContainer]: + return gca().grouped_bar( + heights, + positions=positions, + group_spacing=group_spacing, + bar_spacing=bar_spacing, + tick_labels=tick_labels, + labels=labels, + orientation=orientation, + colors=colors, + **kwargs, + ) + + # Autogenerated by boilerplate.py. Do not edit as changes will be lost. @_copy_docstring_and_deprecators(Axes.hexbin) def hexbin( diff --git a/tools/boilerplate.py b/tools/boilerplate.py index f018dfc887c8..11ec15ac1c44 100644 --- a/tools/boilerplate.py +++ b/tools/boilerplate.py @@ -238,6 +238,7 @@ def boilerplate_gen(): 'fill_between', 'fill_betweenx', 'grid', + 'grouped_bar', 'hexbin', 'hist', 'stairs', From 556895dd9f22fd6d660cadbbf74b309df08c30f1 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Thu, 23 Jan 2025 14:56:56 +0100 Subject: [PATCH 088/161] Add tests for grouped_bar() --- .../baseline_images/test_axes/grouped_bar.png | Bin 0 -> 3914 bytes lib/matplotlib/tests/test_axes.py | 85 ++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 lib/matplotlib/tests/baseline_images/test_axes/grouped_bar.png diff --git a/lib/matplotlib/tests/baseline_images/test_axes/grouped_bar.png b/lib/matplotlib/tests/baseline_images/test_axes/grouped_bar.png new file mode 100644 index 0000000000000000000000000000000000000000..19d676a6b6629d12cfcdddec42b7fc329e35078a GIT binary patch literal 3914 zcmd^Cdr*^C7QX>Te1a`n6qL|9Te=J76?q9EELzY-LB(hw<&k0pf+Qdb(C`Qq&}FC~ zt@0)mqeKD;E;K{}BviK`%QFZG@(?JdZ_x96_yM%w`ZyG|TGb`}7w6aZjjTems}Om&kFrD|m1U zM~=EoB3};w$}|>#B_^CiL|EEbTUuLQ#K+p$96oFwdNJgptsMeyYvW{j(bn45&f3Nn zVPP6ZCP&2_v9gN%m%b(GN~jgA_S^tuV_Vd5zZd}Yahex)AH@s@KrjEqu|J=SFP0An zh3zH7Tjv!8J8qBzF}U`hKJ=h`OhNy}^hDY>djc>y7CAHJ%`*PNCs()gxAW(}I$QPG z)fxD?JpuRjJUKxA7-x~s-p#E0nX!M)#c*B+Nef0wlZRA|fqBLUT)&4qlW3vSWc~<| z2f$xN5-Q}5mlx0iX&x6Qh|=!;!iG zlSbrW7Zw)m933%9Nd<8@tyi`k9UXl=J*Q>+L9-f1rSk0~2m7cV2GB|smd9bOJGyCW zYu}InkZI%KaN+3DqcqoSvkz19#)GU@^>*&u>IN{l@6?Ir3+W_~60Efwn0^a%z}7en-OU>?ntBXY?Mt4UfO_D?b;CF=9Xz;G4|~U+ zdgo?*-xQyYQh|k;!h5|Bf=Vu!D2JfJlx<#ZY!s^oENb^eH9P`|6FnbH2$gLE4<`Q) zM%Q`c)2>7$?o4ug^aaRh^XS-?-!gjNH?-g7czM5L)EtiHe!L+zi&bA=U-|mY4&mAa z%VqBNk^-exOw%HNoK&nX%hhiv0?~Iu5^;`izMgNc>_D@NW0ptjs&B>QB~G#4aw5hF z#q}tYN;bjpd2Q#)4&ji=UCSaL-m}7}?UFbm3JRdCnnE|L(HZ8(CRmXGNng z#C-bYv9jU%7!706)i3O9hpGD;mVYU zsXci?$$kxS3Qp4MQh$XnQ~D(5kW$VY6=xWjNed%5;mB;07h7)P<%_dVH7=DVuY@0T zjQXK2a_GEO)8bhus0SjEXhk($DqHAAsTU#?LUl6o?W@NWX5hhaF9v^>%; zkxcK^%e`gnmdl-=pC5b}9Wnw1rTn{rPoFWV@l2j&00Eh4ia;PJGd*R4HF&Q8+M1F* z-4k*tG*nhZ5>!Aga_R2-U{7l7p(q&)M*l2XD)NN0YeT!mW~GU})Q^yJnO1`P-b`Nz z6{0{jRhXZDpEsJ^aHPar7QUE2J3Gr_4K{uqGw}!LK()ZOW*w|-Yik>9h$ErV>>#1Q zggR4pggkS42)EdnFjvnkFE1w$2&^m zgal*iT3T9ILZOgOl~$mH_6US8YW+<}XIGc_+Ad8F^4Na0<=3uXuVfM8;~(moxL_hA z9JVGALKe(;5{QiuS5+`elldN=p4e`Nr|JO2|3B?2cJejzp;vJuB;wC`!@rbF ne`&Wt`}0zM{ViY<$Fy4K(~;@DGx{YA06izZ@IJ Date: Wed, 22 Jan 2025 18:47:48 +0100 Subject: [PATCH 089/161] Simplify "Grouped bar chart with labels" using grouped_bar() --- .../examples/lines_bars_and_markers/barchart.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/galleries/examples/lines_bars_and_markers/barchart.py b/galleries/examples/lines_bars_and_markers/barchart.py index f2157a89c0cd..dbb0f5bbbadd 100644 --- a/galleries/examples/lines_bars_and_markers/barchart.py +++ b/galleries/examples/lines_bars_and_markers/barchart.py @@ -10,7 +10,6 @@ # data from https://allisonhorst.github.io/palmerpenguins/ import matplotlib.pyplot as plt -import numpy as np species = ("Adelie", "Chinstrap", "Gentoo") penguin_means = { @@ -19,22 +18,15 @@ 'Flipper Length': (189.95, 195.82, 217.19), } -x = np.arange(len(species)) # the label locations -width = 0.25 # the width of the bars -multiplier = 0 - fig, ax = plt.subplots(layout='constrained') -for attribute, measurement in penguin_means.items(): - offset = width * multiplier - rects = ax.bar(x + offset, measurement, width, label=attribute) - ax.bar_label(rects, padding=3) - multiplier += 1 +res = ax.grouped_bar(penguin_means, tick_labels=species, group_spacing=1) +for container in res.bar_containers: + ax.bar_label(container, padding=3) -# Add some text for labels, title and custom x-axis tick labels, etc. +# Add some text for labels, title, etc. ax.set_ylabel('Length (mm)') ax.set_title('Penguin attributes by species') -ax.set_xticks(x + width, species) ax.legend(loc='upper left', ncols=3) ax.set_ylim(0, 250) From 7fa82d7ed9bdbf2934e0b37bd70b3f8e960310b4 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Fri, 24 Jan 2025 00:20:18 +0100 Subject: [PATCH 090/161] Apply suggestions from code review Co-authored-by: hannah --- doc/users/next_whats_new/grouped_bar.rst | 9 +-- lib/matplotlib/axes/_axes.py | 90 +++++++++++------------- 2 files changed, 48 insertions(+), 51 deletions(-) diff --git a/doc/users/next_whats_new/grouped_bar.rst b/doc/users/next_whats_new/grouped_bar.rst index 64f2905fbf0c..af57c71b8a3a 100644 --- a/doc/users/next_whats_new/grouped_bar.rst +++ b/doc/users/next_whats_new/grouped_bar.rst @@ -10,16 +10,17 @@ Example: .. plot:: :include-source: true + :alt: Diagram of a grouped bar chart of 3 datasets with 2 categories. import matplotlib.pyplot as plt categories = ['A', 'B'] datasets = { - 'dataset 0': [1.0, 3.0], - 'dataset 1': [1.4, 3.4], - 'dataset 2': [1.8, 3.8], + 'dataset 0': [1, 11], + 'dataset 1': [3, 13], + 'dataset 2': [5, 15], } - fig, ax = plt.subplots(figsize=(4, 2.2)) + fig, ax = plt.subplots() ax.grouped_bar(datasets, tick_labels=categories) ax.legend() diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py index e10c1808176a..1ca2630e7166 100644 --- a/lib/matplotlib/axes/_axes.py +++ b/lib/matplotlib/axes/_axes.py @@ -3039,22 +3039,20 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing """ Make a grouped bar plot. - .. note:: + .. versionadded:: 3.11 + This function is new in v3.11, and the API is still provisional. We may still fine-tune some aspects based on user-feedback. - This is a convenience function to plot bars for multiple datasets. - In particular, it simplifies positioning of the bars compared to individual - `~.Axes.bar` plots. - - Bar plots present categorical data as a sequence of bars, one bar per category. - We call one set of such values a *dataset* and it's bars all share the same - color. Grouped bar plots show multiple such datasets, where the values per - category are grouped together. The category names are drawn as tick labels - below the bar groups. Each dataset has a distinct bar color, and can optionally - get a label that is used for the legend. + Grouped bar charts visualize a collection of multiple categorical datasets. + A categorical dataset is a mapping *name* -> *value*. The values of the + dataset are represented by a sequence of bars of the same color. + In a grouped bar chart, the bars of all datasets are grouped together by + category. The category names are drawn as tick labels next to the bar group. + Each dataset has a distinct bar color, and can optionally get a label that + is used for the legend. - Here is an example call structure and the corresponding plot: + Example: .. code-block:: python @@ -3087,25 +3085,20 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing - dict of array-like: A mapping from names to datasets. Each dataset (dict value) must have the same number of elements. - This is similar to passing a list of array-like, with the addition that - each dataset gets a name. - Example call: .. code-block:: python - grouped_bar({'ds0': dataset_0, 'ds1': dataset_1, 'ds2': dataset_2]}) + data_dict = {'ds0': dataset_0, 'ds1': dataset_1, 'ds2': dataset_2} + grouped_bar(data_dict) - The names are used as *labels*, i.e. the following two calls are - equivalent: + The names are used as *labels*, i.e. this is equivalent to .. code-block:: python - data_dict = {'ds0': dataset_0, 'ds1': dataset_1, 'ds2': dataset_2]} - grouped_bar(data_dict) grouped_bar(data_dict.values(), labels=data_dict.keys()) - When using a dict-like input, you must not pass *labels* explicitly. + When using a dict input, you must not pass *labels* explicitly. - a 2D array: The rows are the categories, the columns are the different datasets. @@ -3120,30 +3113,31 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing .. code-block:: python - group_labels = ["group_A", "group_B"] + categories = ["A", "B"] dataset_labels = ["dataset_0", "dataset_1", "dataset_2"] array = np.random.random((2, 3)) - - Note that this is consistent with pandas. These two calls produce - the same bar plot structure: - - .. code-block:: python - grouped_bar(array, tick_labels=categories, labels=dataset_labels) - df = pd.DataFrame(array, index=categories, columns=dataset_labels) - df.plot.bar() - a `pandas.DataFrame`. + The index is used for the categories, the columns are used for the + datasets. + .. code-block:: python df = pd.DataFrame( - np.random.random((2, 3)) - index=["group_A", "group_B"], + np.random.random((2, 3)), + index=["A", "B"], columns=["dataset_0", "dataset_1", "dataset_2"] ) grouped_bar(df) + i.e. this is equivalent to + + .. code-block:: + + grouped_bar(df.to_numpy(), tick_labels=df.index, labels=df.columns) + Note that ``grouped_bar(df)`` produces a structurally equivalent plot like ``df.plot.bar()``. @@ -3153,22 +3147,21 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing tick_labels : list of str, optional The category labels, which are placed on ticks at the center *positions* - of the bar groups. - - If not set, the axis ticks (positions and labels) are left unchanged. + of the bar groups. If not set, the axis ticks (positions and labels) are + left unchanged. labels : list of str, optional The labels of the datasets, i.e. the bars within one group. These will show up in the legend. group_spacing : float, default: 1.5 - The space between two bar groups in units of bar width. + The space between two bar groups as multiples of bar width. The default value of 1.5 thus means that there's a gap of 1.5 bar widths between bar groups. bar_spacing : float, default: 0 - The space between bars in units of bar width. + The space between bars as multiples of bar width. orientation : {"vertical", "horizontal"}, default: "vertical" The direction of the bars. @@ -3215,7 +3208,7 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing aspects. ``bar(x, y)`` is a lower-level API and places bars with height *y* at explicit positions *x*. It also allows to specify individual bar widths and colors. This kind of detailed control and flexibility is difficult to - manage and often not needed when plotting multiple datasets as grouped bar + manage and often not needed when plotting multiple datasets as a grouped bar plot. Therefore, ``grouped_bar`` focusses on the abstraction of bar plots as visualization of categorical data. @@ -3275,8 +3268,18 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing heights = heights.T num_datasets = len(heights) - dataset_0 = next(iter(heights)) - num_groups = len(dataset_0) + num_groups = len(next(iter(heights))) # inferred from first dataset + + # validate that all datasets have the same length, i.e. num_groups + # - can be skipped if heights is an array + if not hasattr(heights, 'shape'): + for i, dataset in enumerate(heights): + if len(dataset) != num_groups: + raise ValueError( + "'heights' contains datasets with different number of " + f"elements. dataset 0 has {num_groups} elements but " + f"dataset {i} has {len(dataset)} elements." + ) if positions is None: group_centers = np.arange(num_groups) @@ -3291,13 +3294,6 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing else: group_distance = 1 - for i, dataset in enumerate(heights): - if len(dataset) != num_groups: - raise ValueError( - f"'x' indicates {num_groups} groups, but dataset {i} " - f"has {len(dataset)} groups" - ) - _api.check_in_list(["vertical", "horizontal"], orientation=orientation) if colors is None: From 8cf06c487882f0270cb72810e56b7313603f63e3 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Sat, 1 Feb 2025 13:08:45 +0100 Subject: [PATCH 091/161] Docstring wording --- lib/matplotlib/axes/_axes.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py index 1ca2630e7166..e6d392d0c191 100644 --- a/lib/matplotlib/axes/_axes.py +++ b/lib/matplotlib/axes/_axes.py @@ -3041,16 +3041,17 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing .. versionadded:: 3.11 - This function is new in v3.11, and the API is still provisional. - We may still fine-tune some aspects based on user-feedback. - - Grouped bar charts visualize a collection of multiple categorical datasets. - A categorical dataset is a mapping *name* -> *value*. The values of the - dataset are represented by a sequence of bars of the same color. - In a grouped bar chart, the bars of all datasets are grouped together by - category. The category names are drawn as tick labels next to the bar group. - Each dataset has a distinct bar color, and can optionally get a label that - is used for the legend. + The API is still provisional. We may still fine-tune some aspects based on + user-feedback. + + Grouped bar charts visualize a collection of categorical datasets. Each value + in a dataset belongs to a distinct category and these categories are the same + across all datasets. The categories typically have string names, but could + also be dates or index keys. The values in each dataset are represented by a + sequence of bars of the same color. The bars of all datasets are grouped + together by their shared categories. The category names are drawn as the tick + labels for each bar group. Each dataset has a distinct bar color, and can + optionally get a label that is used for the legend. Example: From a4ed768b184a28a1725f4ffe2c0c2d963bc0ac52 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Wed, 5 Feb 2025 20:27:34 +0100 Subject: [PATCH 092/161] Update lib/matplotlib/axes/_axes.py Co-authored-by: hannah --- lib/matplotlib/axes/_axes.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py index e6d392d0c191..d9dd17252e0b 100644 --- a/lib/matplotlib/axes/_axes.py +++ b/lib/matplotlib/axes/_axes.py @@ -3074,10 +3074,10 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing .. code-block:: none - # category_A, category_B - dataset_0 = [ds0_A, ds0_B] - dataset_1 = [ds1_A, ds1_B] - dataset_2 = [ds2_A, ds2_B] + # category_A, category_B + dataset_0 = [value_0_A, value_0_B] + dataset_1 = [value_1_A, value_1_B] + dataset_2 = [value_2_A, value_2_B] Example call:: From d9aa5f64bae90654b05560afde48a2226f454e99 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Mon, 2 Jun 2025 16:06:33 +0200 Subject: [PATCH 093/161] Add test for grouped_bar() return value --- lib/matplotlib/axes/_axes.py | 2 +- lib/matplotlib/tests/test_axes.py | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py index d9dd17252e0b..fa5ff198fe26 100644 --- a/lib/matplotlib/axes/_axes.py +++ b/lib/matplotlib/axes/_axes.py @@ -78,7 +78,7 @@ def __init__(self, bar_containers): self.bar_containers = bar_containers def remove(self): - [b.remove() for b in self.bars] + [b.remove() for b in self.bar_containers] @_docstring.interpd diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py index e7158845307d..605e7b557713 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -23,6 +23,7 @@ from matplotlib import rc_context, patheffects import matplotlib.colors as mcolors import matplotlib.dates as mdates +from matplotlib.container import BarContainer from matplotlib.figure import Figure from matplotlib.axes import Axes from matplotlib.lines import Line2D @@ -2251,6 +2252,20 @@ def test_grouped_bar_dataframe(fig_test, fig_ref, pd): ax.legend() +def test_grouped_bar_return_value(): + fig, ax = plt.subplots() + ret = ax.grouped_bar([[1, 2, 3], [11, 12, 13]], tick_labels=['A', 'B', 'C']) + + assert len(ret.bar_containers) == 2 + for bc in ret.bar_containers: + assert isinstance(bc, BarContainer) + assert bc in ax.containers + + ret.remove() + for bc in ret.bar_containers: + assert bc not in ax.containers + + def test_boxplot_dates_pandas(pd): # smoke test for boxplot and dates in pandas data = np.random.rand(5, 2) From e0afe743127b4462df362148ba63537aa7980132 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Mon, 2 Jun 2025 16:16:22 +0200 Subject: [PATCH 094/161] Apply suggestions from code review --- lib/matplotlib/axes/_axes.py | 30 ++++++++++++++---------------- lib/matplotlib/axes/_axes.pyi | 13 +++++++------ lib/matplotlib/tests/test_axes.py | 8 ++++---- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py index fa5ff198fe26..b4ed7ae22d35 100644 --- a/lib/matplotlib/axes/_axes.py +++ b/lib/matplotlib/axes/_axes.py @@ -3057,9 +3057,9 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing .. code-block:: python - grouped_bar([dataset_1, dataset_2, dataset_3], + grouped_bar([dataset_0, dataset_1, dataset_2], tick_labels=['A', 'B'], - labels=['dataset 1', 'dataset 2', 'dataset 3']) + labels=['dataset 0', 'dataset 1', 'dataset 2']) .. plot:: _embedded_plots/grouped_bar.py @@ -3156,13 +3156,13 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing These will show up in the legend. group_spacing : float, default: 1.5 - The space between two bar groups as multiples of bar width. + The space between two bar groups as a multiple of bar width. The default value of 1.5 thus means that there's a gap of 1.5 bar widths between bar groups. bar_spacing : float, default: 0 - The space between bars as multiples of bar width. + The space between bars as a multiple of bar width. orientation : {"vertical", "horizontal"}, default: "vertical" The direction of the bars. @@ -3181,17 +3181,17 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing Returns ------- - _GroupedBarReturn + _GroupedBarReturn - A provisional result object. This will be refined in the future. - For now, the guaranteed API on the returned object is limited to + A provisional result object. This will be refined in the future. + For now, the guaranteed API on the returned object is limited to - - the attribute ``bar_containers``, which is a list of - `.BarContainer`, i.e. the results of the individual `~.Axes.bar` - calls for each dataset. + - the attribute ``bar_containers``, which is a list of + `.BarContainer`, i.e. the results of the individual `~.Axes.bar` + calls for each dataset. - - a ``remove()`` method, that remove all bars from the Axes. - See also `.Artist.remove()`. + - a ``remove()`` method, that remove all bars from the Axes. + See also `.Artist.remove()`. See Also -------- @@ -3261,8 +3261,7 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing heights = heights.to_numpy().T elif hasattr(heights, 'keys'): # dict if labels is not None: - raise ValueError( - "'labels' cannot be used if 'heights' are a mapping") + raise ValueError("'labels' cannot be used if 'heights' is a mapping") labels = heights.keys() heights = list(heights.values()) elif hasattr(heights, 'shape'): # numpy array @@ -3317,8 +3316,7 @@ def grouped_bar(self, heights, *, positions=None, group_spacing=1.5, bar_spacing # place the bars, but only use numerical positions, categorical tick labels # are handled separately below bar_containers = [] - for i, (hs, label, color) in enumerate( - zip(heights, labels, colors)): + for i, (hs, label, color) in enumerate(zip(heights, labels, colors)): lefts = (group_centers - 0.5 * group_distance + margin_abs + i * (bar_width + bar_spacing_abs)) if orientation == "vertical": diff --git a/lib/matplotlib/axes/_axes.pyi b/lib/matplotlib/axes/_axes.pyi index f606a65753f4..0008363b8220 100644 --- a/lib/matplotlib/axes/_axes.pyi +++ b/lib/matplotlib/axes/_axes.pyi @@ -41,6 +41,7 @@ import pandas as pd class _GroupedBarReturn: + bar_containers: list[BarContainer] def __init__(self, bar_containers: list[BarContainer]) -> None: ... def remove(self) -> None: ... @@ -273,13 +274,13 @@ class Axes(_AxesBase): ) -> PolyCollection: ... def grouped_bar( self, - heights : Sequence[ArrayLike] | dict[str, ArrayLike] | np.ndarray | pd.DataFrame, + heights: Sequence[ArrayLike] | dict[str, ArrayLike] | np.ndarray | pd.DataFrame, *, - positions : ArrayLike | None = ..., - tick_labels : Sequence[str] | None = ..., - labels : Sequence[str] | None = ..., - group_spacing : float | None = ..., - bar_spacing : float | None = ..., + positions: ArrayLike | None = ..., + tick_labels: Sequence[str] | None = ..., + labels: Sequence[str] | None = ..., + group_spacing: float | None = ..., + bar_spacing: float | None = ..., orientation: Literal["vertical", "horizontal"] = ..., colors: Iterable[ColorType] | None = ..., **kwargs diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py index 605e7b557713..ae2e91b811f1 100644 --- a/lib/matplotlib/tests/test_axes.py +++ b/lib/matplotlib/tests/test_axes.py @@ -2182,7 +2182,7 @@ def test_grouped_bar(): ax.set_yticks([]) -@check_figures_equal(extensions=["png"]) +@check_figures_equal() def test_grouped_bar_list_of_datasets(fig_test, fig_ref): categories = ['A', 'B'] data1 = [1, 1.2] @@ -2205,7 +2205,7 @@ def test_grouped_bar_list_of_datasets(fig_test, fig_ref): ax.legend() -@check_figures_equal(extensions=["png"]) +@check_figures_equal() def test_grouped_bar_dict_of_datasets(fig_test, fig_ref): categories = ['A', 'B'] data_dict = dict(data1=[1, 1.2], data2=[2, 2.4], data3=[3, 3.6]) @@ -2219,7 +2219,7 @@ def test_grouped_bar_dict_of_datasets(fig_test, fig_ref): ax.legend() -@check_figures_equal(extensions=["png"]) +@check_figures_equal() def test_grouped_bar_array(fig_test, fig_ref): categories = ['A', 'B'] array = np.array([[1, 2, 3], [1.2, 2.4, 3.6]]) @@ -2235,7 +2235,7 @@ def test_grouped_bar_array(fig_test, fig_ref): ax.legend() -@check_figures_equal(extensions=["png"]) +@check_figures_equal() def test_grouped_bar_dataframe(fig_test, fig_ref, pd): categories = ['A', 'B'] labels = ['data1', 'data2', 'data3'] From 150165be075bded5f51f8d16e197711fb706d4bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trygve=20Magnus=20R=C3=A6der?= Date: Mon, 2 Jun 2025 22:22:14 +0200 Subject: [PATCH 095/161] Tiny update from code review --- galleries/users_explain/colors/colorbar_only.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/galleries/users_explain/colors/colorbar_only.py b/galleries/users_explain/colors/colorbar_only.py index 34de2bc78888..b956fae43a1b 100644 --- a/galleries/users_explain/colors/colorbar_only.py +++ b/galleries/users_explain/colors/colorbar_only.py @@ -11,7 +11,8 @@ A `~.Figure.colorbar` requires a `matplotlib.colorizer.ColorizingArtist` which contains a `matplotlib.colorizer.Colorizer` that holds the data-to-color pipeline (norm and colormap). To create a colorbar without an attached plot one can -use a `.ColorizingArtist` with no associated data. +directly instantiate the base class `.ColorizingArtist`, which has no associated +data. """ From 1426f6a2c4f0f300c75a3afb65f13101462e5638 Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Mon, 2 Jun 2025 23:25:00 +0200 Subject: [PATCH 096/161] DOC: Document the properties of Normalize --- lib/matplotlib/colors.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py index d6636e0e8669..dd5d22130904 100644 --- a/lib/matplotlib/colors.py +++ b/lib/matplotlib/colors.py @@ -2315,6 +2315,7 @@ def __init__(self, vmin=None, vmax=None, clip=False): @property def vmin(self): + """Lower limit of the input data interval; maps to 0.""" return self._vmin @vmin.setter @@ -2326,6 +2327,7 @@ def vmin(self, value): @property def vmax(self): + """Upper limit of the input data interval; maps to 1.""" return self._vmax @vmax.setter @@ -2337,6 +2339,11 @@ def vmax(self, value): @property def clip(self): + """ + Determines the behavior for mapping values outside the range ``[vmin, vmax]``. + + See the *clip* parameter in `.Normalize`. + """ return self._clip @clip.setter From 8ded1f06ba5f4ad16bfc98e5f17c8f21b931dc2a Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Mon, 2 Jun 2025 23:46:05 +0200 Subject: [PATCH 097/161] DOC: Clarify that types in docstrings do not use formal type annotation syntax --- doc/devel/document.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/devel/document.rst b/doc/devel/document.rst index 20c30acf66aa..1119a265a80d 100644 --- a/doc/devel/document.rst +++ b/doc/devel/document.rst @@ -537,6 +537,10 @@ understandable by humans. If the possible types are too complex use a simplification for the type description and explain the type more precisely in the text. +We do not use formal type annotation syntax for type descriptions in +docstrings; e.g. we use ``list of str`` rather than ``list[str]``; we +use ``int or str`` rather than ``int | str`` or ``Union[int, str]``. + Generally, the `numpydoc docstring guide`_ conventions apply. The following rules expand on them where the numpydoc conventions are not specific. From 9861235c3494759d6a30a2309bcd669b9ec4fe39 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 4 Jun 2025 04:01:34 -0400 Subject: [PATCH 098/161] BLD: Remove FreeType from Agg backend extension I'm not sure why this was added originally, but it seems unnecessary. Fortunately, the waste was probably avoided by LTO. --- src/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/meson.build b/src/meson.build index a7018f0db094..d479a8b84aa2 100644 --- a/src/meson.build +++ b/src/meson.build @@ -37,7 +37,7 @@ extension_data = { '_backend_agg.cpp', '_backend_agg_wrapper.cpp', ), - 'dependencies': [agg_dep, freetype_dep, pybind11_dep], + 'dependencies': [agg_dep, pybind11_dep], }, '_c_internal_utils': { 'subdir': 'matplotlib', From d43672a643fc5b5474ad0ebd1ce1a44200356490 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 4 Jun 2025 10:57:04 -0400 Subject: [PATCH 099/161] Make NavigationToolbar.configure_subplots return value consistent (#30130) When the subplot tool already exists, then it is shown, but never returned. This seems to be an accident. --- lib/matplotlib/backend_bases.py | 2 +- lib/matplotlib/backend_bases.pyi | 2 +- lib/matplotlib/tests/test_backend_qt.py | 4 +++- lib/matplotlib/tests/test_backend_tk.py | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py index 2158990f578a..1992cc90ca26 100644 --- a/lib/matplotlib/backend_bases.py +++ b/lib/matplotlib/backend_bases.py @@ -3244,7 +3244,7 @@ def _update_view(self): def configure_subplots(self, *args): if hasattr(self, "subplot_tool"): self.subplot_tool.figure.canvas.manager.show() - return + return self.subplot_tool # This import needs to happen here due to circular imports. from matplotlib.figure import Figure with mpl.rc_context({"toolbar": "none"}): # No navbar for the toolfig. diff --git a/lib/matplotlib/backend_bases.pyi b/lib/matplotlib/backend_bases.pyi index 2d7b283bb4b8..0603988399f1 100644 --- a/lib/matplotlib/backend_bases.pyi +++ b/lib/matplotlib/backend_bases.pyi @@ -475,7 +475,7 @@ class NavigationToolbar2: def release_zoom(self, event: Event) -> None: ... def push_current(self) -> None: ... subplot_tool: widgets.SubplotTool - def configure_subplots(self, *args): ... + def configure_subplots(self, *args: Any) -> widgets.SubplotTool: ... def save_figure(self, *args) -> str | None | object: ... def update(self) -> None: ... def set_history_buttons(self) -> None: ... diff --git a/lib/matplotlib/tests/test_backend_qt.py b/lib/matplotlib/tests/test_backend_qt.py index 60f8a4f49bb8..a17e98d70484 100644 --- a/lib/matplotlib/tests/test_backend_qt.py +++ b/lib/matplotlib/tests/test_backend_qt.py @@ -213,7 +213,9 @@ def set_device_pixel_ratio(ratio): def test_subplottool(): fig, ax = plt.subplots() with mock.patch("matplotlib.backends.qt_compat._exec", lambda obj: None): - fig.canvas.manager.toolbar.configure_subplots() + tool = fig.canvas.manager.toolbar.configure_subplots() + assert tool is not None + assert tool == fig.canvas.manager.toolbar.configure_subplots() @pytest.mark.backend('QtAgg', skip_on_importerror=True) diff --git a/lib/matplotlib/tests/test_backend_tk.py b/lib/matplotlib/tests/test_backend_tk.py index 1210c8c9993e..1f96ad1308cb 100644 --- a/lib/matplotlib/tests/test_backend_tk.py +++ b/lib/matplotlib/tests/test_backend_tk.py @@ -168,7 +168,9 @@ def test_never_update(): plt.show(block=False) plt.draw() # Test FigureCanvasTkAgg. - fig.canvas.toolbar.configure_subplots() # Test NavigationToolbar2Tk. + tool = fig.canvas.toolbar.configure_subplots() # Test NavigationToolbar2Tk. + assert tool is not None + assert tool == fig.canvas.toolbar.configure_subplots() # Tool is reused internally. # Test FigureCanvasTk filter_destroy callback fig.canvas.get_tk_widget().after(100, plt.close, fig) From 8abab038d76854bd117b65bfc635a5af2c324548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Wed, 4 Jun 2025 20:27:50 +0300 Subject: [PATCH 100/161] Keep a non-functional type1Descriptors --- lib/matplotlib/backends/backend_pdf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py index c729b27b1b53..6f3cb8afa1ac 100644 --- a/lib/matplotlib/backends/backend_pdf.py +++ b/lib/matplotlib/backends/backend_pdf.py @@ -765,6 +765,7 @@ def __init__(self, filename, metadata=None): fontNames = _api.deprecated("3.11")(property(lambda self: self._fontNames)) dviFontInfo = _api.deprecated("3.11")(property(lambda self: self._dviFontInfo)) + type1Descriptors = _api.deprecated("3.11")(property(lambda _: {})) def newPage(self, width, height): self.endStream() From 0dc15a976f4f13973b8f2906500c322fc55ddbc1 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 4 Jun 2025 20:54:21 -0400 Subject: [PATCH 101/161] js: Fix externally-controlled format strings CodeQL is now complaining about these. This should be okay since we only talk to ourselves, but better to be safe about it. --- lib/matplotlib/backends/web_backend/js/mpl.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/matplotlib/backends/web_backend/js/mpl.js b/lib/matplotlib/backends/web_backend/js/mpl.js index 2d1f383e9839..303260773a2f 100644 --- a/lib/matplotlib/backends/web_backend/js/mpl.js +++ b/lib/matplotlib/backends/web_backend/js/mpl.js @@ -575,7 +575,8 @@ mpl.figure.prototype._make_on_message_function = function (fig) { var callback = fig['handle_' + msg_type]; } catch (e) { console.log( - "No handler for the '" + msg_type + "' message type: ", + "No handler for the '%s' message type: ", + msg_type, msg ); return; @@ -583,11 +584,12 @@ mpl.figure.prototype._make_on_message_function = function (fig) { if (callback) { try { - // console.log("Handling '" + msg_type + "' message: ", msg); + // console.log("Handling '%s' message: ", msg_type, msg); callback(fig, msg); } catch (e) { console.log( - "Exception inside the 'handler_" + msg_type + "' callback:", + "Exception inside the 'handler_%s' callback:", + msg_type, e, e.stack, msg From f9d4ed29996d9300b7fa08a5add27aadd97eba05 Mon Sep 17 00:00:00 2001 From: Oscar Gustafsson Date: Sun, 18 May 2025 12:06:40 +0200 Subject: [PATCH 102/161] Remove deprecations: is_bbox and more --- .../next_api_changes/removals/30067-OG.rst | 23 +++++++++++++++ lib/matplotlib/backend_bases.py | 15 ++-------- lib/matplotlib/backend_bases.pyi | 2 +- lib/matplotlib/rcsetup.py | 28 +------------------ lib/matplotlib/rcsetup.pyi | 3 -- lib/matplotlib/tests/test_backend_registry.py | 11 -------- lib/matplotlib/transforms.py | 23 --------------- lib/matplotlib/transforms.pyi | 4 --- 8 files changed, 27 insertions(+), 82 deletions(-) create mode 100644 doc/api/next_api_changes/removals/30067-OG.rst diff --git a/doc/api/next_api_changes/removals/30067-OG.rst b/doc/api/next_api_changes/removals/30067-OG.rst new file mode 100644 index 000000000000..1a8d8bc5c2c5 --- /dev/null +++ b/doc/api/next_api_changes/removals/30067-OG.rst @@ -0,0 +1,23 @@ +``TransformNode.is_bbox`` +^^^^^^^^^^^^^^^^^^^^^^^^^ + +... is removed. Instead check the object using ``isinstance(..., BboxBase)``. + +``rcsetup.interactive_bk``, ``rcsetup.non_interactive_bk`` and ``rcsetup.all_backends`` +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +... are removed and replaced by ``matplotlib.backends.backend_registry.list_builtin`` +with the following arguments + +- ``matplotlib.backends.BackendFilter.INTERACTIVE`` +- ``matplotlib.backends.BackendFilter.NON_INTERACTIVE`` +- ``None`` + +``BboxTransformToMaxOnly`` +^^^^^^^^^^^^^^^^^^^^^^^^^^ + +... is removed. It can be replaced by ``BboxTransformTo(LockableBbox(bbox, x0=0, y0=0))``. + +*interval* parameter of ``TimerBase.start`` +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +The timer interval parameter can no longer be set while starting it. The interval can be specified instead in the timer constructor, or by setting the timer.interval attribute. diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py index 1992cc90ca26..527d8c010710 100644 --- a/lib/matplotlib/backend_bases.py +++ b/lib/matplotlib/backend_bases.py @@ -1067,19 +1067,8 @@ def __del__(self): """Need to stop timer and possibly disconnect timer.""" self._timer_stop() - @_api.delete_parameter("3.9", "interval", alternative="timer.interval") - def start(self, interval=None): - """ - Start the timer object. - - Parameters - ---------- - interval : int, optional - Timer interval in milliseconds; overrides a previously set interval - if provided. - """ - if interval is not None: - self.interval = interval + def start(self): + """Start the timer.""" self._timer_start() def stop(self): diff --git a/lib/matplotlib/backend_bases.pyi b/lib/matplotlib/backend_bases.pyi index 0603988399f1..24669bfb3aeb 100644 --- a/lib/matplotlib/backend_bases.pyi +++ b/lib/matplotlib/backend_bases.pyi @@ -186,7 +186,7 @@ class TimerBase: callbacks: list[tuple[Callable, tuple, dict[str, Any]]] | None = ..., ) -> None: ... def __del__(self) -> None: ... - def start(self, interval: int | None = ...) -> None: ... + def start(self) -> None: ... def stop(self) -> None: ... @property def interval(self) -> int: ... diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py index ce29c5076100..02e3601ff4c2 100644 --- a/lib/matplotlib/rcsetup.py +++ b/lib/matplotlib/rcsetup.py @@ -24,7 +24,7 @@ import matplotlib as mpl from matplotlib import _api, cbook -from matplotlib.backends import BackendFilter, backend_registry +from matplotlib.backends import backend_registry from matplotlib.cbook import ls_mapper from matplotlib.colors import Colormap, is_color_like from matplotlib._fontconfig_pattern import parse_fontconfig_pattern @@ -34,32 +34,6 @@ from cycler import Cycler, cycler as ccycler -@_api.caching_module_getattr -class __getattr__: - @_api.deprecated( - "3.9", - alternative="``matplotlib.backends.backend_registry.list_builtin" - "(matplotlib.backends.BackendFilter.INTERACTIVE)``") - @property - def interactive_bk(self): - return backend_registry.list_builtin(BackendFilter.INTERACTIVE) - - @_api.deprecated( - "3.9", - alternative="``matplotlib.backends.backend_registry.list_builtin" - "(matplotlib.backends.BackendFilter.NON_INTERACTIVE)``") - @property - def non_interactive_bk(self): - return backend_registry.list_builtin(BackendFilter.NON_INTERACTIVE) - - @_api.deprecated( - "3.9", - alternative="``matplotlib.backends.backend_registry.list_builtin()``") - @property - def all_backends(self): - return backend_registry.list_builtin() - - class ValidateInStrings: def __init__(self, key, valid, ignorecase=False, *, _deprecated_since=None): diff --git a/lib/matplotlib/rcsetup.pyi b/lib/matplotlib/rcsetup.pyi index 79538511c0e4..eb1d7c9f3a33 100644 --- a/lib/matplotlib/rcsetup.pyi +++ b/lib/matplotlib/rcsetup.pyi @@ -4,9 +4,6 @@ from collections.abc import Callable, Iterable from typing import Any, Literal, TypeVar from matplotlib.typing import ColorType, LineStyleType, MarkEveryType -interactive_bk: list[str] -non_interactive_bk: list[str] -all_backends: list[str] _T = TypeVar("_T") diff --git a/lib/matplotlib/tests/test_backend_registry.py b/lib/matplotlib/tests/test_backend_registry.py index 80c2ce4fc51a..2bd8e161bd6b 100644 --- a/lib/matplotlib/tests/test_backend_registry.py +++ b/lib/matplotlib/tests/test_backend_registry.py @@ -3,7 +3,6 @@ import pytest -import matplotlib as mpl from matplotlib.backends import BackendFilter, backend_registry @@ -95,16 +94,6 @@ def test_backend_normalization(backend, normalized): assert backend_registry._backend_module_name(backend) == normalized -def test_deprecated_rcsetup_attributes(): - match = "was deprecated in Matplotlib 3.9" - with pytest.warns(mpl.MatplotlibDeprecationWarning, match=match): - mpl.rcsetup.interactive_bk - with pytest.warns(mpl.MatplotlibDeprecationWarning, match=match): - mpl.rcsetup.non_interactive_bk - with pytest.warns(mpl.MatplotlibDeprecationWarning, match=match): - mpl.rcsetup.all_backends - - def test_entry_points_inline(): pytest.importorskip('matplotlib_inline') backends = backend_registry.list_all() diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py index 2cca56f04457..7228f05bcf9e 100644 --- a/lib/matplotlib/transforms.py +++ b/lib/matplotlib/transforms.py @@ -98,7 +98,6 @@ class TransformNode: # Some metadata about the transform, used to determine whether an # invalidation is affine-only is_affine = False - is_bbox = _api.deprecated("3.9")(_api.classproperty(lambda cls: False)) pass_through = False """ @@ -216,7 +215,6 @@ class BboxBase(TransformNode): and height, but these are not stored explicitly. """ - is_bbox = _api.deprecated("3.9")(_api.classproperty(lambda cls: True)) is_affine = True if DEBUG: @@ -2627,27 +2625,6 @@ def get_matrix(self): return self._mtx -@_api.deprecated("3.9") -class BboxTransformToMaxOnly(BboxTransformTo): - """ - `BboxTransformToMaxOnly` is a transformation that linearly transforms points from - the unit bounding box to a given `Bbox` with a fixed upper left of (0, 0). - """ - def get_matrix(self): - # docstring inherited - if self._invalid: - xmax, ymax = self._boxout.max - if DEBUG and (xmax == 0 or ymax == 0): - raise ValueError("Transforming to a singular bounding box.") - self._mtx = np.array([[xmax, 0.0, 0.0], - [ 0.0, ymax, 0.0], - [ 0.0, 0.0, 1.0]], - float) - self._inverted = None - self._invalid = 0 - return self._mtx - - class BboxTransformFrom(Affine2DBase): """ `BboxTransformFrom` linearly transforms points from a given `Bbox` to the diff --git a/lib/matplotlib/transforms.pyi b/lib/matplotlib/transforms.pyi index 551487a11c60..07d299be297c 100644 --- a/lib/matplotlib/transforms.pyi +++ b/lib/matplotlib/transforms.pyi @@ -12,7 +12,6 @@ class TransformNode: INVALID_NON_AFFINE: int INVALID_AFFINE: int INVALID: int - is_bbox: bool # Implemented as a standard attr in base class, but functionally readonly and some subclasses implement as such @property def is_affine(self) -> bool: ... @@ -24,7 +23,6 @@ class TransformNode: def frozen(self) -> TransformNode: ... class BboxBase(TransformNode): - is_bbox: bool is_affine: bool def frozen(self) -> Bbox: ... def __array__(self, *args, **kwargs): ... @@ -295,8 +293,6 @@ class BboxTransform(Affine2DBase): class BboxTransformTo(Affine2DBase): def __init__(self, boxout: BboxBase, **kwargs) -> None: ... -class BboxTransformToMaxOnly(BboxTransformTo): ... - class BboxTransformFrom(Affine2DBase): def __init__(self, boxin: BboxBase, **kwargs) -> None: ... From d5ab3b02bbaf05ee2998803150b3e2444980ca3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Thu, 5 Jun 2025 06:46:25 +0300 Subject: [PATCH 103/161] Install extra TeX fonts on one runner only The DejaVu and Heuristica fonts are used by the type-1 font subsetting tests. Heuristica has a Cyrillic encoding and apparently cannot be loaded without installing texlive-lang-cyrillic. --- .github/workflows/tests.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7a197a9d4aa8..2a48276707ce 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -64,8 +64,10 @@ jobs: python-version: '3.12' # https://github.com/matplotlib/matplotlib/issues/29844 pygobject-ver: '<3.52.0' - - os: ubuntu-22.04 + - name-suffix: "(Extra TeX packages)" + os: ubuntu-22.04 python-version: '3.13' + extra-packages: 'texlive-fonts-extra texlive-lang-cyrillic' # https://github.com/matplotlib/matplotlib/issues/29844 pygobject-ver: '<3.52.0' - name-suffix: "Free-threaded" @@ -142,7 +144,8 @@ jobs: texlive-latex-recommended \ texlive-luatex \ texlive-pictures \ - texlive-xetex + texlive-xetex \ + ${{ matrix.extra-packages }} if [[ "${{ matrix.name-suffix }}" != '(Minimum Versions)' ]]; then sudo apt-get install -yy --no-install-recommends ffmpeg poppler-utils fi From f654a74e023ec5c1d9b85d95f6097ce31aa00ef9 Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Fri, 6 Jun 2025 10:55:06 -0600 Subject: [PATCH 104/161] Various small code cleanups from review Co-authored-by: Elliott Sales de Andrade --- lib/matplotlib/sphinxext/plot_directive.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py index fe65a1aa966d..8e5b80ba1599 100644 --- a/lib/matplotlib/sphinxext/plot_directive.py +++ b/lib/matplotlib/sphinxext/plot_directive.py @@ -647,11 +647,9 @@ def check_output_base_name(env, output_base): if output_base in env.mpl_plot_image_basenames[d]: if d == docname: raise PlotError( - f"The image-basename " - f"{output_base}' is used multiple times.") - raise PlotError(f"The image-basename " - f"'{output_base}' is used multiple times " - f"(it is also used in {env.doc2path(d)}).") + f"The image-basename {output_base!r} is used multiple times.") + raise PlotError(f"The image-basename {output_base!r} is used multiple" + f"times (it is also used in {env.doc2path(d)}).") env.mpl_plot_image_basenames[docname].add(output_base) @@ -778,8 +776,8 @@ def render_figures(code, code_path, output_dir, output_base, context, def run(arguments, content, options, state_machine, state, lineno): document = state_machine.document - config = document.settings.env.config env = document.settings.env + config = env.config nofigs = 'nofigs' in options if config.plot_srcset and setup.app.builder.name == 'singlehtml': From 20bed265798c1ac62229235ced8ca286154b6b09 Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Fri, 6 Jun 2025 11:25:24 -0600 Subject: [PATCH 105/161] Add a test for image-basename with multiple figures --- lib/matplotlib/tests/data/tinypages/some_plots.rst | 11 ++++++++++- lib/matplotlib/tests/test_sphinxext.py | 4 +++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/tests/data/tinypages/some_plots.rst b/lib/matplotlib/tests/data/tinypages/some_plots.rst index b1c7aee18d8c..71a99585dd83 100644 --- a/lib/matplotlib/tests/data/tinypages/some_plots.rst +++ b/lib/matplotlib/tests/data/tinypages/some_plots.rst @@ -180,7 +180,7 @@ Plot 22 uses a different specific function in a file with plot commands: .. plot:: range6.py range10 -Plots 23 and 24 use image-basename. +Plots 23--25 use image-basename. .. plot:: :image-basename: custom-basename-6 @@ -189,3 +189,12 @@ Plots 23 and 24 use image-basename. .. plot:: range4.py :image-basename: custom-basename-4 + +.. plot:: + :image-basename: custom-basename-4-6 + + plt.figure() + plt.plot(range(4)) + + plt.figure() + plt.plot(range(6)) diff --git a/lib/matplotlib/tests/test_sphinxext.py b/lib/matplotlib/tests/test_sphinxext.py index 5efff4b1555f..c3e444d57861 100644 --- a/lib/matplotlib/tests/test_sphinxext.py +++ b/lib/matplotlib/tests/test_sphinxext.py @@ -92,9 +92,11 @@ def plot_directive_file(num): assert filecmp.cmp(range_6, plot_file(17)) # plot 22 is from the range6.py file again, but a different function assert filecmp.cmp(range_10, img_dir / 'range6_range10.png') - # plots 23 and 24 use a custom basename + # plots 23--25 use a custom basename assert filecmp.cmp(range_6, img_dir / 'custom-basename-6.png') assert filecmp.cmp(range_4, img_dir / 'custom-basename-4.png') + assert filecmp.cmp(range_4, img_dir / 'custom-basename-4-6_00.png') + assert filecmp.cmp(range_6, img_dir / 'custom-basename-4-6_01.png') # Modify the included plot contents = (tmp_path / 'included_plot_21.rst').read_bytes() From 7f56c947f8b001158321e3bd15b8a90c61169302 Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Fri, 6 Jun 2025 11:26:48 -0600 Subject: [PATCH 106/161] Disallow \ in output_base in the plot directive --- lib/matplotlib/sphinxext/plot_directive.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py index 2380c1ddaa28..860525d587c2 100644 --- a/lib/matplotlib/sphinxext/plot_directive.py +++ b/lib/matplotlib/sphinxext/plot_directive.py @@ -638,7 +638,7 @@ def _parse_srcset(entries): def check_output_base_name(env, output_base): docname = env.docname - if '.' in output_base or '/' in output_base: + if '.' in output_base or '/' in output_base or '\\' in output_base: raise PlotError( f"The image-basename '{output_base}' is invalid. " f"It must not contain dots or slashes.") From 550e3824c5fdba8777760434154de1b1ba02e795 Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Fri, 6 Jun 2025 11:43:29 -0600 Subject: [PATCH 107/161] Fix the source link when using a custom basename to include the .py extension --- lib/matplotlib/sphinxext/plot_directive.py | 4 ++-- lib/matplotlib/tests/test_sphinxext.py | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py index 860525d587c2..a9c72683dd9d 100644 --- a/lib/matplotlib/sphinxext/plot_directive.py +++ b/lib/matplotlib/sphinxext/plot_directive.py @@ -910,7 +910,7 @@ def run(arguments, content, options, state_machine, state, lineno): # save script (if necessary) if options['show-source-link']: - Path(build_dir, output_base + source_ext).write_text( + Path(build_dir, output_base + (source_ext or '.py')).write_text( doctest.script_from_examples(code) if source_file_name == rst_file and is_doctest else code, @@ -970,7 +970,7 @@ def run(arguments, content, options, state_machine, state, lineno): # Not-None src_name signals the need for a source download in the # generated html if j == 0 and options['show-source-link']: - src_name = output_base + source_ext + src_name = output_base + (source_ext or '.py') else: src_name = None if config.plot_srcset: diff --git a/lib/matplotlib/tests/test_sphinxext.py b/lib/matplotlib/tests/test_sphinxext.py index c3e444d57861..fb287c1d603a 100644 --- a/lib/matplotlib/tests/test_sphinxext.py +++ b/lib/matplotlib/tests/test_sphinxext.py @@ -181,6 +181,28 @@ def test_show_source_link_false(tmp_path, plot_html_show_source_link): assert len(list(html_dir.glob("**/index-1.py"))) == 0 +def test_plot_html_show_source_link_custom_basename(tmp_path): + # Test that source link filename includes .py extension when using custom basename + shutil.copyfile(tinypages / 'conf.py', tmp_path / 'conf.py') + shutil.copytree(tinypages / '_static', tmp_path / '_static') + doctree_dir = tmp_path / 'doctrees' + (tmp_path / 'index.rst').write_text(""" +.. plot:: + :image-basename: custom-name + + plt.plot(range(2)) +""") + html_dir = tmp_path / '_build' / 'html' + build_sphinx_html(tmp_path, doctree_dir, html_dir) + + # Check that source file with .py extension is generated + assert len(list(html_dir.glob("**/custom-name.py"))) == 1 + + # Check that the HTML contains the correct link with .py extension + html_content = (html_dir / 'index.html').read_text() + assert 'custom-name.py' in html_content + + def test_srcset_version(tmp_path): html_dir = tmp_path / '_build' / 'html' img_dir = html_dir / '_images' From d4f244075b3d3b4cea595ab02f6283da9c63b43f Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Fri, 6 Jun 2025 11:58:53 -0600 Subject: [PATCH 108/161] Make the sphinx extension tests more robust to manually building the docs in tinypages The tests now don't copy any of the build files, meaning the tests should pass even if tinypages has stale build state from a manual build. --- lib/matplotlib/tests/data/tinypages/.gitignore | 2 ++ lib/matplotlib/tests/test_sphinxext.py | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/tests/data/tinypages/.gitignore b/lib/matplotlib/tests/data/tinypages/.gitignore index 69fa449dd96e..739e1d9ce65d 100644 --- a/lib/matplotlib/tests/data/tinypages/.gitignore +++ b/lib/matplotlib/tests/data/tinypages/.gitignore @@ -1 +1,3 @@ _build/ +doctrees/ +plot_directive/ diff --git a/lib/matplotlib/tests/test_sphinxext.py b/lib/matplotlib/tests/test_sphinxext.py index fb287c1d603a..7079b96ca074 100644 --- a/lib/matplotlib/tests/test_sphinxext.py +++ b/lib/matplotlib/tests/test_sphinxext.py @@ -16,6 +16,17 @@ tinypages = Path(__file__).parent / 'data/tinypages' +def _ignore_build_artifacts(dir, files): + """ + Ignore function for shutil.copytree to exclude build artifacts. + + This prevents stale build artifacts from the source tinypages directory + from being copied to test directories, which could cause inconsistent + test results due to cached or outdated files. + """ + return {'_build', 'doctrees', 'plot_directive'} & set(files) + + def build_sphinx_html(source_dir, doctree_dir, html_dir, extra_args=None): # Build the pages with warnings turned into errors extra_args = [] if extra_args is None else extra_args @@ -40,7 +51,8 @@ def build_sphinx_html(source_dir, doctree_dir, html_dir, extra_args=None): def test_tinypages(tmp_path): - shutil.copytree(tinypages, tmp_path, dirs_exist_ok=True) + shutil.copytree(tinypages, tmp_path, dirs_exist_ok=True, + ignore=_ignore_build_artifacts) html_dir = tmp_path / '_build' / 'html' img_dir = html_dir / '_images' doctree_dir = tmp_path / 'doctrees' @@ -204,11 +216,13 @@ def test_plot_html_show_source_link_custom_basename(tmp_path): def test_srcset_version(tmp_path): + shutil.copytree(tinypages, tmp_path, dirs_exist_ok=True, + ignore=_ignore_build_artifacts) html_dir = tmp_path / '_build' / 'html' img_dir = html_dir / '_images' doctree_dir = tmp_path / 'doctrees' - build_sphinx_html(tinypages, doctree_dir, html_dir, + build_sphinx_html(tmp_path, doctree_dir, html_dir, extra_args=['-D', 'plot_srcset=2x']) def plot_file(num, suff=''): From bab3aafbff2a23dfbd220b2f4b909176eb94377f Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Fri, 6 Jun 2025 13:58:52 -0600 Subject: [PATCH 109/161] Use shutil.ignore_patterns --- lib/matplotlib/tests/test_sphinxext.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/lib/matplotlib/tests/test_sphinxext.py b/lib/matplotlib/tests/test_sphinxext.py index 7079b96ca074..3b1a40e428c7 100644 --- a/lib/matplotlib/tests/test_sphinxext.py +++ b/lib/matplotlib/tests/test_sphinxext.py @@ -16,17 +16,6 @@ tinypages = Path(__file__).parent / 'data/tinypages' -def _ignore_build_artifacts(dir, files): - """ - Ignore function for shutil.copytree to exclude build artifacts. - - This prevents stale build artifacts from the source tinypages directory - from being copied to test directories, which could cause inconsistent - test results due to cached or outdated files. - """ - return {'_build', 'doctrees', 'plot_directive'} & set(files) - - def build_sphinx_html(source_dir, doctree_dir, html_dir, extra_args=None): # Build the pages with warnings turned into errors extra_args = [] if extra_args is None else extra_args @@ -52,7 +41,8 @@ def build_sphinx_html(source_dir, doctree_dir, html_dir, extra_args=None): def test_tinypages(tmp_path): shutil.copytree(tinypages, tmp_path, dirs_exist_ok=True, - ignore=_ignore_build_artifacts) + ignore=shutil.ignore_patterns('_build', 'doctrees', + 'plot_directive')) html_dir = tmp_path / '_build' / 'html' img_dir = html_dir / '_images' doctree_dir = tmp_path / 'doctrees' @@ -217,7 +207,8 @@ def test_plot_html_show_source_link_custom_basename(tmp_path): def test_srcset_version(tmp_path): shutil.copytree(tinypages, tmp_path, dirs_exist_ok=True, - ignore=_ignore_build_artifacts) + ignore=shutil.ignore_patterns('_build', 'doctrees', + 'plot_directive')) html_dir = tmp_path / '_build' / 'html' img_dir = html_dir / '_images' doctree_dir = tmp_path / 'doctrees' From 08cdd1add5513ccf39c782e749d89a1656ac26ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Sat, 7 Jun 2025 18:05:57 +0300 Subject: [PATCH 110/161] Update font-related documentation We now subset Type-1 fonts and no longer have a copy of ttconv. Make the font comparison table a grid table so we can use a colspan cell. Clarify that Type-1 fonts get used only in the usetex/pdf combination. --- galleries/users_explain/text/fonts.py | 52 ++++++++++++++------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/galleries/users_explain/text/fonts.py b/galleries/users_explain/text/fonts.py index 7efb9a00aa09..ef1d611157ad 100644 --- a/galleries/users_explain/text/fonts.py +++ b/galleries/users_explain/text/fonts.py @@ -27,30 +27,35 @@ Matplotlib supports three font specifications (in addition to pdf 'core fonts', which are explained later in the guide): -.. list-table:: Type of Fonts - :header-rows: 1 - - * - Type 1 (PDF) - - Type 3 (PDF/PS) - - TrueType (PDF) - * - One of the oldest types, introduced by Adobe - - Similar to Type 1 in terms of introduction - - Newer than previous types, used commonly today, introduced by Apple - * - Restricted subset of PostScript, charstrings are in bytecode - - Full PostScript language, allows embedding arbitrary code - (in theory, even render fractals when rasterizing!) - - Include a virtual machine that can execute code! - * - These fonts support font hinting - - Do not support font hinting - - Hinting supported (virtual machine processes the "hints") - * - Non-subsetted through Matplotlib - - Subsetted via external module ttconv - - Subsetted via external module - `fontTools `__ +.. table:: Type of Fonts + + +--------------------------+----------------------------+----------------------------+ + | Type 1 (PDF with usetex) | Type 3 (PDF/PS) | TrueType (PDF) | + +==========================+============================+============================+ + | One of the oldest types, | Similar to Type 1 in | Newer than previous types, | + | introduced by Adobe | terms of introduction | used commonly today, | + | | | introduced by Apple | + +--------------------------+----------------------------+----------------------------+ + | Restricted subset of | Full PostScript language, | Include a virtual machine | + | PostScript, charstrings | allows embedding arbitrary | that can execute code! | + | are in bytecode | code (in theory, even | | + | | render fractals when | | + | | rasterizing!) | | + +--------------------------+----------------------------+----------------------------+ + | These fonts support font | Do not support font hinting| Hinting supported (virtual | + | hinting | | machine processes the | + | | | "hints") | + +--------------------------+----------------------------+----------------------------+ + | Subsetted by code in | Subsetted via external module | + | `matplotlib._type1font` | `fontTools `__ | + +--------------------------+----------------------------+----------------------------+ .. note:: Adobe disabled__ support for authoring with Type 1 fonts in January 2023. + Matplotlib uses Type 1 fonts for compatibility with TeX: when the usetex + feature is used with the PDF backend, Matplotlib reads the fonts used by + the TeX engine, which are usually Type 1. __ https://helpx.adobe.com/fonts/kb/postscript-type-1-fonts-end-of-support.html @@ -86,11 +91,8 @@ The solution to this problem is to subset the fonts used in the document and only embed the glyphs actually used. This gets both vector text and small files sizes. Computing the subset of the font required and writing the new -(reduced) font are both complex problem and thus Matplotlib relies on -`fontTools `__ and a vendored fork -of ttconv. - -Currently Type 3, Type 42, and TrueType fonts are subsetted. Type 1 fonts are not. +(reduced) font are both complex problems and thus Matplotlib relies in most cases +on `fontTools `__. Core Fonts ^^^^^^^^^^ From 3574a7e8f5243f93c6442e43b4c583448fc95dc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=ADvia=20Lutz?= <108961867+livlutz@users.noreply.github.com> Date: Sun, 8 Jun 2025 02:50:57 -0300 Subject: [PATCH 111/161] Add example to histogram colorbar on galleries (#30107) --- .../examples/color/colorbar_histogram.py | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 galleries/examples/color/colorbar_histogram.py diff --git a/galleries/examples/color/colorbar_histogram.py b/galleries/examples/color/colorbar_histogram.py new file mode 100644 index 000000000000..4a1a07e265a2 --- /dev/null +++ b/galleries/examples/color/colorbar_histogram.py @@ -0,0 +1,48 @@ +""" +===================== +Histogram as colorbar +===================== + +This example demonstrates how to use a colored histogram instead of a colorbar +to not only show the color-to-value mapping, but also visualize the +distribution of values. +""" + +import matplotlib.pyplot as plt +import numpy as np + +import matplotlib.colors as mcolors + +# surface data +delta = 0.025 +x = y = np.arange(-2.0, 2.0, delta) +X, Y = np.meshgrid(x, y) +Z1 = np.exp(-(((X + 1) * 1.3) ** 2) - ((Y + 1) * 1.3) ** 2) +Z2 = 2.5 * np.exp(-((X - 1) ** 2) - (Y - 1) ** 2) +Z = Z1**0.25 - Z2**0.5 + +# colormap & normalization +bins = 30 +cmap = plt.get_cmap("RdYlBu_r") +bin_edges = np.linspace(Z.min(), Z.max(), bins + 1) +norm = mcolors.BoundaryNorm(bin_edges, cmap.N) + +# main plot +fig, ax = plt.subplots(layout="constrained") +im = ax.imshow(Z, cmap=cmap, origin="lower", extent=[-3, 3, -3, 3], norm=norm) + +# inset histogram +cax = ax.inset_axes([1.18, 0.02, 0.25, 0.95]) # left, bottom, width, height + +# plot histogram +counts, _ = np.histogram(Z, bins=bin_edges) +midpoints = (bin_edges[:-1] + bin_edges[1:]) / 2 +distance = midpoints[1] - midpoints[0] +cax.barh(midpoints, counts, height=0.8 * distance, color=cmap(norm(midpoints))) + +# styling +cax.spines[:].set_visible(False) +cax.set_yticks(bin_edges) +cax.tick_params(axis="both", which="both", length=0) + +plt.show() From c8eba9034259e65d84f226c035777f4bf4b5c3a7 Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Sun, 8 Jun 2025 10:33:11 -0600 Subject: [PATCH 112/161] Rename image-basename to filename-prefix --- lib/matplotlib/sphinxext/plot_directive.py | 29 ++++++++++--------- .../tests/data/tinypages/some_plots.rst | 8 ++--- lib/matplotlib/tests/test_sphinxext.py | 2 +- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py index a9c72683dd9d..b5f10d851182 100644 --- a/lib/matplotlib/sphinxext/plot_directive.py +++ b/lib/matplotlib/sphinxext/plot_directive.py @@ -47,11 +47,11 @@ The ``.. plot::`` directive supports the following options: -``:image-basename:`` : str - The base name (without the extension) of the outputted image files. The - default is to use the same name as the input script, or the name of - the RST document if no script is provided. The image-basename for each - plot directive must be unique. +``:filename-prefix:`` : str + The base name (without the extension) of the outputted image and script + files. The default is to use the same name as the input script, or the + name of the RST document if no script is provided. The filename-prefix for + each plot directive must be unique. ``:format:`` : {'python', 'doctest'} The format of the input. If unset, the format is auto-detected. @@ -169,6 +169,7 @@ be customized by changing the *plot_template*. See the source of :doc:`/api/sphinxext_plot_directive_api` for the templates defined in *TEMPLATE* and *TEMPLATE_SRCSET*. + """ from collections import defaultdict @@ -273,7 +274,7 @@ class PlotDirective(Directive): 'scale': directives.nonnegative_int, 'align': Image.align, 'class': directives.class_option, - 'image-basename': directives.unchanged, + 'filename-prefix': directives.unchanged, 'include-source': _option_boolean, 'show-source-link': _option_boolean, 'format': _option_format, @@ -640,15 +641,15 @@ def check_output_base_name(env, output_base): if '.' in output_base or '/' in output_base or '\\' in output_base: raise PlotError( - f"The image-basename '{output_base}' is invalid. " + f"The filename-prefix '{output_base}' is invalid. " f"It must not contain dots or slashes.") for d in env.mpl_plot_image_basenames: if output_base in env.mpl_plot_image_basenames[d]: if d == docname: raise PlotError( - f"The image-basename {output_base!r} is used multiple times.") - raise PlotError(f"The image-basename {output_base!r} is used multiple" + f"The filename-prefix {output_base!r} is used multiple times.") + raise PlotError(f"The filename-prefix {output_base!r} is used multiple" f"times (it is also used in {env.doc2path(d)}).") env.mpl_plot_image_basenames[docname].add(output_base) @@ -789,7 +790,7 @@ def run(arguments, content, options, state_machine, state, lineno): options.setdefault('include-source', config.plot_include_source) options.setdefault('show-source-link', config.plot_html_show_source_link) - options.setdefault('image-basename', None) + options.setdefault('filename-prefix', None) if 'class' in options: # classes are parsed into a list of string, and output by simply @@ -831,16 +832,16 @@ def run(arguments, content, options, state_machine, state, lineno): function_name = None code = Path(source_file_name).read_text(encoding='utf-8') - if options['image-basename']: - output_base = options['image-basename'] + if options['filename-prefix']: + output_base = options['filename-prefix'] check_output_base_name(env, output_base) else: output_base = os.path.basename(source_file_name) else: source_file_name = rst_file code = textwrap.dedent("\n".join(map(str, content))) - if options['image-basename']: - output_base = options['image-basename'] + if options['filename-prefix']: + output_base = options['filename-prefix'] check_output_base_name(env, output_base) else: base, ext = os.path.splitext(os.path.basename(source_file_name)) diff --git a/lib/matplotlib/tests/data/tinypages/some_plots.rst b/lib/matplotlib/tests/data/tinypages/some_plots.rst index 71a99585dd83..17de8f1d742e 100644 --- a/lib/matplotlib/tests/data/tinypages/some_plots.rst +++ b/lib/matplotlib/tests/data/tinypages/some_plots.rst @@ -180,18 +180,18 @@ Plot 22 uses a different specific function in a file with plot commands: .. plot:: range6.py range10 -Plots 23--25 use image-basename. +Plots 23--25 use filename-prefix. .. plot:: - :image-basename: custom-basename-6 + :filename-prefix: custom-basename-6 plt.plot(range(6)) .. plot:: range4.py - :image-basename: custom-basename-4 + :filename-prefix: custom-basename-4 .. plot:: - :image-basename: custom-basename-4-6 + :filename-prefix: custom-basename-4-6 plt.figure() plt.plot(range(4)) diff --git a/lib/matplotlib/tests/test_sphinxext.py b/lib/matplotlib/tests/test_sphinxext.py index 3b1a40e428c7..ede3166a2e1b 100644 --- a/lib/matplotlib/tests/test_sphinxext.py +++ b/lib/matplotlib/tests/test_sphinxext.py @@ -190,7 +190,7 @@ def test_plot_html_show_source_link_custom_basename(tmp_path): doctree_dir = tmp_path / 'doctrees' (tmp_path / 'index.rst').write_text(""" .. plot:: - :image-basename: custom-name + :filename-prefix: custom-name plt.plot(range(2)) """) From 51bc2b8288c2c581ee82931d90031f80eeb7c0c1 Mon Sep 17 00:00:00 2001 From: nakano Date: Mon, 9 Jun 2025 10:50:50 +0900 Subject: [PATCH 113/161] Fix typo in backend_ps.py comment: change 'and them scale them' to 'and then scale them' --- lib/matplotlib/backends/backend_ps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py index f6b8455a15a7..ea5868387918 100644 --- a/lib/matplotlib/backends/backend_ps.py +++ b/lib/matplotlib/backends/backend_ps.py @@ -406,7 +406,7 @@ class RendererPS(_backend_pdf_ps.RendererPDFPSBase): def __init__(self, width, height, pswriter, imagedpi=72): # Although postscript itself is dpi independent, we need to inform the # image code about a requested dpi to generate high resolution images - # and them scale them before embedding them. + # and then scale them before embedding them. super().__init__(width, height) self._pswriter = pswriter if mpl.rcParams['text.usetex']: From 0ee8e81282da3aee3f510e15b536630ed7bfa01e Mon Sep 17 00:00:00 2001 From: Emmanuel Ferdman Date: Mon, 9 Jun 2025 03:59:59 -0700 Subject: [PATCH 114/161] Throw exception when alpha is out of bounds Signed-off-by: Emmanuel Ferdman --- lib/matplotlib/colors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py index dd5d22130904..254e2c1a203b 100644 --- a/lib/matplotlib/colors.py +++ b/lib/matplotlib/colors.py @@ -949,7 +949,7 @@ def with_alpha(self, alpha): if not isinstance(alpha, Real): raise TypeError(f"'alpha' must be numeric or None, not {type(alpha)}") if not 0 <= alpha <= 1: - ValueError("'alpha' must be between 0 and 1, inclusive") + raise ValueError("'alpha' must be between 0 and 1, inclusive") new_cm = self.copy() if not new_cm._isinit: new_cm._init() From 8263aecdd8363c5634cdd1ede7cfbde48b60124a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Jun 2025 19:45:53 +0000 Subject: [PATCH 115/161] Bump github/codeql-action from 3.28.18 to 3.28.19 in the actions group Bumps the actions group with 1 update: [github/codeql-action](https://github.com/github/codeql-action). Updates `github/codeql-action` from 3.28.18 to 3.28.19 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/ff0a06e83cb2de871e5a09832bc6a81e7276941f...fca7ace96b7d713c7035871441bd52efbe39e27e) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: 3.28.19 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: actions ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 3f71e1369834..feed44a51146 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -32,7 +32,7 @@ jobs: persist-credentials: false - name: Initialize CodeQL - uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18 + uses: github/codeql-action/init@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19 with: languages: ${{ matrix.language }} @@ -43,4 +43,4 @@ jobs: pip install --user -v . - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18 + uses: github/codeql-action/analyze@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19 From 427cadcc3bd44d179200ee0d3fc0aa371655e726 Mon Sep 17 00:00:00 2001 From: "Albert Y. Shih" Date: Tue, 10 Jun 2025 22:20:59 -0400 Subject: [PATCH 116/161] Apply suggestions from code review Co-authored-by: Elliott Sales de Andrade --- lib/matplotlib/tests/test_image.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/matplotlib/tests/test_image.py b/lib/matplotlib/tests/test_image.py index c12a79bc2011..1c89bc5e7912 100644 --- a/lib/matplotlib/tests/test_image.py +++ b/lib/matplotlib/tests/test_image.py @@ -1656,8 +1656,7 @@ def test_resample_nonaffine(data, interpolation, expected): affine_transform = Affine2D().scale(sx=expected.shape[1] / data.shape[1], sy=1) affine_result = np.empty_like(expected) - mimage.resample(data, affine_result, affine_transform, - interpolation=interpolation) + mimage.resample(data, affine_result, affine_transform, interpolation=interpolation) assert_allclose(affine_result, expected) # Create a nonaffine version of the same transform @@ -1672,7 +1671,7 @@ def inverted(self): nonaffine_result = np.empty_like(expected) mimage.resample(data, nonaffine_result, nonaffine_transform, - interpolation=interpolation) + interpolation=interpolation) assert_allclose(nonaffine_result, expected, atol=5e-3) From c3ed0c9e36248ad8aa87a3b8a8a1b6a183eee495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Wed, 11 Jun 2025 13:33:41 +0300 Subject: [PATCH 117/161] Update galleries/users_explain/text/fonts.py Co-authored-by: hannah --- galleries/users_explain/text/fonts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galleries/users_explain/text/fonts.py b/galleries/users_explain/text/fonts.py index ef1d611157ad..5ea5d29a259d 100644 --- a/galleries/users_explain/text/fonts.py +++ b/galleries/users_explain/text/fonts.py @@ -90,7 +90,7 @@ The solution to this problem is to subset the fonts used in the document and only embed the glyphs actually used. This gets both vector text and small -files sizes. Computing the subset of the font required and writing the new +files sizes. Computing the font subset and writing the new (reduced) font are both complex problems and thus Matplotlib relies in most cases on `fontTools `__. From 153e2541d8f14003eec148a33795b958811f0bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Wed, 11 Jun 2025 13:33:53 +0300 Subject: [PATCH 118/161] Update galleries/users_explain/text/fonts.py Co-authored-by: hannah --- galleries/users_explain/text/fonts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galleries/users_explain/text/fonts.py b/galleries/users_explain/text/fonts.py index 5ea5d29a259d..75420321b071 100644 --- a/galleries/users_explain/text/fonts.py +++ b/galleries/users_explain/text/fonts.py @@ -42,7 +42,7 @@ | | render fractals when | | | | rasterizing!) | | +--------------------------+----------------------------+----------------------------+ - | These fonts support font | Do not support font hinting| Hinting supported (virtual | + | Supports font | Does not support font hinting| Supports font hinting (virtual | | hinting | | machine processes the | | | | "hints") | +--------------------------+----------------------------+----------------------------+ From 867cf9fa634cccf227d311ea61d8fc4a4e73ce55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Wed, 11 Jun 2025 13:34:04 +0300 Subject: [PATCH 119/161] Update galleries/users_explain/text/fonts.py Co-authored-by: hannah --- galleries/users_explain/text/fonts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galleries/users_explain/text/fonts.py b/galleries/users_explain/text/fonts.py index 75420321b071..868fa298c989 100644 --- a/galleries/users_explain/text/fonts.py +++ b/galleries/users_explain/text/fonts.py @@ -36,7 +36,7 @@ | introduced by Adobe | terms of introduction | used commonly today, | | | | introduced by Apple | +--------------------------+----------------------------+----------------------------+ - | Restricted subset of | Full PostScript language, | Include a virtual machine | + | Restricted subset of | Full PostScript language, | Includes a virtual machine | | PostScript, charstrings | allows embedding arbitrary | that can execute code! | | are in bytecode | code (in theory, even | | | | render fractals when | | From 2da93075e85ef1fe3736fdf8c5585ac7eef9a3fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Wed, 11 Jun 2025 13:34:17 +0300 Subject: [PATCH 120/161] Update galleries/users_explain/text/fonts.py Co-authored-by: hannah --- galleries/users_explain/text/fonts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galleries/users_explain/text/fonts.py b/galleries/users_explain/text/fonts.py index 868fa298c989..6d3a6e947985 100644 --- a/galleries/users_explain/text/fonts.py +++ b/galleries/users_explain/text/fonts.py @@ -53,7 +53,7 @@ .. note:: Adobe disabled__ support for authoring with Type 1 fonts in January 2023. - Matplotlib uses Type 1 fonts for compatibility with TeX: when the usetex + Matplotlib uses Type 1 fonts for compatibility with TeX; when the usetex feature is used with the PDF backend, Matplotlib reads the fonts used by the TeX engine, which are usually Type 1. From b2e64515303417e1bc4047c307d7217400563b5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Wed, 11 Jun 2025 13:41:21 +0300 Subject: [PATCH 121/161] Reword paragraph on subsetting --- galleries/users_explain/text/fonts.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/galleries/users_explain/text/fonts.py b/galleries/users_explain/text/fonts.py index 6d3a6e947985..7e5d2acec655 100644 --- a/galleries/users_explain/text/fonts.py +++ b/galleries/users_explain/text/fonts.py @@ -36,7 +36,7 @@ | introduced by Adobe | terms of introduction | used commonly today, | | | | introduced by Apple | +--------------------------+----------------------------+----------------------------+ - | Restricted subset of | Full PostScript language, | Includes a virtual machine | + | Restricted subset of | Full PostScript language, | Includes a virtual machine | | PostScript, charstrings | allows embedding arbitrary | that can execute code! | | are in bytecode | code (in theory, even | | | | render fractals when | | @@ -88,11 +88,12 @@ files, particularly with fonts with many glyphs such as those that support CJK (Chinese/Japanese/Korean). -The solution to this problem is to subset the fonts used in the document and -only embed the glyphs actually used. This gets both vector text and small -files sizes. Computing the font subset and writing the new -(reduced) font are both complex problems and thus Matplotlib relies in most cases -on `fontTools `__. +To keep the output size reasonable while using vector fonts, +Matplotlib embeds only the glyphs that are actually used in the document. +This is known as font subsetting. +Computing the font subset and writing the reduced font are both complex problems, +which Matplotlib solves in most cases by using the +`fontTools `__ library. Core Fonts ^^^^^^^^^^ From dfab32110248bbdee6b47deb7b7c9b79c5a5e258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Wed, 11 Jun 2025 13:43:54 +0300 Subject: [PATCH 122/161] Realign grid table --- galleries/users_explain/text/fonts.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/galleries/users_explain/text/fonts.py b/galleries/users_explain/text/fonts.py index 7e5d2acec655..067ed2f3932a 100644 --- a/galleries/users_explain/text/fonts.py +++ b/galleries/users_explain/text/fonts.py @@ -42,9 +42,9 @@ | | render fractals when | | | | rasterizing!) | | +--------------------------+----------------------------+----------------------------+ - | Supports font | Does not support font hinting| Supports font hinting (virtual | - | hinting | | machine processes the | - | | | "hints") | + | Supports font | Does not support font | Supports font hinting | + | hinting | hinting | (virtual machine processes | + | | | the "hints") | +--------------------------+----------------------------+----------------------------+ | Subsetted by code in | Subsetted via external module | | `matplotlib._type1font` | `fontTools `__ | From 3db5500cb242e5c3fa42dd54958bbfe0b264c123 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Tue, 10 Jun 2025 22:33:38 -0400 Subject: [PATCH 123/161] Fix RuntimeWarning with NaN input to format_cursor_data --- lib/matplotlib/cbook.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/cbook.py b/lib/matplotlib/cbook.py index 3100cc4da81d..a09780965b0c 100644 --- a/lib/matplotlib/cbook.py +++ b/lib/matplotlib/cbook.py @@ -2228,6 +2228,9 @@ def _g_sig_digits(value, delta): Return the number of significant digits to %g-format *value*, assuming that it is known with an error of *delta*. """ + # For inf or nan, the precision doesn't matter. + if not math.isfinite(value): + return 0 if delta == 0: if value == 0: # if both value and delta are 0, np.spacing below returns 5e-324 @@ -2241,11 +2244,10 @@ def _g_sig_digits(value, delta): # digits before the decimal point (floor(log10(45.67)) + 1 = 2): the total # is 4 significant digits. A value of 0 contributes 1 "digit" before the # decimal point. - # For inf or nan, the precision doesn't matter. return max( 0, (math.floor(math.log10(abs(value))) + 1 if value else 1) - - math.floor(math.log10(delta))) if math.isfinite(value) else 0 + - math.floor(math.log10(delta))) def _unikey_or_keysym_to_mplkey(unikey, keysym): From 31d92dc41c381eb331bdddc18df94e89f21a9c03 Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Wed, 11 Jun 2025 14:10:40 +0200 Subject: [PATCH 124/161] Prepare to turn matplotlib.style into a plain module. Having matplotlib.style be a package with the entire implementation in matplotlib.style.core is a bit overkill, and also makes it slightly awkward that USER_LIBRARY_PATHS is effectively a public API (clearly intended as so, per the comment, even though we may do it differently nowadays...) but only available in matplotlib.style.core, whereas everything else is re-exported by matplotlib.style. Prepare to flatten the implementation by deprecating matplotlib.style.core and reexporting USER_LIBRARY_PATHS in matplotlib.style. Once the deprecation elapses, we'll be able to move the implementation into a plain matplotlib/style.py module. --- .../deprecations/30163-AL.rst | 9 + lib/matplotlib/style/__init__.py | 252 +++++++++++++++++- lib/matplotlib/style/__init__.pyi | 20 ++ lib/matplotlib/style/core.py | 232 +--------------- lib/matplotlib/style/core.pyi | 7 +- lib/matplotlib/style/meson.build | 1 + lib/matplotlib/tests/test_style.py | 7 +- 7 files changed, 300 insertions(+), 228 deletions(-) create mode 100644 doc/api/next_api_changes/deprecations/30163-AL.rst create mode 100644 lib/matplotlib/style/__init__.pyi diff --git a/doc/api/next_api_changes/deprecations/30163-AL.rst b/doc/api/next_api_changes/deprecations/30163-AL.rst new file mode 100644 index 000000000000..15d0077375f2 --- /dev/null +++ b/doc/api/next_api_changes/deprecations/30163-AL.rst @@ -0,0 +1,9 @@ +``matplotlib.style.core`` +~~~~~~~~~~~~~~~~~~~~~~~~~ +The ``matplotlib.style.core`` module is deprecated. All APIs intended for +public use are now available in `matplotlib.style` directly (including +``USER_LIBRARY_PATHS``, which was previously not reexported). + +The following APIs of ``matplotlib.style.core`` have been deprecated with no +replacement: ``BASE_LIBRARY_PATH``, ``STYLE_EXTENSION``, ``STYLE_BLACKLIST``, +``update_user_library``, ``read_style_directory``, ``update_nested_dict``. diff --git a/lib/matplotlib/style/__init__.py b/lib/matplotlib/style/__init__.py index 488c6d6ae1ec..a202cfe08b20 100644 --- a/lib/matplotlib/style/__init__.py +++ b/lib/matplotlib/style/__init__.py @@ -1,4 +1,252 @@ -from .core import available, context, library, reload_library, use +""" +Core functions and attributes for the matplotlib style library: +``use`` + Select style sheet to override the current matplotlib settings. +``context`` + Context manager to use a style sheet temporarily. +``available`` + List available style sheets. +``library`` + A dictionary of style names and matplotlib settings. +""" -__all__ = ["available", "context", "library", "reload_library", "use"] +import contextlib +import importlib.resources +import logging +import os +from pathlib import Path +import warnings + +import matplotlib as mpl +from matplotlib import _api, _docstring, rc_params_from_file, rcParamsDefault + +_log = logging.getLogger(__name__) + +__all__ = ['use', 'context', 'available', 'library', 'reload_library'] + + +_BASE_LIBRARY_PATH = os.path.join(mpl.get_data_path(), 'stylelib') +# Users may want multiple library paths, so store a list of paths. +USER_LIBRARY_PATHS = [os.path.join(mpl.get_configdir(), 'stylelib')] +_STYLE_EXTENSION = 'mplstyle' +# A list of rcParams that should not be applied from styles +_STYLE_BLACKLIST = { + 'interactive', 'backend', 'webagg.port', 'webagg.address', + 'webagg.port_retries', 'webagg.open_in_browser', 'backend_fallback', + 'toolbar', 'timezone', 'figure.max_open_warning', + 'figure.raise_window', 'savefig.directory', 'tk.window_focus', + 'docstring.hardcopy', 'date.epoch'} + + +@_docstring.Substitution( + "\n".join(map("- {}".format, sorted(_STYLE_BLACKLIST, key=str.lower))) +) +def use(style): + """ + Use Matplotlib style settings from a style specification. + + The style name of 'default' is reserved for reverting back to + the default style settings. + + .. note:: + + This updates the `.rcParams` with the settings from the style. + `.rcParams` not defined in the style are kept. + + Parameters + ---------- + style : str, dict, Path or list + + A style specification. Valid options are: + + str + - One of the style names in `.style.available` (a builtin style or + a style installed in the user library path). + + - A dotted name of the form "package.style_name"; in that case, + "package" should be an importable Python package name, e.g. at + ``/path/to/package/__init__.py``; the loaded style file is + ``/path/to/package/style_name.mplstyle``. (Style files in + subpackages are likewise supported.) + + - The path or URL to a style file, which gets loaded by + `.rc_params_from_file`. + + dict + A mapping of key/value pairs for `matplotlib.rcParams`. + + Path + The path to a style file, which gets loaded by + `.rc_params_from_file`. + + list + A list of style specifiers (str, Path or dict), which are applied + from first to last in the list. + + Notes + ----- + The following `.rcParams` are not related to style and will be ignored if + found in a style specification: + + %s + """ + if isinstance(style, (str, Path)) or hasattr(style, 'keys'): + # If name is a single str, Path or dict, make it a single element list. + styles = [style] + else: + styles = style + + style_alias = {'mpl20': 'default', 'mpl15': 'classic'} + + for style in styles: + if isinstance(style, str): + style = style_alias.get(style, style) + if style == "default": + # Deprecation warnings were already handled when creating + # rcParamsDefault, no need to reemit them here. + with _api.suppress_matplotlib_deprecation_warning(): + # don't trigger RcParams.__getitem__('backend') + style = {k: rcParamsDefault[k] for k in rcParamsDefault + if k not in _STYLE_BLACKLIST} + elif style in library: + style = library[style] + elif "." in style: + pkg, _, name = style.rpartition(".") + try: + path = importlib.resources.files(pkg) / f"{name}.{_STYLE_EXTENSION}" + style = rc_params_from_file(path, use_default_template=False) + except (ModuleNotFoundError, OSError, TypeError) as exc: + # There is an ambiguity whether a dotted name refers to a + # package.style_name or to a dotted file path. Currently, + # we silently try the first form and then the second one; + # in the future, we may consider forcing file paths to + # either use Path objects or be prepended with "./" and use + # the slash as marker for file paths. + pass + if isinstance(style, (str, Path)): + try: + style = rc_params_from_file(style, use_default_template=False) + except OSError as err: + raise OSError( + f"{style!r} is not a valid package style, path of style " + f"file, URL of style file, or library style name (library " + f"styles are listed in `style.available`)") from err + filtered = {} + for k in style: # don't trigger RcParams.__getitem__('backend') + if k in _STYLE_BLACKLIST: + _api.warn_external( + f"Style includes a parameter, {k!r}, that is not " + f"related to style. Ignoring this parameter.") + else: + filtered[k] = style[k] + mpl.rcParams.update(filtered) + + +@contextlib.contextmanager +def context(style, after_reset=False): + """ + Context manager for using style settings temporarily. + + Parameters + ---------- + style : str, dict, Path or list + A style specification. Valid options are: + + str + - One of the style names in `.style.available` (a builtin style or + a style installed in the user library path). + + - A dotted name of the form "package.style_name"; in that case, + "package" should be an importable Python package name, e.g. at + ``/path/to/package/__init__.py``; the loaded style file is + ``/path/to/package/style_name.mplstyle``. (Style files in + subpackages are likewise supported.) + + - The path or URL to a style file, which gets loaded by + `.rc_params_from_file`. + dict + A mapping of key/value pairs for `matplotlib.rcParams`. + + Path + The path to a style file, which gets loaded by + `.rc_params_from_file`. + + list + A list of style specifiers (str, Path or dict), which are applied + from first to last in the list. + + after_reset : bool + If True, apply style after resetting settings to their defaults; + otherwise, apply style on top of the current settings. + """ + with mpl.rc_context(): + if after_reset: + mpl.rcdefaults() + use(style) + yield + + +def _update_user_library(library): + """Update style library with user-defined rc files.""" + for stylelib_path in map(os.path.expanduser, USER_LIBRARY_PATHS): + styles = _read_style_directory(stylelib_path) + _update_nested_dict(library, styles) + return library + + +@_api.deprecated("3.11") +def update_user_library(library): + return _update_user_library(library) + + +def _read_style_directory(style_dir): + """Return dictionary of styles defined in *style_dir*.""" + styles = dict() + for path in Path(style_dir).glob(f"*.{_STYLE_EXTENSION}"): + with warnings.catch_warnings(record=True) as warns: + styles[path.stem] = rc_params_from_file(path, use_default_template=False) + for w in warns: + _log.warning('In %s: %s', path, w.message) + return styles + + +@_api.deprecated("3.11") +def read_style_directory(style_dir): + return _read_style_directory(style_dir) + + +def _update_nested_dict(main_dict, new_dict): + """ + Update nested dict (only level of nesting) with new values. + + Unlike `dict.update`, this assumes that the values of the parent dict are + dicts (or dict-like), so you shouldn't replace the nested dict if it + already exists. Instead you should update the sub-dict. + """ + # update named styles specified by user + for name, rc_dict in new_dict.items(): + main_dict.setdefault(name, {}).update(rc_dict) + return main_dict + + +@_api.deprecated("3.11") +def update_nested_dict(main_dict, new_dict): + return _update_nested_dict(main_dict, new_dict) + + +# Load style library +# ================== +_base_library = _read_style_directory(_BASE_LIBRARY_PATH) +library = {} +available = [] + + +def reload_library(): + """Reload the style library.""" + library.clear() + library.update(_update_user_library(_base_library)) + available[:] = sorted(library.keys()) + + +reload_library() diff --git a/lib/matplotlib/style/__init__.pyi b/lib/matplotlib/style/__init__.pyi new file mode 100644 index 000000000000..c93b504fe6bd --- /dev/null +++ b/lib/matplotlib/style/__init__.pyi @@ -0,0 +1,20 @@ +from collections.abc import Generator +import contextlib + +from matplotlib import RcParams +from matplotlib.typing import RcStyleType + +USER_LIBRARY_PATHS: list[str] = ... + +def use(style: RcStyleType) -> None: ... +@contextlib.contextmanager +def context( + style: RcStyleType, after_reset: bool = ... +) -> Generator[None, None, None]: ... + +library: dict[str, RcParams] +available: list[str] + +def reload_library() -> None: ... + +__all__ = ['use', 'context', 'available', 'library', 'reload_library'] diff --git a/lib/matplotlib/style/core.py b/lib/matplotlib/style/core.py index e36c3c37a882..c377bc64077a 100644 --- a/lib/matplotlib/style/core.py +++ b/lib/matplotlib/style/core.py @@ -11,227 +11,17 @@ A dictionary of style names and matplotlib settings. """ -import contextlib -import importlib.resources -import logging -import os -from pathlib import Path -import warnings - -import matplotlib as mpl -from matplotlib import _api, _docstring, _rc_params_in_file, rcParamsDefault - -_log = logging.getLogger(__name__) - -__all__ = ['use', 'context', 'available', 'library', 'reload_library'] - - -BASE_LIBRARY_PATH = os.path.join(mpl.get_data_path(), 'stylelib') -# Users may want multiple library paths, so store a list of paths. -USER_LIBRARY_PATHS = [os.path.join(mpl.get_configdir(), 'stylelib')] -STYLE_EXTENSION = 'mplstyle' -# A list of rcParams that should not be applied from styles -STYLE_BLACKLIST = { - 'interactive', 'backend', 'webagg.port', 'webagg.address', - 'webagg.port_retries', 'webagg.open_in_browser', 'backend_fallback', - 'toolbar', 'timezone', 'figure.max_open_warning', - 'figure.raise_window', 'savefig.directory', 'tk.window_focus', - 'docstring.hardcopy', 'date.epoch'} - - -@_docstring.Substitution( - "\n".join(map("- {}".format, sorted(STYLE_BLACKLIST, key=str.lower))) +from .. import _api +from . import ( + use, context, available, library, reload_library, USER_LIBRARY_PATHS, + _BASE_LIBRARY_PATH as BASE_LIBRARY_PATH, + _STYLE_EXTENSION as STYLE_EXTENSION, + _STYLE_BLACKLIST as STYLE_BLACKLIST, ) -def use(style): - """ - Use Matplotlib style settings from a style specification. - - The style name of 'default' is reserved for reverting back to - the default style settings. - - .. note:: - - This updates the `.rcParams` with the settings from the style. - `.rcParams` not defined in the style are kept. - - Parameters - ---------- - style : str, dict, Path or list - - A style specification. Valid options are: - - str - - One of the style names in `.style.available` (a builtin style or - a style installed in the user library path). - - - A dotted name of the form "package.style_name"; in that case, - "package" should be an importable Python package name, e.g. at - ``/path/to/package/__init__.py``; the loaded style file is - ``/path/to/package/style_name.mplstyle``. (Style files in - subpackages are likewise supported.) - - - The path or URL to a style file, which gets loaded by - `.rc_params_from_file`. - - dict - A mapping of key/value pairs for `matplotlib.rcParams`. - - Path - The path to a style file, which gets loaded by - `.rc_params_from_file`. - - list - A list of style specifiers (str, Path or dict), which are applied - from first to last in the list. - - Notes - ----- - The following `.rcParams` are not related to style and will be ignored if - found in a style specification: - - %s - """ - if isinstance(style, (str, Path)) or hasattr(style, 'keys'): - # If name is a single str, Path or dict, make it a single element list. - styles = [style] - else: - styles = style - - style_alias = {'mpl20': 'default', 'mpl15': 'classic'} - - for style in styles: - if isinstance(style, str): - style = style_alias.get(style, style) - if style == "default": - # Deprecation warnings were already handled when creating - # rcParamsDefault, no need to reemit them here. - with _api.suppress_matplotlib_deprecation_warning(): - # don't trigger RcParams.__getitem__('backend') - style = {k: rcParamsDefault[k] for k in rcParamsDefault - if k not in STYLE_BLACKLIST} - elif style in library: - style = library[style] - elif "." in style: - pkg, _, name = style.rpartition(".") - try: - path = importlib.resources.files(pkg) / f"{name}.{STYLE_EXTENSION}" - style = _rc_params_in_file(path) - except (ModuleNotFoundError, OSError, TypeError) as exc: - # There is an ambiguity whether a dotted name refers to a - # package.style_name or to a dotted file path. Currently, - # we silently try the first form and then the second one; - # in the future, we may consider forcing file paths to - # either use Path objects or be prepended with "./" and use - # the slash as marker for file paths. - pass - if isinstance(style, (str, Path)): - try: - style = _rc_params_in_file(style) - except OSError as err: - raise OSError( - f"{style!r} is not a valid package style, path of style " - f"file, URL of style file, or library style name (library " - f"styles are listed in `style.available`)") from err - filtered = {} - for k in style: # don't trigger RcParams.__getitem__('backend') - if k in STYLE_BLACKLIST: - _api.warn_external( - f"Style includes a parameter, {k!r}, that is not " - f"related to style. Ignoring this parameter.") - else: - filtered[k] = style[k] - mpl.rcParams.update(filtered) - - -@contextlib.contextmanager -def context(style, after_reset=False): - """ - Context manager for using style settings temporarily. - - Parameters - ---------- - style : str, dict, Path or list - A style specification. Valid options are: - - str - - One of the style names in `.style.available` (a builtin style or - a style installed in the user library path). - - - A dotted name of the form "package.style_name"; in that case, - "package" should be an importable Python package name, e.g. at - ``/path/to/package/__init__.py``; the loaded style file is - ``/path/to/package/style_name.mplstyle``. (Style files in - subpackages are likewise supported.) - - - The path or URL to a style file, which gets loaded by - `.rc_params_from_file`. - dict - A mapping of key/value pairs for `matplotlib.rcParams`. - - Path - The path to a style file, which gets loaded by - `.rc_params_from_file`. - - list - A list of style specifiers (str, Path or dict), which are applied - from first to last in the list. - - after_reset : bool - If True, apply style after resetting settings to their defaults; - otherwise, apply style on top of the current settings. - """ - with mpl.rc_context(): - if after_reset: - mpl.rcdefaults() - use(style) - yield - - -def update_user_library(library): - """Update style library with user-defined rc files.""" - for stylelib_path in map(os.path.expanduser, USER_LIBRARY_PATHS): - styles = read_style_directory(stylelib_path) - update_nested_dict(library, styles) - return library - - -def read_style_directory(style_dir): - """Return dictionary of styles defined in *style_dir*.""" - styles = dict() - for path in Path(style_dir).glob(f"*.{STYLE_EXTENSION}"): - with warnings.catch_warnings(record=True) as warns: - styles[path.stem] = _rc_params_in_file(path) - for w in warns: - _log.warning('In %s: %s', path, w.message) - return styles - - -def update_nested_dict(main_dict, new_dict): - """ - Update nested dict (only level of nesting) with new values. - - Unlike `dict.update`, this assumes that the values of the parent dict are - dicts (or dict-like), so you shouldn't replace the nested dict if it - already exists. Instead you should update the sub-dict. - """ - # update named styles specified by user - for name, rc_dict in new_dict.items(): - main_dict.setdefault(name, {}).update(rc_dict) - return main_dict - - -# Load style library -# ================== -_base_library = read_style_directory(BASE_LIBRARY_PATH) -library = {} -available = [] - - -def reload_library(): - """Reload the style library.""" - library.clear() - library.update(update_user_library(_base_library)) - available[:] = sorted(library.keys()) +__all__ = [ + "use", "context", "available", "library", "reload_library", + "USER_LIBRARY_PATHS", "BASE_LIBRARY_PATH", "STYLE_EXTENSION", "STYLE_BLACKLIST", +] -reload_library() +_api.warn_deprecated("3.11", name=__name__, obj_type="module") diff --git a/lib/matplotlib/style/core.pyi b/lib/matplotlib/style/core.pyi index 5734b017f7c4..ee21d2f41ef5 100644 --- a/lib/matplotlib/style/core.pyi +++ b/lib/matplotlib/style/core.pyi @@ -5,7 +5,9 @@ from matplotlib import RcParams from matplotlib.typing import RcStyleType USER_LIBRARY_PATHS: list[str] = ... +BASE_LIBRARY_PATH: str = ... STYLE_EXTENSION: str = ... +STYLE_BLACKLIST: set[str] = ... def use(style: RcStyleType) -> None: ... @contextlib.contextmanager @@ -18,4 +20,7 @@ available: list[str] def reload_library() -> None: ... -__all__ = ['use', 'context', 'available', 'library', 'reload_library'] +__all__ = [ + "use", "context", "available", "library", "reload_library", + "USER_LIBRARY_PATHS", "BASE_LIBRARY_PATH", "STYLE_EXTENSION", "STYLE_BLACKLIST", +] diff --git a/lib/matplotlib/style/meson.build b/lib/matplotlib/style/meson.build index 03e7972132bb..e7a183c8581c 100644 --- a/lib/matplotlib/style/meson.build +++ b/lib/matplotlib/style/meson.build @@ -4,6 +4,7 @@ python_sources = [ ] typing_sources = [ + '__init__.pyi', 'core.pyi', ] diff --git a/lib/matplotlib/tests/test_style.py b/lib/matplotlib/tests/test_style.py index be038965e33d..4d76a4ecfa8b 100644 --- a/lib/matplotlib/tests/test_style.py +++ b/lib/matplotlib/tests/test_style.py @@ -8,7 +8,6 @@ import matplotlib as mpl from matplotlib import pyplot as plt, style -from matplotlib.style.core import USER_LIBRARY_PATHS, STYLE_EXTENSION PARAM = 'image.cmap' @@ -21,7 +20,7 @@ def temp_style(style_name, settings=None): """Context manager to create a style sheet in a temporary directory.""" if not settings: settings = DUMMY_SETTINGS - temp_file = f'{style_name}.{STYLE_EXTENSION}' + temp_file = f'{style_name}.mplstyle' try: with TemporaryDirectory() as tmpdir: # Write style settings to file in the tmpdir. @@ -29,7 +28,7 @@ def temp_style(style_name, settings=None): "\n".join(f"{k}: {v}" for k, v in settings.items()), encoding="utf-8") # Add tmpdir to style path and reload so we can access this style. - USER_LIBRARY_PATHS.append(tmpdir) + style.USER_LIBRARY_PATHS.append(tmpdir) style.reload_library() yield finally: @@ -71,7 +70,7 @@ def test_use_url(tmp_path): def test_single_path(tmp_path): mpl.rcParams[PARAM] = 'gray' - path = tmp_path / f'text.{STYLE_EXTENSION}' + path = tmp_path / 'text.mplstyle' path.write_text(f'{PARAM} : {VALUE}', encoding='utf-8') with style.context(path): assert mpl.rcParams[PARAM] == VALUE From 48e3e942800cd1b2a0f5bd2757a9074df7583fb5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Jun 2025 20:42:39 +0000 Subject: [PATCH 125/161] Bump the actions group with 3 updates Bumps the actions group with 3 updates: [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel), [actions/attest-build-provenance](https://github.com/actions/attest-build-provenance) and [github/codeql-action](https://github.com/github/codeql-action). Updates `pypa/cibuildwheel` from 2.23.3 to 3.0.0 - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/faf86a6ed7efa889faf6996aa23820831055001a...5f22145df44122af0f5a201f93cf0207171beca7) Updates `actions/attest-build-provenance` from 2.3.0 to 2.4.0 - [Release notes](https://github.com/actions/attest-build-provenance/releases) - [Changelog](https://github.com/actions/attest-build-provenance/blob/main/RELEASE.md) - [Commits](https://github.com/actions/attest-build-provenance/compare/db473fddc028af60658334401dc6fa3ffd8669fd...e8998f949152b193b063cb0ec769d69d929409be) Updates `github/codeql-action` from 3.28.19 to 3.29.0 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/fca7ace96b7d713c7035871441bd52efbe39e27e...ce28f5bb42b7a9f2c824e633a3f6ee835bab6858) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-version: 3.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: actions - dependency-name: actions/attest-build-provenance dependency-version: 2.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions - dependency-name: github/codeql-action dependency-version: 3.29.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions ... Signed-off-by: dependabot[bot] --- .github/workflows/cibuildwheel.yml | 10 +++++----- .github/workflows/codeql-analysis.yml | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index a05d3ccc330c..57f1c71c5047 100644 --- a/.github/workflows/cibuildwheel.yml +++ b/.github/workflows/cibuildwheel.yml @@ -141,7 +141,7 @@ jobs: path: dist/ - name: Build wheels for CPython 3.13 - uses: pypa/cibuildwheel@faf86a6ed7efa889faf6996aa23820831055001a # v2.23.3 + uses: pypa/cibuildwheel@5f22145df44122af0f5a201f93cf0207171beca7 # v3.0.0 with: package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }} env: @@ -152,7 +152,7 @@ jobs: CIBW_ARCHS: ${{ matrix.cibw_archs }} - name: Build wheels for CPython 3.12 - uses: pypa/cibuildwheel@faf86a6ed7efa889faf6996aa23820831055001a # v2.23.3 + uses: pypa/cibuildwheel@5f22145df44122af0f5a201f93cf0207171beca7 # v3.0.0 with: package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }} env: @@ -160,7 +160,7 @@ jobs: CIBW_ARCHS: ${{ matrix.cibw_archs }} - name: Build wheels for CPython 3.11 - uses: pypa/cibuildwheel@faf86a6ed7efa889faf6996aa23820831055001a # v2.23.3 + uses: pypa/cibuildwheel@5f22145df44122af0f5a201f93cf0207171beca7 # v3.0.0 with: package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }} env: @@ -169,7 +169,7 @@ jobs: - name: Build wheels for PyPy - uses: pypa/cibuildwheel@faf86a6ed7efa889faf6996aa23820831055001a # v2.23.3 + uses: pypa/cibuildwheel@5f22145df44122af0f5a201f93cf0207171beca7 # v3.0.0 with: package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }} env: @@ -208,7 +208,7 @@ jobs: run: ls dist - name: Generate artifact attestation for sdist and wheel - uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd # v2.3.0 + uses: actions/attest-build-provenance@e8998f949152b193b063cb0ec769d69d929409be # v2.4.0 with: subject-path: dist/matplotlib-* diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index feed44a51146..c05454884b55 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -32,7 +32,7 @@ jobs: persist-credentials: false - name: Initialize CodeQL - uses: github/codeql-action/init@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19 + uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0 with: languages: ${{ matrix.language }} @@ -43,4 +43,4 @@ jobs: pip install --user -v . - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19 + uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0 From b13e31a2799f3d3227afc2d83187aa0eba6b373b Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 7 Nov 2024 23:32:19 -0500 Subject: [PATCH 126/161] TST: Calculate RMS and diff image in C++ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The current implementation is not slow, but uses a lot of memory per image. In `compare_images`, we have: - one actual and one expected image as uint8 (2×image) - both converted to int16 (though original is thrown away) (4×) which adds up to 4× the image allocated in this function. Then it calls `calculate_rms`, which has: - a difference between them as int16 (2×) - the difference cast to 64-bit float (8×) - the square of the difference as 64-bit float (though possibly the original difference was thrown away) (8×) which at its peak has 16× the image allocated in parallel. If the RMS is over the desired tolerance, then `save_diff_image` is called, which: - loads the actual and expected images _again_ as uint8 (2× image) - converts both to 64-bit float (throwing away the original) (16×) - calculates the difference (8×) - calculates the absolute value (8×) - multiples that by 10 (in-place, so no allocation) - clips to 0-255 (8×) - casts to uint8 (1×) which at peak uses 32× the image. So at their peak, `compare_images`→`calculate_rms` will have 20× the image allocated, and then `compare_images`→`save_diff_image` will have 36× the image allocated. This is generally not a problem, but on resource-constrained places like WASM, it can sometimes run out of memory just in `calculate_rms`. This implementation in C++ always allocates the diff image, even when not needed, but doesn't have all the temporaries, so it's a maximum of 3× the image size (plus a few scalar temporaries). --- lib/matplotlib/testing/compare.py | 13 ++-- lib/matplotlib/tests/test_compare_images.py | 27 +++++++ src/_image_wrapper.cpp | 79 +++++++++++++++++++++ 3 files changed, 110 insertions(+), 9 deletions(-) diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py index 67897e76edcb..fa5cd89481b5 100644 --- a/lib/matplotlib/testing/compare.py +++ b/lib/matplotlib/testing/compare.py @@ -19,7 +19,7 @@ from PIL import Image import matplotlib as mpl -from matplotlib import cbook +from matplotlib import cbook, _image from matplotlib.testing.exceptions import ImageComparisonFailure _log = logging.getLogger(__name__) @@ -412,7 +412,7 @@ def compare_images(expected, actual, tol, in_decorator=False): The two given filenames may point to files which are convertible to PNG via the `!converter` dictionary. The underlying RMS is calculated - with the `.calculate_rms` function. + in a similar way to the `.calculate_rms` function. Parameters ---------- @@ -483,17 +483,12 @@ def compare_images(expected, actual, tol, in_decorator=False): if np.array_equal(expected_image, actual_image): return None - # convert to signed integers, so that the images can be subtracted without - # overflow - expected_image = expected_image.astype(np.int16) - actual_image = actual_image.astype(np.int16) - - rms = calculate_rms(expected_image, actual_image) + rms, abs_diff = _image.calculate_rms_and_diff(expected_image, actual_image) if rms <= tol: return None - save_diff_image(expected, actual, diff_image) + Image.fromarray(abs_diff).save(diff_image, format="png") results = dict(rms=rms, expected=str(expected), actual=str(actual), diff=str(diff_image), tol=tol) diff --git a/lib/matplotlib/tests/test_compare_images.py b/lib/matplotlib/tests/test_compare_images.py index 6023f3d05468..96b76f790ccd 100644 --- a/lib/matplotlib/tests/test_compare_images.py +++ b/lib/matplotlib/tests/test_compare_images.py @@ -1,11 +1,14 @@ from pathlib import Path import shutil +import numpy as np import pytest from pytest import approx +from matplotlib import _image from matplotlib.testing.compare import compare_images from matplotlib.testing.decorators import _image_directories +from matplotlib.testing.exceptions import ImageComparisonFailure # Tests of the image comparison algorithm. @@ -71,3 +74,27 @@ def test_image_comparison_expect_rms(im1, im2, tol, expect_rms, tmp_path, else: assert results is not None assert results['rms'] == approx(expect_rms, abs=1e-4) + + +def test_invalid_input(): + img = np.zeros((16, 16, 4), dtype=np.uint8) + + with pytest.raises(ImageComparisonFailure, + match='must be 3-dimensional, but is 2-dimensional'): + _image.calculate_rms_and_diff(img[:, :, 0], img) + with pytest.raises(ImageComparisonFailure, + match='must be 3-dimensional, but is 5-dimensional'): + _image.calculate_rms_and_diff(img, img[:, :, :, np.newaxis, np.newaxis]) + with pytest.raises(ImageComparisonFailure, + match='must be RGB or RGBA but has depth 2'): + _image.calculate_rms_and_diff(img[:, :, :2], img) + + with pytest.raises(ImageComparisonFailure, + match=r'expected size: \(16, 16, 4\) actual size \(8, 16, 4\)'): + _image.calculate_rms_and_diff(img, img[:8, :, :]) + with pytest.raises(ImageComparisonFailure, + match=r'expected size: \(16, 16, 4\) actual size \(16, 6, 4\)'): + _image.calculate_rms_and_diff(img, img[:, :6, :]) + with pytest.raises(ImageComparisonFailure, + match=r'expected size: \(16, 16, 4\) actual size \(16, 16, 3\)'): + _image.calculate_rms_and_diff(img, img[:, :, :3]) diff --git a/src/_image_wrapper.cpp b/src/_image_wrapper.cpp index 87d2b3b288ec..6528c4a9270c 100644 --- a/src/_image_wrapper.cpp +++ b/src/_image_wrapper.cpp @@ -1,6 +1,8 @@ #include #include +#include + #include "_image_resample.h" #include "py_converters.h" @@ -202,6 +204,80 @@ image_resample(py::array input_array, } +// This is used by matplotlib.testing.compare to calculate RMS and a difference image. +static py::tuple +calculate_rms_and_diff(py::array_t expected_image, + py::array_t actual_image) +{ + for (const auto & [image, name] : {std::pair{expected_image, "Expected"}, + std::pair{actual_image, "Actual"}}) + { + if (image.ndim() != 3) { + auto exceptions = py::module_::import("matplotlib.testing.exceptions"); + auto ImageComparisonFailure = exceptions.attr("ImageComparisonFailure"); + py::set_error( + ImageComparisonFailure, + "{name} image must be 3-dimensional, but is {ndim}-dimensional"_s.format( + "name"_a=name, "ndim"_a=image.ndim())); + throw py::error_already_set(); + } + } + + auto height = expected_image.shape(0); + auto width = expected_image.shape(1); + auto depth = expected_image.shape(2); + + if (depth != 3 && depth != 4) { + auto exceptions = py::module_::import("matplotlib.testing.exceptions"); + auto ImageComparisonFailure = exceptions.attr("ImageComparisonFailure"); + py::set_error( + ImageComparisonFailure, + "Image must be RGB or RGBA but has depth {depth}"_s.format( + "depth"_a=depth)); + throw py::error_already_set(); + } + + if (height != actual_image.shape(0) || width != actual_image.shape(1) || + depth != actual_image.shape(2)) { + auto exceptions = py::module_::import("matplotlib.testing.exceptions"); + auto ImageComparisonFailure = exceptions.attr("ImageComparisonFailure"); + py::set_error( + ImageComparisonFailure, + "Image sizes do not match expected size: {expected_image.shape} "_s + "actual size {actual_image.shape}"_s.format( + "expected_image"_a=expected_image, "actual_image"_a=actual_image)); + throw py::error_already_set(); + } + auto expected = expected_image.unchecked<3>(); + auto actual = actual_image.unchecked<3>(); + + py::ssize_t diff_dims[3] = {height, width, 3}; + py::array_t diff_image(diff_dims); + auto diff = diff_image.mutable_unchecked<3>(); + + double total = 0.0; + for (auto i = 0; i < height; i++) { + for (auto j = 0; j < width; j++) { + for (auto k = 0; k < depth; k++) { + auto pixel_diff = static_cast(expected(i, j, k)) - + static_cast(actual(i, j, k)); + + total += pixel_diff*pixel_diff; + + if (k != 3) { // Hard-code a fully solid alpha channel by omitting it. + diff(i, j, k) = static_cast(std::clamp( + abs(pixel_diff) * 10, // Expand differences in luminance domain. + 0.0, 255.0)); + } + } + } + } + total = total / (width * height * depth); + + return py::make_tuple(sqrt(total), diff_image); +} + + PYBIND11_MODULE(_image, m, py::mod_gil_not_used()) { py::enum_(m, "_InterpolationType") @@ -234,4 +310,7 @@ PYBIND11_MODULE(_image, m, py::mod_gil_not_used()) "norm"_a = false, "radius"_a = 1, image_resample__doc__); + + m.def("calculate_rms_and_diff", &calculate_rms_and_diff, + "expected_image"_a, "actual_image"_a); } From 33a0d07a58ad0b18f765f8a4feea766b8d2ea10a Mon Sep 17 00:00:00 2001 From: Jody Klymak Date: Thu, 19 Jun 2025 15:09:33 -0700 Subject: [PATCH 127/161] DOC: expand polar example (#30180) * DOC: expand polar example * DOC: expand polar example * Apply suggestions from code review Co-authored-by: Ruth Comer <10599679+rcomer@users.noreply.github.com> --------- Co-authored-by: Ruth Comer <10599679+rcomer@users.noreply.github.com> --- .../pie_and_polar_charts/polar_demo.py | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/galleries/examples/pie_and_polar_charts/polar_demo.py b/galleries/examples/pie_and_polar_charts/polar_demo.py index e4967079d19d..909fea094be5 100644 --- a/galleries/examples/pie_and_polar_charts/polar_demo.py +++ b/galleries/examples/pie_and_polar_charts/polar_demo.py @@ -4,6 +4,11 @@ ========== Demo of a line plot on a polar axis. + +The second plot shows the same data, but with the radial axis starting at r=1 +and the angular axis starting at 0 degrees and ending at 225 degrees. Setting +the origin of the radial axis to 0 allows the radial ticks to be placed at the +same location as the first plot. """ import matplotlib.pyplot as plt import numpy as np @@ -11,14 +16,29 @@ r = np.arange(0, 2, 0.01) theta = 2 * np.pi * r -fig, ax = plt.subplots(subplot_kw={'projection': 'polar'}) +fig, axs = plt.subplots(2, 1, figsize=(5, 8), subplot_kw={'projection': 'polar'}, + layout='constrained') +ax = axs[0] ax.plot(theta, r) ax.set_rmax(2) -ax.set_rticks([0.5, 1, 1.5, 2]) # Less radial ticks +ax.set_rticks([0.5, 1, 1.5, 2]) # Fewer radial ticks ax.set_rlabel_position(-22.5) # Move radial labels away from plotted line ax.grid(True) ax.set_title("A line plot on a polar axis", va='bottom') + +ax = axs[1] +ax.plot(theta, r) +ax.set_rmax(2) +ax.set_rmin(1) # Change the radial axis to only go from 1 to 2 +ax.set_rorigin(0) # Set the origin of the radial axis to 0 +ax.set_thetamin(0) +ax.set_thetamax(225) +ax.set_rticks([1, 1.5, 2]) # Fewer radial ticks +ax.set_rlabel_position(-22.5) # Move radial labels away from plotted line + +ax.grid(True) +ax.set_title("Same plot, but with reduced axis limits", va='bottom') plt.show() # %% @@ -32,6 +52,8 @@ # - `matplotlib.projections.polar` # - `matplotlib.projections.polar.PolarAxes` # - `matplotlib.projections.polar.PolarAxes.set_rticks` +# - `matplotlib.projections.polar.PolarAxes.set_rmin` +# - `matplotlib.projections.polar.PolarAxes.set_rorigin` # - `matplotlib.projections.polar.PolarAxes.set_rmax` # - `matplotlib.projections.polar.PolarAxes.set_rlabel_position` # From f5851dad829961c392cf22901412a6eeccc9a45f Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Thu, 19 Jun 2025 20:09:47 -0400 Subject: [PATCH 128/161] Simplify RendererAgg::draw_markers buffers Instead of a fixed-size buffer, a dynamic buffer, and all the tracking for them, just use a standard C++ container, which will clean up for itself automatically. --- src/_backend_agg.h | 41 ++++++++++------------------------------- 1 file changed, 10 insertions(+), 31 deletions(-) diff --git a/src/_backend_agg.h b/src/_backend_agg.h index 6ecbcba1df18..6eb54e485e86 100644 --- a/src/_backend_agg.h +++ b/src/_backend_agg.h @@ -11,6 +11,7 @@ #include #include #include +#include #include "agg_alpha_mask_u8.h" #include "agg_conv_curve.h" @@ -102,8 +103,6 @@ class BufferRegion int stride; }; -#define MARKER_CACHE_SIZE 512 - // the renderer class RendererAgg { @@ -539,22 +538,14 @@ inline void RendererAgg::draw_markers(GCAgg &gc, rendererBase.reset_clipping(true); agg::rect_i marker_size(0x7FFFFFFF, 0x7FFFFFFF, -0x7FFFFFFF, -0x7FFFFFFF); - agg::int8u staticFillCache[MARKER_CACHE_SIZE]; - agg::int8u staticStrokeCache[MARKER_CACHE_SIZE]; - agg::int8u *fillCache = staticFillCache; - agg::int8u *strokeCache = staticStrokeCache; - try { - unsigned fillSize = 0; + std::vector fillBuffer; if (face.first) { theRasterizer.add_path(marker_path_curve); agg::render_scanlines(theRasterizer, slineP8, scanlines); - fillSize = scanlines.byte_size(); - if (fillSize >= MARKER_CACHE_SIZE) { - fillCache = new agg::int8u[fillSize]; - } - scanlines.serialize(fillCache); + fillBuffer.resize(scanlines.byte_size()); + scanlines.serialize(fillBuffer.data()); marker_size = agg::rect_i(scanlines.min_x(), scanlines.min_y(), scanlines.max_x(), @@ -569,11 +560,8 @@ inline void RendererAgg::draw_markers(GCAgg &gc, theRasterizer.reset(); theRasterizer.add_path(stroke); agg::render_scanlines(theRasterizer, slineP8, scanlines); - unsigned strokeSize = scanlines.byte_size(); - if (strokeSize >= MARKER_CACHE_SIZE) { - strokeCache = new agg::int8u[strokeSize]; - } - scanlines.serialize(strokeCache); + std::vector strokeBuffer(scanlines.byte_size()); + scanlines.serialize(strokeBuffer.data()); marker_size = agg::rect_i(std::min(marker_size.x1, scanlines.min_x()), std::min(marker_size.y1, scanlines.min_y()), std::max(marker_size.x2, scanlines.max_x()), @@ -619,11 +607,11 @@ inline void RendererAgg::draw_markers(GCAgg &gc, if (face.first) { ren.color(face.second); - sa.init(fillCache, fillSize, x, y); + sa.init(fillBuffer.data(), fillBuffer.size(), x, y); agg::render_scanlines(sa, sl, ren); } ren.color(gc.color); - sa.init(strokeCache, strokeSize, x, y); + sa.init(strokeBuffer.data(), strokeBuffer.size(), x, y); agg::render_scanlines(sa, sl, ren); } } else { @@ -647,32 +635,23 @@ inline void RendererAgg::draw_markers(GCAgg &gc, if (face.first) { rendererAA.color(face.second); - sa.init(fillCache, fillSize, x, y); + sa.init(fillBuffer.data(), fillBuffer.size(), x, y); agg::render_scanlines(sa, sl, rendererAA); } rendererAA.color(gc.color); - sa.init(strokeCache, strokeSize, x, y); + sa.init(strokeBuffer.data(), strokeBuffer.size(), x, y); agg::render_scanlines(sa, sl, rendererAA); } } } catch (...) { - if (fillCache != staticFillCache) - delete[] fillCache; - if (strokeCache != staticStrokeCache) - delete[] strokeCache; theRasterizer.reset_clipping(); rendererBase.reset_clipping(true); throw; } - if (fillCache != staticFillCache) - delete[] fillCache; - if (strokeCache != staticStrokeCache) - delete[] strokeCache; - theRasterizer.reset_clipping(); rendererBase.reset_clipping(true); } From b154237b4b3bbc5712f01807d58e3b8011eb9cb9 Mon Sep 17 00:00:00 2001 From: "Albert Y. Shih" Date: Thu, 19 Jun 2025 14:13:10 -0400 Subject: [PATCH 129/161] Clean up image files that may be symbolic links to files --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2a48276707ce..f599e55ab03e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -346,7 +346,7 @@ jobs: run: | function remove_files() { local extension=$1 - find ./result_images -type f -name "*-expected*.$extension" | while read file; do + find ./result_images -name "*-expected*.$extension" | while read file; do if [[ $file == *"-expected_pdf"* ]]; then base=${file%-expected_pdf.$extension}_pdf elif [[ $file == *"-expected_eps"* ]]; then From 8c75238a3172e2260d58f72e7b26a06263d2b90d Mon Sep 17 00:00:00 2001 From: "Albert Y. Shih" Date: Thu, 19 Jun 2025 14:55:47 -0400 Subject: [PATCH 130/161] Clean up GIF image files from passing tests --- .github/workflows/tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f599e55ab03e..85ace93445b6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -353,6 +353,8 @@ jobs: base=${file%-expected_eps.$extension}_eps elif [[ $file == *"-expected_svg"* ]]; then base=${file%-expected_svg.$extension}_svg + elif [[ $file == *"-expected_gif"* ]]; then + base=${file%-expected_gif.$extension}_gif else base=${file%-expected.$extension} fi @@ -369,7 +371,7 @@ jobs: done } - remove_files "png"; remove_files "svg"; remove_files "pdf"; remove_files "eps"; + remove_files "png"; remove_files "svg"; remove_files "pdf"; remove_files "eps"; remove_files "gif"; if [ "$(find ./result_images -mindepth 1 -type d)" ]; then find ./result_images/* -type d -empty -delete From fc99473e8da7c30ed9c6cedaa704772563257dcd Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 20 Jun 2025 22:57:27 -0400 Subject: [PATCH 131/161] DOC: Remove last userdemo example Nested gridspecs are explained in `galleries/examples/subplots_axes_and_figures/gridspec_nested.py`, and layout is more generally explained in `galleries/users_explain/axes/arranging_axes.py` and `galleries/users_explain/axes/constrainedlayout_guide.py` Closes #25800 --- .../gridspec_nested.py | 2 + galleries/examples/userdemo/README.txt | 4 -- .../examples/userdemo/demo_gridspec06.py | 38 ------------------- galleries/users_explain/axes/legend_guide.py | 4 +- pyproject.toml | 1 - 5 files changed, 4 insertions(+), 45 deletions(-) delete mode 100644 galleries/examples/userdemo/README.txt delete mode 100644 galleries/examples/userdemo/demo_gridspec06.py diff --git a/galleries/examples/subplots_axes_and_figures/gridspec_nested.py b/galleries/examples/subplots_axes_and_figures/gridspec_nested.py index 025bdb1185a7..789cc0ae6b5b 100644 --- a/galleries/examples/subplots_axes_and_figures/gridspec_nested.py +++ b/galleries/examples/subplots_axes_and_figures/gridspec_nested.py @@ -1,4 +1,6 @@ """ +.. redirect-from:: /gallery/userdemo/demo_gridspec06 + ================ Nested Gridspecs ================ diff --git a/galleries/examples/userdemo/README.txt b/galleries/examples/userdemo/README.txt deleted file mode 100644 index 7be351dc70dd..000000000000 --- a/galleries/examples/userdemo/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -.. _userdemo: - -Userdemo -======== diff --git a/galleries/examples/userdemo/demo_gridspec06.py b/galleries/examples/userdemo/demo_gridspec06.py deleted file mode 100644 index c42224ce1e7b..000000000000 --- a/galleries/examples/userdemo/demo_gridspec06.py +++ /dev/null @@ -1,38 +0,0 @@ -r""" -================ -Nested GridSpecs -================ - -This example demonstrates the use of nested `.GridSpec`\s. -""" - -import matplotlib.pyplot as plt -import numpy as np - - -def squiggle_xy(a, b, c, d): - i = np.arange(0.0, 2*np.pi, 0.05) - return np.sin(i*a)*np.cos(i*b), np.sin(i*c)*np.cos(i*d) - - -fig = plt.figure(figsize=(8, 8)) -outer_grid = fig.add_gridspec(4, 4, wspace=0, hspace=0) - -for a in range(4): - for b in range(4): - # gridspec inside gridspec - inner_grid = outer_grid[a, b].subgridspec(3, 3, wspace=0, hspace=0) - axs = inner_grid.subplots() # Create all subplots for the inner grid. - for (c, d), ax in np.ndenumerate(axs): - ax.plot(*squiggle_xy(a + 1, b + 1, c + 1, d + 1)) - ax.set(xticks=[], yticks=[]) - -# show only the outside spines -for ax in fig.get_axes(): - ss = ax.get_subplotspec() - ax.spines.top.set_visible(ss.is_first_row()) - ax.spines.bottom.set_visible(ss.is_last_row()) - ax.spines.left.set_visible(ss.is_first_col()) - ax.spines.right.set_visible(ss.is_last_col()) - -plt.show() diff --git a/galleries/users_explain/axes/legend_guide.py b/galleries/users_explain/axes/legend_guide.py index 5da3ceafe387..ec0468fe172d 100644 --- a/galleries/users_explain/axes/legend_guide.py +++ b/galleries/users_explain/axes/legend_guide.py @@ -1,7 +1,7 @@ """ .. redirect-from:: /tutorials/intermediate/legend_guide -.. redirect-from:: /galleries/examples/userdemo/simple_legend01 -.. redirect-from:: /galleries/examples/userdemo/simple_legend02 +.. redirect-from:: /gallery/userdemo/simple_legend01 +.. redirect-from:: /gallery/userdemo/simple_legend02 .. _legend_guide: diff --git a/pyproject.toml b/pyproject.toml index 70b078a73d27..b980e512769a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -196,7 +196,6 @@ convention = "numpy" "galleries/examples/user_interfaces/mpl_with_glade3_sgskip.py" = ["E402"] "galleries/examples/user_interfaces/pylab_with_gtk3_sgskip.py" = ["E402"] "galleries/examples/user_interfaces/pylab_with_gtk4_sgskip.py" = ["E402"] -"galleries/examples/userdemo/pgf_preamble_sgskip.py" = ["E402"] "lib/matplotlib/__init__.py" = ["F822"] "lib/matplotlib/_cm.py" = ["E202", "E203", "E302"] From bbff84c0df2bcfa59bacd8f38723e6be0de0fd84 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 20 Jun 2025 19:17:22 -0400 Subject: [PATCH 132/161] Replace facepair_t with std::optional This type seems to cover the intent more clearly than `std::pair`. --- src/_backend_agg.h | 47 ++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/src/_backend_agg.h b/src/_backend_agg.h index 6eb54e485e86..1ac3d4c06b13 100644 --- a/src/_backend_agg.h +++ b/src/_backend_agg.h @@ -11,6 +11,7 @@ #include #include #include +#include #include #include "agg_alpha_mask_u8.h" @@ -123,9 +124,6 @@ class RendererAgg typedef agg::renderer_base renderer_base_alpha_mask_type; typedef agg::renderer_scanline_aa_solid renderer_alpha_mask_type; - /* TODO: Remove facepair_t */ - typedef std::pair facepair_t; - RendererAgg(unsigned int width, unsigned int height, double dpi); virtual ~RendererAgg(); @@ -248,7 +246,7 @@ class RendererAgg bool render_clippath(mpl::PathIterator &clippath, const agg::trans_affine &clippath_trans, e_snap_mode snap_mode); template - void _draw_path(PathIteratorType &path, bool has_clippath, const facepair_t &face, GCAgg &gc); + void _draw_path(PathIteratorType &path, bool has_clippath, const std::optional &face, GCAgg &gc); template inline void -RendererAgg::_draw_path(path_t &path, bool has_clippath, const facepair_t &face, GCAgg &gc) +RendererAgg::_draw_path(path_t &path, bool has_clippath, const std::optional &face, GCAgg &gc) { typedef agg::conv_stroke stroke_t; typedef agg::conv_dash dash_t; @@ -306,7 +304,7 @@ RendererAgg::_draw_path(path_t &path, bool has_clippath, const facepair_t &face, typedef agg::renderer_scanline_bin_solid amask_bin_renderer_type; // Render face - if (face.first) { + if (face) { theRasterizer.add_path(path); if (gc.isaa) { @@ -314,10 +312,10 @@ RendererAgg::_draw_path(path_t &path, bool has_clippath, const facepair_t &face, pixfmt_amask_type pfa(pixFmt, alphaMask); amask_ren_type r(pfa); amask_aa_renderer_type ren(r); - ren.color(face.second); + ren.color(*face); agg::render_scanlines(theRasterizer, scanlineAlphaMask, ren); } else { - rendererAA.color(face.second); + rendererAA.color(*face); agg::render_scanlines(theRasterizer, slineP8, rendererAA); } } else { @@ -325,10 +323,10 @@ RendererAgg::_draw_path(path_t &path, bool has_clippath, const facepair_t &face, pixfmt_amask_type pfa(pixFmt, alphaMask); amask_ren_type r(pfa); amask_bin_renderer_type ren(r); - ren.color(face.second); + ren.color(*face); agg::render_scanlines(theRasterizer, scanlineAlphaMask, ren); } else { - rendererBin.color(face.second); + rendererBin.color(*face); agg::render_scanlines(theRasterizer, slineP8, rendererBin); } } @@ -458,7 +456,10 @@ RendererAgg::draw_path(GCAgg &gc, PathIterator &path, agg::trans_affine &trans, typedef agg::conv_curve curve_t; typedef Sketch sketch_t; - facepair_t face(color.a != 0.0, color); + std::optional face; + if (color.a != 0.0) { + face = color; + } theRasterizer.reset_clipping(); rendererBase.reset_clipping(true); @@ -467,7 +468,7 @@ RendererAgg::draw_path(GCAgg &gc, PathIterator &path, agg::trans_affine &trans, trans *= agg::trans_affine_scaling(1.0, -1.0); trans *= agg::trans_affine_translation(0.0, (double)height); - bool clip = !face.first && !gc.has_hatchpath(); + bool clip = !face && !gc.has_hatchpath(); bool simplify = path.should_simplify() && clip; double snapping_linewidth = points_to_pixels(gc.linewidth); if (gc.color.a == 0.0) { @@ -529,7 +530,10 @@ inline void RendererAgg::draw_markers(GCAgg &gc, curve_t path_curve(path_snapped); path_curve.rewind(0); - facepair_t face(color.a != 0.0, color); + std::optional face; + if (color.a != 0.0) { + face = color; + } // maxim's suggestions for cached scanlines agg::scanline_storage_aa8 scanlines; @@ -541,7 +545,7 @@ inline void RendererAgg::draw_markers(GCAgg &gc, try { std::vector fillBuffer; - if (face.first) { + if (face) { theRasterizer.add_path(marker_path_curve); agg::render_scanlines(theRasterizer, slineP8, scanlines); fillBuffer.resize(scanlines.byte_size()); @@ -605,8 +609,8 @@ inline void RendererAgg::draw_markers(GCAgg &gc, amask_ren_type r(pfa); amask_aa_renderer_type ren(r); - if (face.first) { - ren.color(face.second); + if (face) { + ren.color(*face); sa.init(fillBuffer.data(), fillBuffer.size(), x, y); agg::render_scanlines(sa, sl, ren); } @@ -633,8 +637,8 @@ inline void RendererAgg::draw_markers(GCAgg &gc, continue; } - if (face.first) { - rendererAA.color(face.second); + if (face) { + rendererAA.color(*face); sa.init(fillBuffer.data(), fillBuffer.size(), x, y); agg::render_scanlines(sa, sl, rendererAA); } @@ -936,10 +940,9 @@ inline void RendererAgg::_draw_path_collection_generic(GCAgg &gc, // Set some defaults, assuming no face or edge gc.linewidth = 0.0; - facepair_t face; - face.first = Nfacecolors != 0; + std::optional face; agg::trans_affine trans; - bool do_clip = !face.first && !gc.has_hatchpath(); + bool do_clip = Nfacecolors == 0 && !gc.has_hatchpath(); for (int i = 0; i < (int)N; ++i) { typename PathGenerator::path_iterator path = path_generator(i); @@ -970,7 +973,7 @@ inline void RendererAgg::_draw_path_collection_generic(GCAgg &gc, if (Nfacecolors) { int ic = i % Nfacecolors; - face.second = agg::rgba(facecolors(ic, 0), facecolors(ic, 1), facecolors(ic, 2), facecolors(ic, 3)); + face.emplace(facecolors(ic, 0), facecolors(ic, 1), facecolors(ic, 2), facecolors(ic, 3)); } if (Nedgecolors) { From e77c17fef43714decfb8e4108916d524e30d97fa Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Sun, 22 Jun 2025 23:11:56 +0200 Subject: [PATCH 133/161] Use collections.deque to store animation cache data. deques are exactly suited for the task at hand, and should be (here, marginally) more efficient than repeatedly slicing off the start of the list. Also drop unneeded reference to old_frame_seq (the iterator already keeps that data alive). --- lib/matplotlib/animation.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py index c6ff7702d992..8756cb0c1439 100644 --- a/lib/matplotlib/animation.py +++ b/lib/matplotlib/animation.py @@ -1,5 +1,6 @@ import abc import base64 +import collections import contextlib from io import BytesIO, TextIOWrapper import itertools @@ -1708,13 +1709,13 @@ def iter_frames(frames=frames): self._cache_frame_data = cache_frame_data # Needs to be initialized so the draw functions work without checking - self._save_seq = [] + self._save_seq = collections.deque([], self._save_count) super().__init__(fig, **kwargs) # Need to reset the saved seq, since right now it will contain data # for a single frame from init, which is not what we want. - self._save_seq = [] + self._save_seq.clear() def new_frame_seq(self): # Use the generating function to generate a new frame sequence @@ -1727,8 +1728,7 @@ def new_saved_frame_seq(self): if self._save_seq: # While iterating we are going to update _save_seq # so make a copy to safely iterate over - self._old_saved_seq = list(self._save_seq) - return iter(self._old_saved_seq) + return iter([*self._save_seq]) else: if self._save_count is None: frame_seq = self.new_frame_seq() @@ -1773,13 +1773,12 @@ def _init_draw(self): 'return a sequence of Artist objects.') for a in self._drawn_artists: a.set_animated(self._blit) - self._save_seq = [] + self._save_seq.clear() def _draw_frame(self, framedata): if self._cache_frame_data: # Save the data for potential saving of movies. self._save_seq.append(framedata) - self._save_seq = self._save_seq[-self._save_count:] # Call the func with framedata and args. If blitting is desired, # func needs to return a sequence of any artists that were modified. From 6e51bec39261675fcba9b697df4ac5b6c30ed796 Mon Sep 17 00:00:00 2001 From: Constantinos Menelaou <91343054+konmenel@users.noreply.github.com> Date: Tue, 24 Jun 2025 07:24:33 +0100 Subject: [PATCH 134/161] Support individual styling of major and minor grid through rcParams (#29481) * Possible fix for issue #13919 * fix flake warnings * Resolve suggested changes * Add new validators in stub file * make stub file arguments same as runtime * Add distinction for x and y axis in grid line options * fix flake8 * Add What's New note * Extend `_val_or_rc` to support multiply names `_val_or_rc` now accept multiple rc names and return val or the first non-None value in rcParams. Returns last rc name if all other are None. Also, simplified code in `Tick` for grid lines creatation * Fix linting for and _validate_linestyle_or_None to mypy allowlist * Remove validate linestyle functions from stubtest allow list * Revert change to just grid.major/minor distinction in rcParams * Update What's New note and reduced example * Add testing for `grid.major/minor.*` in rcParams * fix indentation and linting * Fix example description * Fix spelling * Fix type * Fix formatting Removed outer brackets * `validate_color_or_None` private and fix argument names * Fix validator name in stub file as well * correct validators for grid.*.color keys * Revert change in mypy-stubtest-allowlist.txt --------- Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> --- .../new_rcparams_grid_options.rst | 33 +++++++++++++++++++ lib/matplotlib/__init__.py | 13 ++++++-- lib/matplotlib/axis.py | 25 +++++++++++--- lib/matplotlib/mpl-data/matplotlibrc | 10 ++++++ lib/matplotlib/rcsetup.py | 23 +++++++++++++ lib/matplotlib/rcsetup.pyi | 2 ++ lib/matplotlib/tests/test_axis.py | 28 ++++++++++++++++ 7 files changed, 127 insertions(+), 7 deletions(-) create mode 100644 doc/users/next_whats_new/new_rcparams_grid_options.rst diff --git a/doc/users/next_whats_new/new_rcparams_grid_options.rst b/doc/users/next_whats_new/new_rcparams_grid_options.rst new file mode 100644 index 000000000000..c2c0455eecbb --- /dev/null +++ b/doc/users/next_whats_new/new_rcparams_grid_options.rst @@ -0,0 +1,33 @@ +Separate styling options for major/minor grid line in rcParams +-------------------------------------------------------------- + +Using :rc:`grid.major.*` or :rc:`grid.minor.*` will overwrite the value in +:rc:`grid.*` for the major and minor gridlines, respectively. + +.. plot:: + :include-source: true + :alt: Modifying the gridlines using the new options `rcParams` + + import matplotlib as mpl + import matplotlib.pyplot as plt + + + # Set visibility for major and minor gridlines + mpl.rcParams["axes.grid"] = True + mpl.rcParams["ytick.minor.visible"] = True + mpl.rcParams["xtick.minor.visible"] = True + mpl.rcParams["axes.grid.which"] = "both" + + # Using old values to set both major and minor properties + mpl.rcParams["grid.color"] = "red" + mpl.rcParams["grid.linewidth"] = 1 + + # Overwrite some values for major and minor separately + mpl.rcParams["grid.major.color"] = "black" + mpl.rcParams["grid.major.linewidth"] = 2 + mpl.rcParams["grid.minor.linestyle"] = ":" + mpl.rcParams["grid.minor.alpha"] = 0.6 + + plt.plot([0, 1], [0, 1]) + + plt.show() diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py index 9abc6c5a84dd..8ffd002d43bc 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -1309,11 +1309,18 @@ def is_interactive(): return rcParams['interactive'] -def _val_or_rc(val, rc_name): +def _val_or_rc(val, *rc_names): """ - If *val* is None, return ``mpl.rcParams[rc_name]``, otherwise return val. + If *val* is None, the first not-None value in ``mpl.rcParams[rc_names[i]]``. + If all are None returns ``mpl.rcParams[rc_names[-1]]``. """ - return val if val is not None else rcParams[rc_name] + if val is not None: + return val + + for rc_name in rc_names[:-1]: + if rcParams[rc_name] is not None: + return rcParams[rc_name] + return rcParams[rc_names[-1]] def _init_tests(): diff --git a/lib/matplotlib/axis.py b/lib/matplotlib/axis.py index 19096fc29d3e..fafdf92017f2 100644 --- a/lib/matplotlib/axis.py +++ b/lib/matplotlib/axis.py @@ -125,16 +125,33 @@ def __init__( zorder = mlines.Line2D.zorder self._zorder = zorder - grid_color = mpl._val_or_rc(grid_color, "grid.color") - grid_linestyle = mpl._val_or_rc(grid_linestyle, "grid.linestyle") - grid_linewidth = mpl._val_or_rc(grid_linewidth, "grid.linewidth") + grid_color = mpl._val_or_rc( + grid_color, + f"grid.{major_minor}.color", + "grid.color", + ) + grid_linestyle = mpl._val_or_rc( + grid_linestyle, + f"grid.{major_minor}.linestyle", + "grid.linestyle", + ) + grid_linewidth = mpl._val_or_rc( + grid_linewidth, + f"grid.{major_minor}.linewidth", + "grid.linewidth", + ) if grid_alpha is None and not mcolors._has_alpha_channel(grid_color): # alpha precedence: kwarg > color alpha > rcParams['grid.alpha'] # Note: only resolve to rcParams if the color does not have alpha # otherwise `grid(color=(1, 1, 1, 0.5))` would work like # grid(color=(1, 1, 1, 0.5), alpha=rcParams['grid.alpha']) # so the that the rcParams default would override color alpha. - grid_alpha = mpl.rcParams["grid.alpha"] + grid_alpha = mpl._val_or_rc( + # grid_alpha is None so we can use the first key + mpl.rcParams[f"grid.{major_minor}.alpha"], + "grid.alpha", + ) + grid_kw = {k[5:]: v for k, v in kwargs.items() if k != "rotation_mode"} self.tick1line = mlines.Line2D( diff --git a/lib/matplotlib/mpl-data/matplotlibrc b/lib/matplotlib/mpl-data/matplotlibrc index 780dcd377041..ec649560ba3b 100644 --- a/lib/matplotlib/mpl-data/matplotlibrc +++ b/lib/matplotlib/mpl-data/matplotlibrc @@ -543,6 +543,16 @@ #grid.linewidth: 0.8 # in points #grid.alpha: 1.0 # transparency, between 0.0 and 1.0 +#grid.major.color: None # If None defaults to grid.color +#grid.major.linestyle: None # If None defaults to grid.linestyle +#grid.major.linewidth: None # If None defaults to grid.linewidth +#grid.major.alpha: None # If None defaults to grid.alpha + +#grid.minor.color: None # If None defaults to grid.color +#grid.minor.linestyle: None # If None defaults to grid.linestyle +#grid.minor.linewidth: None # If None defaults to grid.linewidth +#grid.minor.alpha: None # If None defaults to grid.alpha + ## *************************************************************************** ## * LEGEND * diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py index 02e3601ff4c2..80d25659888e 100644 --- a/lib/matplotlib/rcsetup.py +++ b/lib/matplotlib/rcsetup.py @@ -361,6 +361,12 @@ def validate_color(s): raise ValueError(f'{s!r} does not look like a color arg') +def _validate_color_or_None(s): + if s is None or cbook._str_equal(s, "None"): + return None + return validate_color(s) + + validate_colorlist = _listify_validator( validate_color, allow_stringlist=True, doc='return a list of colorspecs') @@ -515,6 +521,13 @@ def _is_iterable_not_string_like(x): raise ValueError(f"linestyle {ls!r} is not a valid on-off ink sequence.") +def _validate_linestyle_or_None(s): + if s is None or cbook._str_equal(s, "None"): + return None + + return _validate_linestyle(s) + + validate_fillstyle = ValidateInStrings( 'markers.fillstyle', ['full', 'left', 'right', 'bottom', 'top', 'none']) @@ -1242,6 +1255,16 @@ def _convert_validator_spec(key, conv): "grid.linewidth": validate_float, # in points "grid.alpha": validate_float, + "grid.major.color": _validate_color_or_None, # grid color + "grid.major.linestyle": _validate_linestyle_or_None, # solid + "grid.major.linewidth": validate_float_or_None, # in points + "grid.major.alpha": validate_float_or_None, + + "grid.minor.color": _validate_color_or_None, # grid color + "grid.minor.linestyle": _validate_linestyle_or_None, # solid + "grid.minor.linewidth": validate_float_or_None, # in points + "grid.minor.alpha": validate_float_or_None, + ## figure props # figure title "figure.titlesize": validate_fontsize, diff --git a/lib/matplotlib/rcsetup.pyi b/lib/matplotlib/rcsetup.pyi index eb1d7c9f3a33..c6611845723d 100644 --- a/lib/matplotlib/rcsetup.pyi +++ b/lib/matplotlib/rcsetup.pyi @@ -48,6 +48,7 @@ def validate_color_or_auto(s: Any) -> ColorType | Literal["auto"]: ... def _validate_color_or_edge(s: Any) -> ColorType | Literal["edge"]: ... def validate_color_for_prop_cycle(s: Any) -> ColorType: ... def validate_color(s: Any) -> ColorType: ... +def _validate_color_or_None(s: Any) -> ColorType | None: ... def validate_colorlist(s: Any) -> list[ColorType]: ... def _validate_color_or_linecolor( s: Any, @@ -137,6 +138,7 @@ def validate_fillstylelist( ) -> list[Literal["full", "left", "right", "bottom", "top", "none"]]: ... def validate_markevery(s: Any) -> MarkEveryType: ... def _validate_linestyle(s: Any) -> LineStyleType: ... +def _validate_linestyle_or_None(s: Any) -> LineStyleType | None: ... def validate_markeverylist(s: Any) -> list[MarkEveryType]: ... def validate_bbox(s: Any) -> Literal["tight", "standard"] | None: ... def validate_sketch(s: Any) -> None | tuple[float, float, float]: ... diff --git a/lib/matplotlib/tests/test_axis.py b/lib/matplotlib/tests/test_axis.py index 5cb3ff4d3856..97884a33208f 100644 --- a/lib/matplotlib/tests/test_axis.py +++ b/lib/matplotlib/tests/test_axis.py @@ -67,3 +67,31 @@ def test_get_tick_position_tick_params(): right=True, labelright=True, left=False, labelleft=False) assert ax.xaxis.get_ticks_position() == "top" assert ax.yaxis.get_ticks_position() == "right" + + +def test_grid_rcparams(): + """Tests that `grid.major/minor.*` overwrites `grid.*` in rcParams.""" + plt.rcParams.update({ + "axes.grid": True, "axes.grid.which": "both", + "ytick.minor.visible": True, "xtick.minor.visible": True, + }) + def_linewidth = plt.rcParams["grid.linewidth"] + def_linestyle = plt.rcParams["grid.linestyle"] + def_alpha = plt.rcParams["grid.alpha"] + + plt.rcParams.update({ + "grid.color": "gray", "grid.minor.color": "red", + "grid.major.linestyle": ":", "grid.major.linewidth": 2, + "grid.minor.alpha": 0.6, + }) + _, ax = plt.subplots() + ax.plot([0, 1]) + + assert ax.xaxis.get_major_ticks()[0].gridline.get_color() == "gray" + assert ax.xaxis.get_minor_ticks()[0].gridline.get_color() == "red" + assert ax.xaxis.get_major_ticks()[0].gridline.get_linewidth() == 2 + assert ax.xaxis.get_minor_ticks()[0].gridline.get_linewidth() == def_linewidth + assert ax.xaxis.get_major_ticks()[0].gridline.get_linestyle() == ":" + assert ax.xaxis.get_minor_ticks()[0].gridline.get_linestyle() == def_linestyle + assert ax.xaxis.get_major_ticks()[0].gridline.get_alpha() == def_alpha + assert ax.xaxis.get_minor_ticks()[0].gridline.get_alpha() == 0.6 From e3c7a64a350bc575c6d3bf203929c9d666e644da Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Mon, 19 May 2025 15:07:52 +0200 Subject: [PATCH 135/161] Simplify dviFontInfo layout in backend pdf. - Use a simpler deterministic mapping of tex font names to pdf embedding names. - Only resolve the required attributes when needed (in _embedTeXFont), which avoids e.g. having to carry around and worry about attributes with different names (e.g. "encoding" vs. "encodingfile"). --- lib/matplotlib/backends/backend_pdf.py | 89 +++++++++++++------------- 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py index 6d6bea585ff3..f20bdffd4a3a 100644 --- a/lib/matplotlib/backends/backend_pdf.py +++ b/lib/matplotlib/backends/backend_pdf.py @@ -721,7 +721,7 @@ def __init__(self, filename, metadata=None): self._internal_font_seq = (Name(f'F{i}') for i in itertools.count(1)) self._fontNames = {} # maps filenames to internal font names - self._dviFontInfo = {} # maps dvi font names to embedding information + self._dviFontInfo = {} # maps pdf names to dvifonts self._character_tracker = _backend_pdf_ps.CharacterTracker() self.alphaStates = {} # maps alpha values to graphics state objects @@ -764,9 +764,30 @@ def __init__(self, filename, metadata=None): self.writeObject(self.resourceObject, resources) fontNames = _api.deprecated("3.11")(property(lambda self: self._fontNames)) - dviFontInfo = _api.deprecated("3.11")(property(lambda self: self._dviFontInfo)) type1Descriptors = _api.deprecated("3.11")(property(lambda _: {})) + @_api.deprecated("3.11") + @property + def dviFontInfo(self): + d = {} + tex_font_map = dviread.PsfontsMap(dviread.find_tex_file('pdftex.map')) + for pdfname, dvifont in self._dviFontInfo.items(): + psfont = tex_font_map[dvifont.texname] + if psfont.filename is None: + raise ValueError( + "No usable font file found for {} (TeX: {}); " + "the font may lack a Type-1 version" + .format(psfont.psname, dvifont.texname)) + d[dvifont.texname] = types.SimpleNamespace( + dvifont=dvifont, + pdfname=pdfname, + fontfile=psfont.filename, + basefont=psfont.psname, + encodingfile=psfont.encoding, + effects=psfont.effects, + ) + return d + def newPage(self, width, height): self.endStream() @@ -938,39 +959,19 @@ def fontName(self, fontprop): def dviFontName(self, dvifont): """ Given a dvi font object, return a name suitable for Op.selectfont. - This registers the font information internally (in ``_dviFontInfo``) if - not yet registered. - """ - - dvi_info = self._dviFontInfo.get(dvifont.texname) - if dvi_info is not None: - return dvi_info.pdfname - - tex_font_map = dviread.PsfontsMap(dviread.find_tex_file('pdftex.map')) - psfont = tex_font_map[dvifont.texname] - if psfont.filename is None: - raise ValueError( - "No usable font file found for {} (TeX: {}); " - "the font may lack a Type-1 version" - .format(psfont.psname, dvifont.texname)) - pdfname = next(self._internal_font_seq) + Register the font internally (in ``_dviFontInfo``) if not yet registered. + """ + pdfname = Name(f"F-{dvifont.texname.decode('ascii')}") _log.debug('Assigning font %s = %s (dvi)', pdfname, dvifont.texname) - self._dviFontInfo[dvifont.texname] = types.SimpleNamespace( - dvifont=dvifont, - pdfname=pdfname, - fontfile=psfont.filename, - basefont=psfont.psname, - encodingfile=psfont.encoding, - effects=psfont.effects) - return pdfname + self._dviFontInfo[pdfname] = dvifont + return Name(pdfname) def writeFonts(self): fonts = {} - for dviname, info in sorted(self._dviFontInfo.items()): - Fx = info.pdfname - _log.debug('Embedding Type-1 font %s from dvi.', dviname) - fonts[Fx] = self._embedTeXFont(info) + for pdfname, dvifont in sorted(self._dviFontInfo.items()): + _log.debug('Embedding Type-1 font %s from dvi.', dvifont.texname) + fonts[pdfname] = self._embedTeXFont(dvifont) for filename in sorted(self._fontNames): Fx = self._fontNames[filename] _log.debug('Embedding font %s.', filename) @@ -998,9 +999,14 @@ def _write_afm_font(self, filename): self.writeObject(fontdictObject, fontdict) return fontdictObject - def _embedTeXFont(self, fontinfo): - _log.debug('Embedding TeX font %s - fontinfo=%s', - fontinfo.dvifont.texname, fontinfo.__dict__) + def _embedTeXFont(self, dvifont): + tex_font_map = dviread.PsfontsMap(dviread.find_tex_file('pdftex.map')) + psfont = tex_font_map[dvifont.texname] + if psfont.filename is None: + raise ValueError( + "No usable font file found for {} (TeX: {}); " + "the font may lack a Type-1 version" + .format(psfont.psname, dvifont.texname)) # The font dictionary is the top-level object describing a font fontdictObject = self.reserveObject('font dictionary') @@ -1010,17 +1016,17 @@ def _embedTeXFont(self, fontinfo): } # Read the font file and apply any encoding changes and effects - t1font = _type1font.Type1Font(fontinfo.fontfile) - if fontinfo.encodingfile is not None: + t1font = _type1font.Type1Font(psfont.filename) + if psfont.encoding is not None: t1font = t1font.with_encoding( - {i: c for i, c in enumerate(dviread._parse_enc(fontinfo.encodingfile))} + {i: c for i, c in enumerate(dviread._parse_enc(psfont.encoding))} ) - if fontinfo.effects: - t1font = t1font.transform(fontinfo.effects) + if psfont.effects: + t1font = t1font.transform(psfont.effects) # Reduce the font to only the glyphs used in the document, get the encoding # for that subset, and compute various properties based on the encoding. - chars = frozenset(self._character_tracker.used[fontinfo.dvifont.fname]) + chars = frozenset(self._character_tracker.used[dvifont.fname]) t1font = t1font.subset(chars, self._get_subset_prefix(chars)) fontdict['BaseFont'] = Name(t1font.prop['FontName']) # createType1Descriptor writes the font data as a side effect @@ -1031,17 +1037,15 @@ def _embedTeXFont(self, fontinfo): lc = fontdict['LastChar'] = max(encoding.keys(), default=255) # Convert glyph widths from TeX 12.20 fixed point to 1/1000 text space units - tfm = fontinfo.dvifont._tfm + tfm = dvifont._tfm widths = [(1000 * metrics.tex_width) >> 20 if (metrics := tfm.get_metrics(char)) else 0 for char in range(fc, lc + 1)] fontdict['Widths'] = widthsObject = self.reserveObject('glyph widths') self.writeObject(widthsObject, widths) - self.writeObject(fontdictObject, fontdict) return fontdictObject - def _generate_encoding(self, encoding): prev = -2 result = [] @@ -1055,7 +1059,6 @@ def _generate_encoding(self, encoding): 'Differences': result } - @_api.delete_parameter("3.11", "fontfile") def createType1Descriptor(self, t1font, fontfile=None): # Create and write the font descriptor and the font file From c7edce3820d918474fadb42e55818d1c40be1979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Sat, 21 Jun 2025 09:56:00 +0300 Subject: [PATCH 136/161] Implement Path.__deepcopy__ avoiding infinite recursion To deep copy an object without calling deepcopy on the object itself, create a new object of the correct class and iterate calling deepcopy on its __dict__. Closes #29157 without relying on private CPython methods. Does not fix the other issue with TransformNode.__copy__. Co-authored-by: Serhiy Storchaka --- lib/matplotlib/path.py | 26 ++++++++++++++++++--- lib/matplotlib/path.pyi | 4 ++-- lib/matplotlib/tests/test_path.py | 38 +++++++++++++++++++++++++++++-- 3 files changed, 61 insertions(+), 7 deletions(-) diff --git a/lib/matplotlib/path.py b/lib/matplotlib/path.py index a021706fb1e5..f65ade669167 100644 --- a/lib/matplotlib/path.py +++ b/lib/matplotlib/path.py @@ -275,17 +275,37 @@ def copy(self): """ return copy.copy(self) - def __deepcopy__(self, memo=None): + def __deepcopy__(self, memo): """ Return a deepcopy of the `Path`. The `Path` will not be readonly, even if the source `Path` is. """ # Deepcopying arrays (vertices, codes) strips the writeable=False flag. - p = copy.deepcopy(super(), memo) + cls = type(self) + memo[id(self)] = p = cls.__new__(cls) + + for k, v in self.__dict__.items(): + setattr(p, k, copy.deepcopy(v, memo)) + p._readonly = False return p - deepcopy = __deepcopy__ + def deepcopy(self, memo=None): + """ + Return a deep copy of the `Path`. The `Path` will not be readonly, + even if the source `Path` is. + + Parameters + ---------- + memo : dict, optional + A dictionary to use for memoizing, passed to `copy.deepcopy`. + + Returns + ------- + Path + A deep copy of the `Path`, but not readonly. + """ + return copy.deepcopy(self, memo) @classmethod def make_compound_path_from_polys(cls, XY): diff --git a/lib/matplotlib/path.pyi b/lib/matplotlib/path.pyi index 464fc6d9a912..8a5a5c03792e 100644 --- a/lib/matplotlib/path.pyi +++ b/lib/matplotlib/path.pyi @@ -44,8 +44,8 @@ class Path: @property def readonly(self) -> bool: ... def copy(self) -> Path: ... - def __deepcopy__(self, memo: dict[int, Any] | None = ...) -> Path: ... - deepcopy = __deepcopy__ + def __deepcopy__(self, memo: dict[int, Any]) -> Path: ... + def deepcopy(self, memo: dict[int, Any] | None = None) -> Path: ... @classmethod def make_compound_path_from_polys(cls, XY: ArrayLike) -> Path: ... diff --git a/lib/matplotlib/tests/test_path.py b/lib/matplotlib/tests/test_path.py index d4dc0141e63b..5dde1d876b04 100644 --- a/lib/matplotlib/tests/test_path.py +++ b/lib/matplotlib/tests/test_path.py @@ -355,15 +355,49 @@ def test_path_deepcopy(): # Should not raise any error verts = [[0, 0], [1, 1]] codes = [Path.MOVETO, Path.LINETO] - path1 = Path(verts) - path2 = Path(verts, codes) + path1 = Path(verts, readonly=True) + path2 = Path(verts, codes, readonly=True) path1_copy = path1.deepcopy() path2_copy = path2.deepcopy() assert path1 is not path1_copy assert path1.vertices is not path1_copy.vertices + assert np.all(path1.vertices == path1_copy.vertices) + assert path1.readonly + assert not path1_copy.readonly assert path2 is not path2_copy assert path2.vertices is not path2_copy.vertices + assert np.all(path2.vertices == path2_copy.vertices) assert path2.codes is not path2_copy.codes + assert all(path2.codes == path2_copy.codes) + assert path2.readonly + assert not path2_copy.readonly + + +def test_path_deepcopy_cycle(): + class PathWithCycle(Path): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.x = self + + p = PathWithCycle([[0, 0], [1, 1]], readonly=True) + p_copy = p.deepcopy() + assert p_copy is not p + assert p.readonly + assert not p_copy.readonly + assert p_copy.x is p_copy + + class PathWithCycle2(Path): + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + self.x = [self] * 2 + + p2 = PathWithCycle2([[0, 0], [1, 1]], readonly=True) + p2_copy = p2.deepcopy() + assert p2_copy is not p2 + assert p2.readonly + assert not p2_copy.readonly + assert p2_copy.x[0] is p2_copy + assert p2_copy.x[1] is p2_copy def test_path_shallowcopy(): From b20cf20024a5836e06e38f58bc4e88f3caec5423 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Tue, 24 Jun 2025 07:40:20 +0300 Subject: [PATCH 137/161] Compare arrays with assert_array_equal Co-authored-by: Elliott Sales de Andrade --- lib/matplotlib/tests/test_path.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/matplotlib/tests/test_path.py b/lib/matplotlib/tests/test_path.py index 5dde1d876b04..a61f01c0d48a 100644 --- a/lib/matplotlib/tests/test_path.py +++ b/lib/matplotlib/tests/test_path.py @@ -361,14 +361,14 @@ def test_path_deepcopy(): path2_copy = path2.deepcopy() assert path1 is not path1_copy assert path1.vertices is not path1_copy.vertices - assert np.all(path1.vertices == path1_copy.vertices) + assert_array_equal(path1.vertices, path1_copy.vertices) assert path1.readonly assert not path1_copy.readonly assert path2 is not path2_copy assert path2.vertices is not path2_copy.vertices - assert np.all(path2.vertices == path2_copy.vertices) + assert_array_equal(path2.vertices, path2_copy.vertices) assert path2.codes is not path2_copy.codes - assert all(path2.codes == path2_copy.codes) + assert_array_equal(path2.codes, path2_copy.codes) assert path2.readonly assert not path2_copy.readonly From 5c7c91542127adf03fa2f401dcb1d3c38b9a9a9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Sat, 21 Jun 2025 17:18:38 +0300 Subject: [PATCH 138/161] Fix TransformNode.__copy__ without calling copy.copy --- lib/matplotlib/transforms.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py index 7228f05bcf9e..350113c56170 100644 --- a/lib/matplotlib/transforms.py +++ b/lib/matplotlib/transforms.py @@ -35,7 +35,6 @@ # `np.minimum` instead of the builtin `min`, and likewise for `max`. This is # done so that `nan`s are propagated, instead of being silently dropped. -import copy import functools import itertools import textwrap @@ -139,7 +138,9 @@ def __setstate__(self, data_dict): for k, v in self._parents.items() if v is not None} def __copy__(self): - other = copy.copy(super()) + cls = type(self) + other = cls.__new__(cls) + other.__dict__.update(self.__dict__) # If `c = a + b; a1 = copy(a)`, then modifications to `a1` do not # propagate back to `c`, i.e. we need to clear the parents of `a1`. other._parents = {} From 4ab1ab55a7bcfedb59ce4d5e433a58e0d4e5813c Mon Sep 17 00:00:00 2001 From: Tingwei Zhu <852445892@qq.com> Date: Wed, 25 Jun 2025 14:24:10 +0800 Subject: [PATCH 139/161] Update deprecations.rst --- doc/api/prev_api_changes/api_changes_3.5.0/deprecations.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/prev_api_changes/api_changes_3.5.0/deprecations.rst b/doc/api/prev_api_changes/api_changes_3.5.0/deprecations.rst index 05f42035f1ac..04836687f76a 100644 --- a/doc/api/prev_api_changes/api_changes_3.5.0/deprecations.rst +++ b/doc/api/prev_api_changes/api_changes_3.5.0/deprecations.rst @@ -282,7 +282,7 @@ Miscellaneous deprecations - The *format* parameter of ``dviread.find_tex_file`` is deprecated (with no replacement). - ``FancyArrowPatch.get_path_in_displaycoord`` and - ``ConnectionPath.get_path_in_displaycoord`` are deprecated. The path in + ``ConnectionPatch.get_path_in_displaycoord`` are deprecated. The path in display coordinates can still be obtained, as for other patches, using ``patch.get_transform().transform_path(patch.get_path())``. - The ``font_manager.win32InstalledFonts`` and From dd03655e9fda05dc365960047f36ff852b859cf9 Mon Sep 17 00:00:00 2001 From: Tingwei Zhu <852445892@qq.com> Date: Wed, 25 Jun 2025 14:24:48 +0800 Subject: [PATCH 140/161] Update removals.rst --- doc/api/prev_api_changes/api_changes_3.7.0/removals.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/prev_api_changes/api_changes_3.7.0/removals.rst b/doc/api/prev_api_changes/api_changes_3.7.0/removals.rst index 03239be31057..56b3ad5c253e 100644 --- a/doc/api/prev_api_changes/api_changes_3.7.0/removals.rst +++ b/doc/api/prev_api_changes/api_changes_3.7.0/removals.rst @@ -323,7 +323,7 @@ Miscellaneous removals - The *format* parameter of ``dviread.find_tex_file`` is removed (with no replacement). - ``FancyArrowPatch.get_path_in_displaycoord`` and - ``ConnectionPath.get_path_in_displaycoord`` are removed. The path in + ``ConnectionPatch.get_path_in_displaycoord`` are removed. The path in display coordinates can still be obtained, as for other patches, using ``patch.get_transform().transform_path(patch.get_path())``. - The ``font_manager.win32InstalledFonts`` and From 3ea5b633c38876dbe191b1959d49f71cf03b0442 Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Fri, 23 May 2025 11:42:06 +0200 Subject: [PATCH 141/161] Fix label_outer in the presence of colorbars. The subgridspec to be considered should be the one containing both the axes and the colorbar, not the sub-subgridspec of just the axes. --- lib/matplotlib/axes/_base.py | 19 +++++++++++++++---- lib/matplotlib/colorbar.py | 4 ++-- lib/matplotlib/tests/test_subplots.py | 10 ++++++++-- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py index 1ce205ede613..87d42b4d3014 100644 --- a/lib/matplotlib/axes/_base.py +++ b/lib/matplotlib/axes/_base.py @@ -4749,14 +4749,25 @@ def label_outer(self, remove_inner_ticks=False): self._label_outer_yaxis(skip_non_rectangular_axes=False, remove_inner_ticks=remove_inner_ticks) + def _get_subplotspec_with_optional_colorbar(self): + """ + Return the subplotspec for this Axes, except that if this Axes has been + moved to a subgridspec to make room for a colorbar, then return the + subplotspec that encloses both this Axes and the colorbar Axes. + """ + ss = self.get_subplotspec() + if any(cax.get_subplotspec() for cax in self._colorbars): + ss = ss.get_gridspec()._subplot_spec + return ss + def _label_outer_xaxis(self, *, skip_non_rectangular_axes, remove_inner_ticks=False): # see documentation in label_outer. if skip_non_rectangular_axes and not isinstance(self.patch, mpl.patches.Rectangle): return - ss = self.get_subplotspec() - if not ss: + ss = self._get_subplotspec_with_optional_colorbar() + if ss is None: return label_position = self.xaxis.get_label_position() if not ss.is_first_row(): # Remove top label/ticklabels/offsettext. @@ -4782,8 +4793,8 @@ def _label_outer_yaxis(self, *, skip_non_rectangular_axes, if skip_non_rectangular_axes and not isinstance(self.patch, mpl.patches.Rectangle): return - ss = self.get_subplotspec() - if not ss: + ss = self._get_subplotspec_with_optional_colorbar() + if ss is None: return label_position = self.yaxis.get_label_position() if not ss.is_first_col(): # Remove left label/ticklabels/offsettext. diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py index 19bdbe605d88..4348f02cfc34 100644 --- a/lib/matplotlib/colorbar.py +++ b/lib/matplotlib/colorbar.py @@ -1455,8 +1455,7 @@ def make_axes(parents, location=None, orientation=None, fraction=0.15, cax = fig.add_axes(pbcb, label="") for a in parents: - # tell the parent it has a colorbar - a._colorbars += [cax] + a._colorbars.append(cax) # tell the parent it has a colorbar cax._colorbar_info = dict( parents=parents, location=location, @@ -1549,6 +1548,7 @@ def make_axes_gridspec(parent, *, location=None, orientation=None, fig = parent.get_figure() cax = fig.add_subplot(ss_cb, label="") + parent._colorbars.append(cax) # tell the parent it has a colorbar cax.set_anchor(anchor) cax.set_box_aspect(aspect) cax.set_aspect('auto') diff --git a/lib/matplotlib/tests/test_subplots.py b/lib/matplotlib/tests/test_subplots.py index a899110ac77a..0f00a88aa72d 100644 --- a/lib/matplotlib/tests/test_subplots.py +++ b/lib/matplotlib/tests/test_subplots.py @@ -4,6 +4,7 @@ import numpy as np import pytest +import matplotlib as mpl from matplotlib.axes import Axes, SubplotBase import matplotlib.pyplot as plt from matplotlib.testing.decorators import check_figures_equal, image_comparison @@ -111,10 +112,15 @@ def test_shared(): @pytest.mark.parametrize('remove_ticks', [True, False]) -def test_label_outer(remove_ticks): - f, axs = plt.subplots(2, 2, sharex=True, sharey=True) +@pytest.mark.parametrize('layout_engine', ['none', 'tight', 'constrained']) +@pytest.mark.parametrize('with_colorbar', [True, False]) +def test_label_outer(remove_ticks, layout_engine, with_colorbar): + fig = plt.figure(layout=layout_engine) + axs = fig.subplots(2, 2, sharex=True, sharey=True) for ax in axs.flat: ax.set(xlabel="foo", ylabel="bar") + if with_colorbar: + fig.colorbar(mpl.cm.ScalarMappable(), ax=ax) ax.label_outer(remove_inner_ticks=remove_ticks) check_ticklabel_visible( axs.flat, [False, False, True, True], [True, False, True, False]) From 257430efe5a9d6b97fa00200c73cddf1ea9ec861 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Fri, 20 Jun 2025 05:15:23 -0400 Subject: [PATCH 142/161] ci: Enable wheel builds on Python 3.14 This should only end up on the nightly wheel upload for now. Also, re-enable testing in places where Pillow wheels were previously missing, but are now available. --- .github/workflows/cibuildwheel.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index 57f1c71c5047..fececb0dfc40 100644 --- a/.github/workflows/cibuildwheel.yml +++ b/.github/workflows/cibuildwheel.yml @@ -140,6 +140,20 @@ jobs: name: cibw-sdist path: dist/ + - name: Build wheels for CPython 3.14 + uses: pypa/cibuildwheel@5f22145df44122af0f5a201f93cf0207171beca7 # v3.0.0 + with: + package-dir: dist/${{ needs.build_sdist.outputs.SDIST_NAME }} + env: + CIBW_BUILD: "cp314-* cp314t-*" + CIBW_ENABLE: "cpython-freethreading cpython-prerelease" + CIBW_ARCHS: ${{ matrix.cibw_archs }} + CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28 + CIBW_BEFORE_TEST: >- + python -m pip install + --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple + --upgrade --pre --only-binary=:all: contourpy numpy pillow + - name: Build wheels for CPython 3.13 uses: pypa/cibuildwheel@5f22145df44122af0f5a201f93cf0207171beca7 # v3.0.0 with: @@ -147,8 +161,6 @@ jobs: env: CIBW_BUILD: "cp313-* cp313t-*" CIBW_ENABLE: cpython-freethreading - # No free-threading wheels available for aarch64 on Pillow. - CIBW_TEST_SKIP: "cp313t-manylinux_aarch64" CIBW_ARCHS: ${{ matrix.cibw_archs }} - name: Build wheels for CPython 3.12 @@ -167,7 +179,6 @@ jobs: CIBW_BUILD: "cp311-*" CIBW_ARCHS: ${{ matrix.cibw_archs }} - - name: Build wheels for PyPy uses: pypa/cibuildwheel@5f22145df44122af0f5a201f93cf0207171beca7 # v3.0.0 with: @@ -176,8 +187,6 @@ jobs: CIBW_BUILD: "pp311-*" CIBW_ARCHS: ${{ matrix.cibw_archs }} CIBW_ENABLE: pypy - # No wheels available for Pillow with pp311 yet. - CIBW_TEST_SKIP: "pp311*" if: matrix.cibw_archs != 'aarch64' && matrix.os != 'windows-latest' - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 From b06d1f4d8d7199746063b1ef0d1a1c37ccf48188 Mon Sep 17 00:00:00 2001 From: chrisjbillington Date: Thu, 26 Jun 2025 12:38:33 +1000 Subject: [PATCH 143/161] Clean up Qt socket notifier to avoid spurious interrupt handler calls Closes #29688 Objects without a parent are not necessarily cleaned up in `PyQt5/6` when their reference count reaches zero, and must be explicitly cleaned up with `deleteLater()` This prevents the notifier firing after the signal handling was supposed to have been reset to its previous state. Rather than have both `bakend_bases._allow_interrupt()` and `backend_qt._allow_interrupt_qt()` hold a reference to the notifier, we pass it to the backend-specific `handle_signint()` function for cleanup. Note the approach to cleaning up the notifier with `.deleteLater()` followed by `sendPostedEvents()` is the documented workaround for when immediate deletion is desired: https://doc.qt.io/qt-6/qobject.html#deleteLater This ensures the object is still deleted up even if the same event loop does not run again. --- lib/matplotlib/backend_bases.py | 10 ++++++---- lib/matplotlib/backends/backend_qt.py | 11 ++++++++--- src/_macosx.m | 4 ++-- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py index 527d8c010710..626852f2aa34 100644 --- a/lib/matplotlib/backend_bases.py +++ b/lib/matplotlib/backend_bases.py @@ -1619,7 +1619,8 @@ def _allow_interrupt(prepare_notifier, handle_sigint): If SIGINT was indeed caught, after exiting the on_signal() function the interpreter reacts to the signal according to the handler function which had been set up by a signal.signal() call; here, we arrange to call the - backend-specific *handle_sigint* function. Finally, we call the old SIGINT + backend-specific *handle_sigint* function, passing the notifier object + as returned by prepare_notifier(). Finally, we call the old SIGINT handler with the same arguments that were given to our custom handler. We do this only if the old handler for SIGINT was not None, which means @@ -1629,7 +1630,7 @@ def _allow_interrupt(prepare_notifier, handle_sigint): Parameters ---------- prepare_notifier : Callable[[socket.socket], object] - handle_sigint : Callable[[], object] + handle_sigint : Callable[[object], object] """ old_sigint_handler = signal.getsignal(signal.SIGINT) @@ -1645,9 +1646,10 @@ def _allow_interrupt(prepare_notifier, handle_sigint): notifier = prepare_notifier(rsock) def save_args_and_handle_sigint(*args): - nonlocal handler_args + nonlocal handler_args, notifier handler_args = args - handle_sigint() + handle_sigint(notifier) + notifier = None signal.signal(signal.SIGINT, save_args_and_handle_sigint) try: diff --git a/lib/matplotlib/backends/backend_qt.py b/lib/matplotlib/backends/backend_qt.py index 5cde4866cad7..9089e982cea6 100644 --- a/lib/matplotlib/backends/backend_qt.py +++ b/lib/matplotlib/backends/backend_qt.py @@ -169,9 +169,14 @@ def _may_clear_sock(): # be forgiving about reading an empty socket. pass - return sn # Actually keep the notifier alive. - - def handle_sigint(): + # We return the QSocketNotifier so that the caller holds a reference, and we + # also explicitly clean it up in handle_sigint(). Without doing both, deletion + # of the socket notifier can happen prematurely or not at all. + return sn + + def handle_sigint(sn): + sn.deleteLater() + QtCore.QCoreApplication.sendPostedEvents(sn, QtCore.QEvent.Type.DeferredDelete) if hasattr(qapp_or_eventloop, 'closeAllWindows'): qapp_or_eventloop.closeAllWindows() qapp_or_eventloop.quit() diff --git a/src/_macosx.m b/src/_macosx.m index aa2a6e68cda5..1372157bc80d 100755 --- a/src/_macosx.m +++ b/src/_macosx.m @@ -258,7 +258,7 @@ static void lazy_init(void) { } static PyObject* -stop(PyObject* self) +stop(PyObject* self, PyObject* _ /* ignored */) { stopWithEvent(); Py_RETURN_NONE; @@ -1863,7 +1863,7 @@ - (void)flagsChanged:(NSEvent *)event "written on the file descriptor given as argument.")}, {"stop", (PyCFunction)stop, - METH_NOARGS, + METH_VARARGS, PyDoc_STR("Stop the NSApp.")}, {"show", (PyCFunction)show, From c78c2f449669347842e000d03bc072806af198ea Mon Sep 17 00:00:00 2001 From: Vagner Messias <32200525+vagnermcj@users.noreply.github.com> Date: Thu, 26 Jun 2025 23:28:51 -0300 Subject: [PATCH 144/161] Refactoring: Removing axis parameter from scales (#29988) * Adding a decorator and Refactoring functions * Fixing Ruff Errors * Update scale.pyi * Adding new line to the end of scale.pyi * Update in docstring * Fixing Handle Function * Support optional axis in scales Updated my refactor based on the feedbacks received * Fixing ruff error * change in parameters and in decorator * parameter fix * minor change in pyi * Update lib/matplotlib/scale.py Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> * Update lib/matplotlib/scale.py Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> * Update lib/matplotlib/scale.py Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> * Update lib/matplotlib/scale.pyi Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> * Updating self and axis in pyi * returning scale_factory to default * Ruff checks * description fix * Update lib/matplotlib/scale.pyi Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> * Undoing Unrelated Modifications * fixing mypy tests * Update lib/matplotlib/scale.pyi Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> * keyword-argument suggestion Co-authored-by: Elliott Sales de Andrade * kwargs pop before function call Co-authored-by: Elliott Sales de Andrade --------- Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Co-authored-by: Elliott Sales de Andrade --- lib/matplotlib/scale.py | 63 +++++++++++++++++++++++++++++++++++++--- lib/matplotlib/scale.pyi | 13 ++++++--- 2 files changed, 68 insertions(+), 8 deletions(-) diff --git a/lib/matplotlib/scale.py b/lib/matplotlib/scale.py index 44fbe5209c4d..4517b8946b03 100644 --- a/lib/matplotlib/scale.py +++ b/lib/matplotlib/scale.py @@ -31,6 +31,7 @@ import inspect import textwrap +from functools import wraps import numpy as np @@ -103,6 +104,53 @@ def limit_range_for_scale(self, vmin, vmax, minpos): return vmin, vmax +def _make_axis_parameter_optional(init_func): + """ + Decorator to allow leaving out the *axis* parameter in scale constructors. + + This decorator ensures backward compatibility for scale classes that + previously required an *axis* parameter. It allows constructors to be + callerd with or without the *axis* parameter. + + For simplicity, this does not handle the case when *axis* + is passed as a keyword. However, + scanning GitHub, there's no evidence that that is used anywhere. + + Parameters + ---------- + init_func : callable + The original __init__ method of a scale class. + + Returns + ------- + callable + A wrapped version of *init_func* that handles the optional *axis*. + + Notes + ----- + If the wrapped constructor defines *axis* as its first argument, the + parameter is preserved when present. Otherwise, the value `None` is injected + as the first argument. + + Examples + -------- + >>> from matplotlib.scale import ScaleBase + >>> class CustomScale(ScaleBase): + ... @_make_axis_parameter_optional + ... def __init__(self, axis, custom_param=1): + ... self.custom_param = custom_param + """ + @wraps(init_func) + def wrapper(self, *args, **kwargs): + if args and isinstance(args[0], mpl.axis.Axis): + return init_func(self, *args, **kwargs) + else: + # Remove 'axis' from kwargs to avoid double assignment + axis = kwargs.pop('axis', None) + return init_func(self, axis, *args, **kwargs) + return wrapper + + class LinearScale(ScaleBase): """ The default linear scale. @@ -110,6 +158,7 @@ class LinearScale(ScaleBase): name = 'linear' + @_make_axis_parameter_optional def __init__(self, axis): # This method is present only to prevent inheritance of the base class' # constructor docstring, which would otherwise end up interpolated into @@ -180,6 +229,7 @@ class FuncScale(ScaleBase): name = 'function' + @_make_axis_parameter_optional def __init__(self, axis, functions): """ Parameters @@ -279,7 +329,8 @@ class LogScale(ScaleBase): """ name = 'log' - def __init__(self, axis, *, base=10, subs=None, nonpositive="clip"): + @_make_axis_parameter_optional + def __init__(self, axis=None, *, base=10, subs=None, nonpositive="clip"): """ Parameters ---------- @@ -330,6 +381,7 @@ class FuncScaleLog(LogScale): name = 'functionlog' + @_make_axis_parameter_optional def __init__(self, axis, functions, base=10): """ Parameters @@ -455,7 +507,8 @@ class SymmetricalLogScale(ScaleBase): """ name = 'symlog' - def __init__(self, axis, *, base=10, linthresh=2, subs=None, linscale=1): + @_make_axis_parameter_optional + def __init__(self, axis=None, *, base=10, linthresh=2, subs=None, linscale=1): self._transform = SymmetricalLogTransform(base, linthresh, linscale) self.subs = subs @@ -547,7 +600,8 @@ class AsinhScale(ScaleBase): 1024: (256, 512) } - def __init__(self, axis, *, linear_width=1.0, + @_make_axis_parameter_optional + def __init__(self, axis=None, *, linear_width=1.0, base=10, subs='auto', **kwargs): """ Parameters @@ -645,7 +699,8 @@ class LogitScale(ScaleBase): """ name = 'logit' - def __init__(self, axis, nonpositive='mask', *, + @_make_axis_parameter_optional + def __init__(self, axis=None, nonpositive='mask', *, one_half=r"\frac{1}{2}", use_overline=False): r""" Parameters diff --git a/lib/matplotlib/scale.pyi b/lib/matplotlib/scale.pyi index 7fec8e68cc5a..ba9f269b8c78 100644 --- a/lib/matplotlib/scale.pyi +++ b/lib/matplotlib/scale.pyi @@ -15,6 +15,10 @@ class ScaleBase: class LinearScale(ScaleBase): name: str + def __init__( + self, + axis: Axis | None, + ) -> None: ... class FuncTransform(Transform): input_dims: int @@ -57,7 +61,7 @@ class LogScale(ScaleBase): subs: Iterable[int] | None def __init__( self, - axis: Axis | None, + axis: Axis | None = ..., *, base: float = ..., subs: Iterable[int] | None = ..., @@ -104,7 +108,7 @@ class SymmetricalLogScale(ScaleBase): subs: Iterable[int] | None def __init__( self, - axis: Axis | None, + axis: Axis | None = ..., *, base: float = ..., linthresh: float = ..., @@ -138,7 +142,7 @@ class AsinhScale(ScaleBase): auto_tick_multipliers: dict[int, tuple[int, ...]] def __init__( self, - axis: Axis | None, + axis: Axis | None = ..., *, linear_width: float = ..., base: float = ..., @@ -165,7 +169,7 @@ class LogitScale(ScaleBase): name: str def __init__( self, - axis: Axis | None, + axis: Axis | None = ..., nonpositive: Literal["mask", "clip"] = ..., *, one_half: str = ..., @@ -176,3 +180,4 @@ class LogitScale(ScaleBase): def get_scale_names() -> list[str]: ... def scale_factory(scale: str, axis: Axis, **kwargs) -> ScaleBase: ... def register_scale(scale_class: type[ScaleBase]) -> None: ... +def _make_axis_parameter_optional(init_func: Callable[..., None]) -> Callable[..., None]: ... From ac863bc96a2b991fa4452a39b029feed0ccd88c4 Mon Sep 17 00:00:00 2001 From: DWesl <22566757+DWesl@users.noreply.github.com> Date: Fri, 27 Jun 2025 12:09:40 -0400 Subject: [PATCH 145/161] BUG: Include python-including headers first --- src/ft2font.cpp | 6 +++--- src/ft2font.h | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ft2font.cpp b/src/ft2font.cpp index bdfa2873ca80..da1bd19dca57 100644 --- a/src/ft2font.cpp +++ b/src/ft2font.cpp @@ -1,5 +1,8 @@ /* -*- mode: c++; c-basic-offset: 4 -*- */ +#include "ft2font.h" +#include "mplutils.h" + #include #include #include @@ -9,9 +12,6 @@ #include #include -#include "ft2font.h" -#include "mplutils.h" - #ifndef M_PI #define M_PI 3.14159265358979323846264338328 #endif diff --git a/src/ft2font.h b/src/ft2font.h index 8db0239ed4fd..6676a7dd4818 100644 --- a/src/ft2font.h +++ b/src/ft2font.h @@ -6,6 +6,9 @@ #ifndef MPL_FT2FONT_H #define MPL_FT2FONT_H +#include +#include + #include #include #include @@ -22,8 +25,6 @@ extern "C" { #include FT_TRUETYPE_TABLES_H } -#include -#include namespace py = pybind11; // By definition, FT_FIXED as 2 16bit values stored in a single long. From 4b03f0c99fc0de819a40def011d6f19fddc2b367 Mon Sep 17 00:00:00 2001 From: ZPyrolink <73246085+ZPyrolink@users.noreply.github.com> Date: Fri, 27 Jun 2025 20:30:44 +0200 Subject: [PATCH 146/161] Add explicit overloads for pyplot.{show,subplot} (#30202) * Create show overloads on pyplot.py (cherry picked from commit 1ff2bd2be6ab4610b9c59e5d44c44bdcdfda7241) * Create subplot overloads on pyplot.py (cherry picked from commit f4693e3c984f4775e29c3d10e48f58ae7de84e98) * Removed subplot(Axes) on overloads and docstring * Update show overloads * Correct mypy error * Add typing to overloaded copy of show * Revert superfluous changes --------- Co-authored-by: Corenthin ZOZOR --- lib/matplotlib/pyplot.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py index cf5c9b4b739f..d3da41ca9d5c 100644 --- a/lib/matplotlib/pyplot.py +++ b/lib/matplotlib/pyplot.py @@ -569,6 +569,14 @@ def draw_if_interactive(*args, **kwargs): return _get_backend_mod().draw_if_interactive(*args, **kwargs) +@overload +def show(*, block: bool, **kwargs) -> None: ... + + +@overload +def show(*args: Any, **kwargs: Any) -> None: ... + + # This function's signature is rewritten upon backend-load by switch_backend. def show(*args, **kwargs) -> None: """ @@ -1393,6 +1401,18 @@ def cla() -> None: ## More ways of creating Axes ## +@overload +def subplot(nrows: int, ncols: int, index: int, /, **kwargs): ... + + +@overload +def subplot(pos: int | SubplotSpec, /, **kwargs): ... + + +@overload +def subplot(**kwargs): ... + + @_docstring.interpd def subplot(*args, **kwargs) -> Axes: """ @@ -1406,7 +1426,6 @@ def subplot(*args, **kwargs) -> Axes: subplot(nrows, ncols, index, **kwargs) subplot(pos, **kwargs) subplot(**kwargs) - subplot(ax) Parameters ---------- From e36bffb3f7f866506f2bb8b99b30f50667617ea0 Mon Sep 17 00:00:00 2001 From: ZPyrolink <73246085+ZPyrolink@users.noreply.github.com> Date: Fri, 27 Jun 2025 20:31:37 +0200 Subject: [PATCH 147/161] Add explicit getter / setter overloads for pyplot.{xlim,ylim} (#30199) * Add xlim / ylim autogeneration - Create get_signature method - Create AXES_GETTER_SETTER_TEMPLATE - Create call_param method on generate_function (cherry picked from commit e57b32165cae851b3f9cb846e37e3e49339aed43) * Format with ruff (cherry picked from commit 64e7921b0b3f56c88c1f449a4f2081e862289279) * Remove old xlim and ylim (cherry picked from commit 66ee0714ff310e0693e05c4616bbb702e45a6407) * Format with ruff * Revert superfluous changes * Revert boilerplate.py and manually copy xlim and ylim overloads on pyplot.py * Remove incorrect comment about autogenerated method --------- Co-authored-by: Corenthin ZOZOR --- lib/matplotlib/pyplot.py | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py index d3da41ca9d5c..d77b06115268 100644 --- a/lib/matplotlib/pyplot.py +++ b/lib/matplotlib/pyplot.py @@ -2115,6 +2115,24 @@ def box(on: bool | None = None) -> None: ## Axis ## +@overload +def xlim() -> tuple[float, float]: + ... + + +@overload +def xlim( + left: float | tuple[float, float] | None = None, + right: float | None = None, + *, + emit: bool = True, + auto: bool | None = False, + xmin: float | None = None, + xmax: float | None = None, +) -> tuple[float, float]: + ... + + def xlim(*args, **kwargs) -> tuple[float, float]: """ Get or set the x limits of the current Axes. @@ -2152,6 +2170,24 @@ def xlim(*args, **kwargs) -> tuple[float, float]: return ret +@overload +def ylim() -> tuple[float, float]: + ... + + +@overload +def ylim( + bottom: float | tuple[float, float] | None = None, + top: float | None = None, + *, + emit: bool = True, + auto: bool | None = False, + ymin: float | None = None, + ymax: float | None = None, +) -> tuple[float, float]: + ... + + def ylim(*args, **kwargs) -> tuple[float, float]: """ Get or set the y-limits of the current Axes. From 0b2fa3f952b6b97a121a3d7f05a0753b52b802cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Robert?= Date: Sat, 28 Jun 2025 11:39:49 +0200 Subject: [PATCH 148/161] BUG: fix future incompatibility with Pillow 13 --- lib/matplotlib/backends/_backend_tk.py | 2 +- lib/matplotlib/backends/backend_pdf.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/backends/_backend_tk.py b/lib/matplotlib/backends/_backend_tk.py index 0bbff1379ffa..eaf868fd8bec 100644 --- a/lib/matplotlib/backends/_backend_tk.py +++ b/lib/matplotlib/backends/_backend_tk.py @@ -775,7 +775,7 @@ def _recolor_icon(image, color): image_data = np.asarray(image).copy() black_mask = (image_data[..., :3] == 0).all(axis=-1) image_data[black_mask, :3] = color - return Image.fromarray(image_data, mode="RGBA") + return Image.fromarray(image_data) # Use the high-resolution (48x48 px) icon if it exists and is needed with Image.open(path_large if (size > 24 and path_large.exists()) diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py index f20bdffd4a3a..4429dc9ba707 100644 --- a/lib/matplotlib/backends/backend_pdf.py +++ b/lib/matplotlib/backends/backend_pdf.py @@ -1784,7 +1784,8 @@ def _writeImg(self, data, id, smask=None): data[:, :, 2]) indices = np.argsort(palette24).astype(np.uint8) rgb8 = indices[np.searchsorted(palette24, rgb24, sorter=indices)] - img = Image.fromarray(rgb8, mode='P') + img = Image.fromarray(rgb8) + img.convert("P") img.putpalette(palette) png_data, bit_depth, palette = self._writePng(img) if bit_depth is None or palette is None: From 7edd74a20b59d8b61a7349b59056b8706058878b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trygve=20Magnus=20R=C3=A6der?= Date: Sat, 28 Jun 2025 16:13:01 +0200 Subject: [PATCH 149/161] Abstract base class for Normalize (#30178) * Abstract base class for Normalize * Include the Norm ABC in the docs * Changed name of temporary class Norm to ScaleNorm in _make_norm_from_scale() * removal of inverse() in Norm ABC --- doc/api/colors_api.rst | 1 + lib/matplotlib/colorizer.py | 2 +- lib/matplotlib/colorizer.pyi | 14 +- lib/matplotlib/colors.py | 143 ++++++++++++------ lib/matplotlib/colors.pyi | 24 ++- .../test_colors/test_norm_abc.png | Bin 0 -> 16129 bytes lib/matplotlib/tests/test_colors.py | 47 ++++++ 7 files changed, 177 insertions(+), 54 deletions(-) create mode 100644 lib/matplotlib/tests/baseline_images/test_colors/test_norm_abc.png diff --git a/doc/api/colors_api.rst b/doc/api/colors_api.rst index 6b02f723d74d..49a42c8f9601 100644 --- a/doc/api/colors_api.rst +++ b/doc/api/colors_api.rst @@ -21,6 +21,7 @@ Color norms :toctree: _as_gen/ :template: autosummary.rst + Norm Normalize NoNorm AsinhNorm diff --git a/lib/matplotlib/colorizer.py b/lib/matplotlib/colorizer.py index b4223f389804..92a6e4ea4c4f 100644 --- a/lib/matplotlib/colorizer.py +++ b/lib/matplotlib/colorizer.py @@ -90,7 +90,7 @@ def norm(self): @norm.setter def norm(self, norm): - _api.check_isinstance((colors.Normalize, str, None), norm=norm) + _api.check_isinstance((colors.Norm, str, None), norm=norm) if norm is None: norm = colors.Normalize() elif isinstance(norm, str): diff --git a/lib/matplotlib/colorizer.pyi b/lib/matplotlib/colorizer.pyi index f35ebe5295e4..9a5a73415d83 100644 --- a/lib/matplotlib/colorizer.pyi +++ b/lib/matplotlib/colorizer.pyi @@ -10,12 +10,12 @@ class Colorizer: def __init__( self, cmap: str | colors.Colormap | None = ..., - norm: str | colors.Normalize | None = ..., + norm: str | colors.Norm | None = ..., ) -> None: ... @property - def norm(self) -> colors.Normalize: ... + def norm(self) -> colors.Norm: ... @norm.setter - def norm(self, norm: colors.Normalize | str | None) -> None: ... + def norm(self, norm: colors.Norm | str | None) -> None: ... def to_rgba( self, x: np.ndarray, @@ -63,10 +63,10 @@ class _ColorizerInterface: def get_cmap(self) -> colors.Colormap: ... def set_cmap(self, cmap: str | colors.Colormap) -> None: ... @property - def norm(self) -> colors.Normalize: ... + def norm(self) -> colors.Norm: ... @norm.setter - def norm(self, norm: colors.Normalize | str | None) -> None: ... - def set_norm(self, norm: colors.Normalize | str | None) -> None: ... + def norm(self, norm: colors.Norm | str | None) -> None: ... + def set_norm(self, norm: colors.Norm | str | None) -> None: ... def autoscale(self) -> None: ... def autoscale_None(self) -> None: ... @@ -74,7 +74,7 @@ class _ColorizerInterface: class _ScalarMappable(_ColorizerInterface): def __init__( self, - norm: colors.Normalize | None = ..., + norm: colors.Norm | None = ..., cmap: str | colors.Colormap | None = ..., *, colorizer: Colorizer | None = ..., diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py index 254e2c1a203b..a09b4f3d4f5c 100644 --- a/lib/matplotlib/colors.py +++ b/lib/matplotlib/colors.py @@ -41,6 +41,7 @@ import base64 from collections.abc import Sequence, Mapping +from abc import ABC, abstractmethod import functools import importlib import inspect @@ -2257,7 +2258,87 @@ def _init(self): self._isinit = True -class Normalize: +class Norm(ABC): + """ + Abstract base class for normalizations. + + Subclasses include `Normalize` which maps from a scalar to + a scalar. However, this class makes no such requirement, and subclasses may + support the normalization of multiple variates simultaneously, with + separate normalization for each variate. + """ + + def __init__(self): + self.callbacks = cbook.CallbackRegistry(signals=["changed"]) + + @property + @abstractmethod + def vmin(self): + """Lower limit of the input data interval; maps to 0.""" + pass + + @property + @abstractmethod + def vmax(self): + """Upper limit of the input data interval; maps to 1.""" + pass + + @property + @abstractmethod + def clip(self): + """ + Determines the behavior for mapping values outside the range ``[vmin, vmax]``. + + See the *clip* parameter in `.Normalize`. + """ + pass + + @abstractmethod + def __call__(self, value, clip=None): + """ + Normalize the data and return the normalized data. + + Parameters + ---------- + value + Data to normalize. + clip : bool, optional + See the description of the parameter *clip* in `.Normalize`. + + If ``None``, defaults to ``self.clip`` (which defaults to + ``False``). + + Notes + ----- + If not already initialized, ``self.vmin`` and ``self.vmax`` are + initialized using ``self.autoscale_None(value)``. + """ + pass + + @abstractmethod + def autoscale(self, A): + """Set *vmin*, *vmax* to min, max of *A*.""" + pass + + @abstractmethod + def autoscale_None(self, A): + """If *vmin* or *vmax* are not set, use the min/max of *A* to set them.""" + pass + + @abstractmethod + def scaled(self): + """Return whether *vmin* and *vmax* are both set.""" + pass + + def _changed(self): + """ + Call this whenever the norm is changed to notify all the + callback listeners to the 'changed' signal. + """ + self.callbacks.process('changed') + + +class Normalize(Norm): """ A class which, when called, maps values within the interval ``[vmin, vmax]`` linearly to the interval ``[0.0, 1.0]``. The mapping of @@ -2307,15 +2388,15 @@ def __init__(self, vmin=None, vmax=None, clip=False): ----- If ``vmin == vmax``, input data will be mapped to 0. """ + super().__init__() self._vmin = _sanitize_extrema(vmin) self._vmax = _sanitize_extrema(vmax) self._clip = clip self._scale = None - self.callbacks = cbook.CallbackRegistry(signals=["changed"]) @property def vmin(self): - """Lower limit of the input data interval; maps to 0.""" + # docstring inherited return self._vmin @vmin.setter @@ -2327,7 +2408,7 @@ def vmin(self, value): @property def vmax(self): - """Upper limit of the input data interval; maps to 1.""" + # docstring inherited return self._vmax @vmax.setter @@ -2339,11 +2420,7 @@ def vmax(self, value): @property def clip(self): - """ - Determines the behavior for mapping values outside the range ``[vmin, vmax]``. - - See the *clip* parameter in `.Normalize`. - """ + # docstring inherited return self._clip @clip.setter @@ -2352,13 +2429,6 @@ def clip(self, value): self._clip = value self._changed() - def _changed(self): - """ - Call this whenever the norm is changed to notify all the - callback listeners to the 'changed' signal. - """ - self.callbacks.process('changed') - @staticmethod def process_value(value): """ @@ -2400,24 +2470,7 @@ def process_value(value): return result, is_scalar def __call__(self, value, clip=None): - """ - Normalize the data and return the normalized data. - - Parameters - ---------- - value - Data to normalize. - clip : bool, optional - See the description of the parameter *clip* in `.Normalize`. - - If ``None``, defaults to ``self.clip`` (which defaults to - ``False``). - - Notes - ----- - If not already initialized, ``self.vmin`` and ``self.vmax`` are - initialized using ``self.autoscale_None(value)``. - """ + # docstring inherited if clip is None: clip = self.clip @@ -2468,7 +2521,7 @@ def inverse(self, value): return vmin + value * (vmax - vmin) def autoscale(self, A): - """Set *vmin*, *vmax* to min, max of *A*.""" + # docstring inherited with self.callbacks.blocked(): # Pause callbacks while we are updating so we only get # a single update signal at the end @@ -2477,7 +2530,7 @@ def autoscale(self, A): self._changed() def autoscale_None(self, A): - """If *vmin* or *vmax* are not set, use the min/max of *A* to set them.""" + # docstring inherited A = np.asanyarray(A) if isinstance(A, np.ma.MaskedArray): @@ -2491,7 +2544,7 @@ def autoscale_None(self, A): self.vmax = A.max() def scaled(self): - """Return whether *vmin* and *vmax* are both set.""" + # docstring inherited return self.vmin is not None and self.vmax is not None @@ -2775,7 +2828,7 @@ def _make_norm_from_scale( unlike to arbitrary lambdas. """ - class Norm(base_norm_cls): + class ScaleNorm(base_norm_cls): def __reduce__(self): cls = type(self) # If the class is toplevel-accessible, it is possible to directly @@ -2855,15 +2908,15 @@ def autoscale_None(self, A): return super().autoscale_None(in_trf_domain) if base_norm_cls is Normalize: - Norm.__name__ = f"{scale_cls.__name__}Norm" - Norm.__qualname__ = f"{scale_cls.__qualname__}Norm" + ScaleNorm.__name__ = f"{scale_cls.__name__}Norm" + ScaleNorm.__qualname__ = f"{scale_cls.__qualname__}Norm" else: - Norm.__name__ = base_norm_cls.__name__ - Norm.__qualname__ = base_norm_cls.__qualname__ - Norm.__module__ = base_norm_cls.__module__ - Norm.__doc__ = base_norm_cls.__doc__ + ScaleNorm.__name__ = base_norm_cls.__name__ + ScaleNorm.__qualname__ = base_norm_cls.__qualname__ + ScaleNorm.__module__ = base_norm_cls.__module__ + ScaleNorm.__doc__ = base_norm_cls.__doc__ - return Norm + return ScaleNorm def _create_empty_object_of_class(cls): diff --git a/lib/matplotlib/colors.pyi b/lib/matplotlib/colors.pyi index eadd759bcaa3..cdc6e5e7d89f 100644 --- a/lib/matplotlib/colors.pyi +++ b/lib/matplotlib/colors.pyi @@ -1,4 +1,5 @@ from collections.abc import Callable, Iterable, Iterator, Mapping, Sequence +from abc import ABC, abstractmethod from matplotlib import cbook, scale import re @@ -249,8 +250,29 @@ class BivarColormapFromImage(BivarColormap): origin: Sequence[float] = ..., name: str = ... ) -> None: ... -class Normalize: +class Norm(ABC): callbacks: cbook.CallbackRegistry + def __init__(self) -> None: ... + @property + @abstractmethod + def vmin(self) -> float | tuple[float] | None: ... + @property + @abstractmethod + def vmax(self) -> float | tuple[float] | None: ... + @property + @abstractmethod + def clip(self) -> bool | tuple[bool]: ... + @abstractmethod + def __call__(self, value: np.ndarray, clip: bool | None = ...) -> ArrayLike: ... + @abstractmethod + def autoscale(self, A: ArrayLike) -> None: ... + @abstractmethod + def autoscale_None(self, A: ArrayLike) -> None: ... + @abstractmethod + def scaled(self) -> bool: ... + + +class Normalize(Norm): def __init__( self, vmin: float | None = ..., vmax: float | None = ..., clip: bool = ... ) -> None: ... diff --git a/lib/matplotlib/tests/baseline_images/test_colors/test_norm_abc.png b/lib/matplotlib/tests/baseline_images/test_colors/test_norm_abc.png new file mode 100644 index 0000000000000000000000000000000000000000..077365674ac27803460ddb533d5efa09ea7ef9c7 GIT binary patch literal 16129 zcmeIZcT`i~)-Jp$B8UoD;73OhQHs(LFo24nf*>Hh_Y$f=fKXLXM2d=Z2rAMEEd-Db zQdCN$CDIk7hAM;(xhs0kd(L;>JMMkYeaE=t`{VxMh-0(&UTe)Y=QE!^dRgdOZbM*H1@RGlL z+4VmjzvTYF;W8%i0|E@e;Bm{y3xb%eDF3K(m2#XQNb%lnm23C?(iTVIQMPmbyc;w9 zS;bz10*TZ2@Rt(LtHiy%6)Aa!nZ`P;u|)Qobu#C<4H-lMf1|MK|t zFcJzW3#TthaHFGdKFy$JeDPG+J&zMdxRT%7>b$;%t~%$N$hD-2)3C@6s21YQzpNLO zuW7c^Z<3QAtYj$;%bBm8nM)Z=+1cE!UH&|@h)@8tJ(1g04Sp>B>G>c?S%R7#f?h;H z)DU!zKNMX5{QoZhn>L9yVpH}R`QRmJ9=tu}w=+h9rEwT8t)Y7h_Vdi=Llf~*R+@>m&uQ1Yhx`Q zLCwj1i14l|Rzg|3SFG$%SABa<6LxwT`5cMvEha4Oy@NT*Yg!OC$^Cam_Ev_X3Z7L3 zqs^bmYwG3kVAl<@jL+ulX~jD~TTu*VXMIcauTIqb$*m=>NLr0>C#ddb9bTlUeZp_) zq=AFk^;n^S%!Gsd`|2v#`8*v_)0msHKLds9IieAmnQzg45^lCy0tJ7cN{8t(X~TDt z|`Gf&sP*?4v6U}S%5 zL47kIW^qITr7ivZ21I4~BXB2ij73(dR)#1MDpyHzIXKK#*??f?4VWHa*DL?4+>+{F zZTpY7{dVYintQ83W{=wjR}G6+Tl7L6yB_V@+;5xBj$WM7=IYAjfO6@m!qPTd)h3KL zwhB8!Klt(o2)U`ado&P&h3mO2(zI_vVgbe_5EN=l%M3w$>{PT6bW0TiBfnx%{&y}r zbyh>6A70zh#4v4t(5zwY5o+LqlGv!}O9JV_pGGu8F9*&m6wf%Jt0C$}os-I;+xHO> z7mhF=YT_5p&rINzR47ur$`N=35|O8(O^RlqZfTKZ7NCoWi)&Mw*<-lDb2zm1d?*x` zY-Fl_+UgEz8&mBO9kDDdr8><4Dwy}1$@aJ5_!R!76Nc|uruJ5{lcP6#e0RMzCoz{t zm*pzFiqjezIy9h%w?(ZOb$^g_uwutJy?P1G9K|*b?Z#sW-7WXvRl$imr8@CHzOpdz z4Y}crD;>5_h=_%)%|{6tA3YGT_3xUKDKZm`3DOk6E1O!^g7vga-t`+R@uIS1py%r> z_BW@|j%Uq&x297ecG|4CbMPrfT#(^zB0V>ZPyr$Zn9)i`XZ#rwRq1(muwKfx^BG?G z{ZZz)7=snVnuU^Iw}9h*VBphmV<0FyT5(L)I+csXbDz!jK))5$w^xP?A5hcF0pL>2 ztn2k!P~Escl3Q0JFRDS=6Nif?NoVshbk>hbBzlgvypN3!L=%<{JZme~+F|WH+`LD5 z4nql{(DiN$vu#7uf;!iqGY0kH7p?0nJ=52unX?W@v`7jsJ`8C%%;YOS7A>fFN*1+s z4|ij8!~8jU)1<-JLjn?!0Ulqd|GZGKIe56jlY8ITI7v06@TZ5An6gULsk3+L%vH*< zmQ*DGaDUBXBdDlU82kR35wT&^RheUK(WQ&XGli#lLKJ)bv?Zz9MzfHe!AkdQ^UK9f z!xGBCd{&;W=7+^M!%s&UtjJdoPyBYjGsOu$_Sc>y^QqjQ(ClY1PHOWjln~X>{h;5J zL}T9GOt1-i_M%yt0a90n&J>$x6drn)>!@WSOut;|TKF|7 z1s4d?vg_Ar{wpg+H^6&aTxcB@uh(%0u}u(oXFRTp30t01*yUe1b>|FKSnWG$J`hRw zz0K|H4+-^xz&YTED7(=TCdqsf#Q7SXQbItH^eiMI2ku3}hN4;e_9coQ=H4=#Gj;!p z6)K~%J|e1d@=(O>k2ii04L!`Q7!zoJ$Kj^}yTq#J{x|W;oi`0H{^kCVpnNpnQwYNp zM;r0X!TAUe@q7sMd*7U~4@^p2CXqkVBFn{Y9u2%J)YmK(%^q?4M$5S-rx7Ae;|XTv zPfi4Q4^PQ4_ZZe}Mgqs)SJO(d(`kvd;ZCn0@#wGjw>C?^UtO*S6D6N|Wzcapvf>E( zR_NDesW$)9Ml{+R3pX4(U(vLjDw6*7*KY)QFoZQO-$hg9-D1?8sa;iayle-Y=9;i! zlboKDRZ81YmBBNvoohn~cUsHO417NaFcEEz!ge#rV_{$hGpC|ux8A;{vKFFpome|h zkFcVng=m?7Bl&0T#m<$e>Z*|-5K{;cQ|UKnGehp= zf8mG-A8W%d7$uesCq6+LOvtfhHMI35pJDfi0ciH>r1GbZcUwzSqxto8&6hMXE!=sG zlU@<7%%(9oP}xM0DRNsX;Ty^Np$OgGJtOP}a;y+@dLRHNA{7SQ5cqEf?$hxbWpG`*FDPE5DhLecslcfN^OG2yUVp zNMnAuailx0ls9Beb8k9?#3`BYC=TMb98*}L6@(%v-zPqHZv{W^!!MGE+8glSTX~KW z`IDm}uG*EJXbnc)CjWS_-!F}xf9Yp=Y%z)dYcU!siJ)xF;7U5O@L|=ST%tm;kgMg% zG=q5gBi*Tc=CX%kqu00~LrXB}#WRw81KTSF;d8w+UDp_O=Z#RkgfLUvWAu=^CUho8 zucHlqvWMbUlNQB7aK34)gd8Es3nz=ss6z$#LSL+XF;L=-jwhjP+(YIaCZ6ReB7-fp zO_Gju7j$;s>G40EXTu??p*Q&1IZfQR-ctclzx@=}9>crDb`*l1Ye8pbMrFyGF7=Co zUhTsyUSuj?tKSdbVbrw})$`|8FPa=W?B0fD8e5R7An$BW;K;2xjC3@VeELGt<=8Ep z7gj7@(*CBsfBp$EVO_N*o0Ehes$st)IIa7V;YXD2gV5YBhr1*DDaoUGtzSI31H}Y+ zQC4Th8OY!4Z^&mJFAuOW?|bcs+{|0I-?l{4Q~mbaMPn6szs$@0z?Fe!sb4mXW@;}Z zJBu8fs4WL6ehBAxIW2#fw~-CONw`^*xv(nKyCnU0Hyn7k+|`@ld91~>{FvUwdjf@- z^2K@qg=@y7CS1-{rtxnPh9Bg&A%R1!2=sfUWr-zTT^-S^k&f*5#$`fv^@o-Z*&Net z-n@?|>fo;l&Ibgv7bB?(a|ry zE)E$|gT1}^{44)EV^A~iI*&mm+tF!T)=P6EAcuVsejLL5HJ<^Nk(~Xyp z>}=}11IS5ya{MFRJLBPu5NjB8U9-kqlTlv}fk`1!GH?DbI*$ z{0Uo5F`5VYz&-MNo9|zlHm%k7`r3RS5t`KO(lsk;2#9vc2yjW`$fd`03I!+tF!A@?>NlsMIXU^^5NerFqbh;y=6zO zqGz0RgvSIg&8#=52Y*LAjTdjijzlp3&Q_8xbU!<}0>2mTOsquA7eCDX5@UQ4r}&zi z?+HvMiX9}YG?3W8LS?ydzH+hXJ;PtD*$;ir9cQ*%cq9<|8`c37cGoGZW{2nb*1i_i zxH%*0%-C1b9{F0a=G`Gis7)aBMPCtCZ8$GyovA(!rcVOCC|;m52|(hmoqg5V@fwKhAJSkJQ=OeVtGjROu#=G%J$ps*7kjHdtX z{mrb|n%n}oBd0C~Ap~46d_JEyd3Jc^{AwI|Owf8iT`4)_dwfs#Wn!>s*63zdm}mYv zOmEKT*@d|Pp@O=y>&5OyljUFh#)b0|)NEof8%qtW@Z|$Ipf&Y7b>GO94W^pc)bD`A zuV~JwKS=csFoQ#}0Cjq?C+J>1{PE+2kL}5{LdAZ?~0qE_O#L^U#%vcsL$+w)KG z9l<4+#PsD2cD*9s76OZG>u^Rtx&v9RQqq<6taWjgi&bO^-C5ab zS~%Yw)Wg5b)yVCU^A`XEtmhGQ#{X@j#`Z?sRa}EWl{1abc-9rNnR)Wyb@0j!#$gIC z_`;g~h^Utpo>!7^k@n&3?o{vE0E->uLf~91G6suq9jB+T?oa-E4O<@!gYt13@ih1A z!}DgvMK$;dF9C=+c7A@W)_m{5FXCj#{^Qjx3$i87W_LVTw0{4y1$W>z$k2nD-am6B z!h-^nZT-zsNYOq=s}#Ui+c~#xt)Bh$(zrwd4l<`3xX);vObdJpmo!)5Y1YP?4N`C~ ze4wqcLA;xe2`UK%*}$1aeE#V<%JBbS$1oWRp}4NHDi>$oarAE#55Kf$U>gGlh3DN0 z%>@YCV ziSNlxrTWdHe+~@4jQ$G1!_~B)w;otdkD9WbKW3uI##zARcyX5}nQspXKND8E5+l6Z zellbH(#~@j{z}%-lZ!|OoBOi?LW@3mU$2;tzw^A~=L%@s!1#q395NYfr>&7f*%?to zJ$EZ14qe8+)>S$SVZc{fY@3`oe2yXuSrdn;;NN_xEZHeU7dy+TJiV{kzg8Pvz?%J_ zEmcZcX#Y;{$3<~JM@;^uGj)4P$~4RSlWvFBjQ6o z8~{6o``BU;{YQ*TC}6h!&DwoZzCl!j<*`z&)|Bzde(h6ymoOWX_k+Sbn4sqxAd8s8 z)%I<3PzVLiyvk9Ih>naz;0CjQD7VbqQI#QiI;%)@v%>kZE!xjf zSbYm`G*})9)<; zpzzpzX=YF>6x(q~GV9R`3nTuvlz#YPF4G65TY$uA7wbvc0~CzpDbQim z^=bZMTkJWL@~8Yflaqj@Tk6N;E~>|w7Yk8Y^Wc^53l?gy^303-&(2P30!j?PIZYJ} z!)wBflP;k$!=3txSs=(xojo74D99iH3i01L6Fc;s{RL*`zAc?~FD3f(C57)rvt~PW zD!=Bw73p@)a2=N69QLPp{p4hec0B6b)Y~kj%6-v+mbEfGPl#%wtZDK!YoXM^9y}u! z=>-B+0kxOx*B;0FyB|@#+coUDsdZ2?^KJFxKD!>~3a}XmR$r>!@nmT<{IaM?zV`(-h_eDSfVZB!c2g3;u@i{eEH(^RzP+A&P%_|r%IqaY#Lo|ZP-32 zey#iU)d}TKd2ArJfpyftLG^o2^r8bFAh@fL_=T&d(j^yab=_3x8_NK2OML5^$HK@ONCMLOpJ z{@q_AcI>DyB|B$9;#F-E%G$9Au8fgv438^icqDkO#kR#kgW-oVu*N#vRqo}WY1oIE zZZ7~ANnjYI%RY>KZy@p8ei2D~q`$J-E(iTUZ}qY*ZCtGgu=rD8|J+*$2@xJ!J*Xu4 z|JOy9(p% zSLi5>l&~};f-71Ppn#KAWNt8}xY;3P%h8B;`-c|?-F|rPthE4!o;!33FhPut0*`+V zDjyU{={ezfQEu7(Z_Mw`j-;!cKcQ71+pk)=nX6pePwC)%x%U##~Bq72e5t;aOdpR&3wO3Fe{sp za%PD2CEx{j7PSipVxA}#10s^Xmd_0+0*T%05o@*(ZN%G|Q&(A8dYFN2DO>i@xMX@; zv;X37qWsL=-WZv1rd>On<2g4A4)3vZKdff`!$a)jq6g7(&0R-6)J`hxKEKkvbT=?q zzc^7x&1h1EVX|N7zIs1Ak(d8YU=UoOUpLSAi+>Q?Dsa+!9jgcXCxnbZ+K`Jb3}H-= zW@anS0y%g!Uz|qVDfGh5Og`#ZaN)Rr*P|JlMhQ@48hz$zou{W1Q&GX9q8c`7x-TJZ zKg}P0tqhrRKRy3gp=+UP#r)8kx8S^Iw-HD|@7gKAIKA+38ynfib#?ZQI8hv#yOPb= zShnVVMlJ`gJl_*J85e8%amiIon;c9rvv@&SH2e!YFvqby$A|~Pb1s@!W{~|c@DVB zkTi`%{xep4LDR#aL>wp4MJKw^y_>D2Ak^uzP$(q>NR{aqo*Fs)v;Q3^{(oo6j-h6$ z3(E9NkeCvH8~IHt_OFlZjQG}jrL=Ova`nqZ^wsv1i^3V8Pzv*uddJh%tjA%T1VKqrl$dhv>D)QY zOhpZac2Ig3wvTCmR%7}E1c#uKk6@7nF};h@N4Fsk7J$a~bl=9zQoDmi^|+VI%$TEz zDNW-$0HNFKmtlWvDO)bN!cv)*{?<_r_|pvUQ-uES=|58TW)Spx(PVYNu{;&l4rBpO z{s8CST>PI}`ze2Khu2LGghpcO~DpT~Mh?O(g|$!&# zKir)yPNcr#JJX%+w>_0OIhT_WLn4uk5@|%#O9wHO!?Hvi)tV< zjTwI1>^VjI;)t9p+ZGs;S=N0l%~QIr$fBVrn?(z71huf92%aS?c)|Pe(`lYKBNhHj}+EKeLK)=BU zL7_daAxpu58(F)scEl1lE;pt1ha%tU2Nfav?qmhewHqufYB#zay{T_k^e~*m##vyx z)@%kFwr+oRWW^<+AcS`hOHzc``t#O5W8aU>ezb5 zq8%601NXo08P<3ejt(vE?0+t9cTd}|A0>@M=>NbDmkud(JYY3M-cZM%Hr{!f(KlYK zmN2(Y1HHKc<&}t-Jo}`7cA_)_*|et0RV+E^<8i_sQFEZcAc$VGS?se}9F3a{U_mRe z#BN-=TCcQM{o!6&kL*v|8}<*%QB+W;5|!;UZ^iOrwSEHs#9}Ls+p`m~TXpg}-IL@s zqvVb77bnr_5gTv^$*YTfll#wvjhdc#B&_T_dT63=an zsIhmd=1~YbP(eEkeipe)mX@kRJM1?{;UytUaRxq-+PMl;y4#Vj4T}pR<>l2f%#MpH zKQ3VKkJYzVZ5P#K*3e#yCWcG42wEm<-m*`ZOdOdXn3H zOjgTe;JiBwJ{m-bI8EK?4U(FqSOFg6LVC)ws*qU33!MjDIgwCp6I>Z-__H&0Xz++Q z=r{i#X~X}7!IWIZx6FI6Hy+(yWDy;KoM|ZJ!R^ zpiog+2_*A{h0ffRa>eaD-c}MEw8{UG-l^6c|4Bt%_EQ}Yi76a)t8_4<<*sxek1?rq zYvtYRemXh*v@Bv{Y$dLYRCMnFkH$O1)b)FE`$)-m6)zbj(kD|{N;!-Y?(PR1vY%WJ znijU$zB5wm?*-6!X(4ERN)S9xus1ti66zMR$fvl`S-`jp@R|L^k^H(v!n=*`)E>7= z`7=Kk8b-T|(T6|SEN-~X5b>W&@tP{Tq_uV}+_R5X2C;|+%Ll856)Z-sULG&z7?iqB zUFK{|9v`-dU0!lCb&k?pQ<+EHe#f)F@cbTnis!lq(at?ow_c9_#mv)*l! zOX--RFS1*X5!NGAZ!cA2Z?V&fPvgSTaV-bc<0bi`6A`lNyt=tm%*qLx3DW#!L>AAw zEr0$P!rXU-g(K%{*z6suY1Dnc%E^r(3*f9d#8oRo7yfcse02R8L4|<5FSm(YQ z$_@LFbQ)%ZZ&lw=O}~VivnWBVYFog9tvs#d+aj)jcG#t9)^Lw-%INA&;|XA1osHhp z(7ej^U;ucoyv1e(io~S&($yJ8lie+HOe~g`StzFuS;5Zok!;0XOma~|ntZubkzwWn z8|M6qMEvqQwfv}O7%AgeksXkbUD;JA3%RP=5?|Vpn&H%@3HN9;QlVy@*>aRL|Ag@> z0Hezw3asih2rhTYcuWnO4D&ZIV-XRwgR(3Y?Rl{}Jcd!!VR4@Y0ULhqIKB+V=A2qU zW|NNQvSOsf#%Y;zBjy&7`tf*7a1F|gUg~j0U?+2p1 z$f3^##(ByfAi$g>?C}9Dv!!i1(;}Q@aOkx$ZYL~ZX}9m_2x(#cN$TVhQl=`tu#!}$ z_2NT`b|_xba;USnFX#N3hap$I<7G4Z&|oF6Cx8V_)(w5a9P88>O^@6JMRmJ7zff9|9%;qGy9QC9-Hb z>pH?xmKTOwewNWPhaM8YLo}*DD41P?zCJx21O4|;j8SR;P#sPBPGSjT5!fN;LOj75 zUBL<`4Hy;_r*oSWqg$PWq&bZE%S2LrK0}b$399#xf~VL*1UOQo9d8N`^~6L(Z0>b6 zoLKgsuKO^9#~=;v$uV36&!f>khZ6c$%J7`l^YGFkpYEaCxp@wx{&5MhL&L+vrFC_q zUM>y}4ypt1NpSMkZmB1Bvu?qGyfL}D+OWSBB}6^llUTo^zjwekHZNDsr|nEO zdg9LF9n)vRSy2SH%E=O+Bu0V#M_-y&ui;joqMw#}m3y&nB;f=hmm0@Fy3w7G%t>1Xo+kVO!qJ5DSXJ=H1S8z2Vq)tT*I#(iZeEwXhv0S=V zToXGQvd$O0zM{G0-@Z68*M-zqa_3cmUra3|El4ptfxx~?0h$ZfLPoZ=i0FKU)G<4Js^b1O<19gL9=1OmO(N zD~R5N=_jem*RLO27Yv1LlI;OpE~Z|tKuyJPD@DmNjW6^SA(G8-)v`2I9w8}I?I2F` z9AP#rAfh|(R+1L3zBVSAP&CDM6TVn!y!Bk9OS~+M5@k$4%(E*?qt5R^?Jsl9pE^RAv3m6rku3! z#U}Mx0d=T3)`$%p3>9JeKRyZeC)@vK%NDz`m6H}q@=?+Dk}|1X-%O33MNi)`H3C22 zLP}R$u|h+!-C&_Q9TfVKp6~QJk=#e-8r(7FsvPnhal5I~GTjy17H`74xVzVPuWZot zSr>RtU%tUj#=zPpi`^h)#%fBc#igjwn@4GP=jUF$eIcInC4;osCZG;B0Rc5L-@3cI zqw;SPqb+vPx$cD|u9}TirdBLCv+xg5uznq|iuS*Yf~VJOhBKm5W!+U(T09F*@5b`9 zj`dhwy>d0GE;I8R>}u2~xu7rsh1HI+u1d<(V9l(#%5#uPlGo2Pq_EWa9DJGA#DAiHQkljEvWFSGtX+Xy2UM zYf&Sw8HUVgP4jN;ueSNGV>Z8Bq)$@c5BBg}S>$aICeLPc<-Tj>3%zezr~h17IGt%f z#0iro&J-JKL!Q0B!^Pb;W+j-E797OtqS^dqsmDqy^aG}nvv?#(m@UkB5%ELXV4j3R zlo7h2B^;3D#=am8BKwQ$lbglyirM#QfJ|Y_fbJ)j>J+z=u-G43JlASQW1hCh zcGIX6TsoXW2Nlw@=1%&Jjf~GFe;!njj|7H!OMs;(f2h*8U%PHNhk8aK<_vNGX{5d! zm!>`@=1$9eNwlNP5H4kd?un{wSG{P1szCYJ8|_r0U{{XGtEs`LrpG=$O~+#}3FX~3 zPunvqQLcq)MR{`WFrwS-8VQf{IllU8AUnI-JB9l5hu*tAigvJ*lUMBSYFR)WO6^|8 zIk$aE+O&$-GC{K zc%00I-qQ6lD_b`CAYdl3?RdO8d$9#5XX$XM&0m2Un4iIjI@BblkB3Z`lUy)3jTpdH^usuG z!1>JZ*Aq`t>tqMh#*WDfI>Cs5ip0mqJ2Ek7Lv~-0sw`Brmb86UKkN%emyEwF1rv>y zo}_}}t&Vu$b`eYS-ZsI$lu}gabd>!>JB;tfxwkf4n$dy0Tzl{7hTQP@AOc?S@F*Ns zQ|J4l>MS&?mkJKhLXE#bpZ~ve8kN#(`80g6$J?@~H29oEivMP4@{EL?-X;*cDF2Nv zvgxu9!VAzqjkf^N-eDu}^=ZQkTS26^x1${^`Nvj&;#z=O<~Tkh%Yj{cQ&w?;lbBvC zTTR_LSGv@$V39$aQe;B}y+p#@n5Np{v9XxN#YL2jf`Wo%{&_SZcsVP#xM-8B=HMW< z&1ShlE;BOJ-+ME)(q<+# zvRdHgYCQ;^A@teI#Pa%}ync~5eV2St<329r?_xuX6CC;m9A-^f0c}%zhPX*$7s{sY zZ8kf+pzBka%a>xVudZ;oa79H0GG??sNWpEiS~@ebcl*;$2=gD=ZXm*s)NT{Kw%@S5 z@hg&gx*JR~dAF(cfOGu0d&qR(AC}=|nKc*@Z_i(3Va9v#lcn5v(a+DX|D^FoHT9QP zzP`2H$C+EJCN&>c)>c-ue@J6Q=(_8@4<{|*B|zdW+@Bg}zg!Y^J(nsW9V!cR#xB@a zSPP78e6zo3qbTpz+I0KH;PMfP0Jhllz#w^HOhd>i-{r+trr>WuwO&iBo&_r@ljW!> z2iIRX6O#eJh%Yk9$cbkX5s zAzJ3aqTP&D7MUaEIoe_L48V;S*MAo>*|(v$ugXLe;IM!NV>z1&dg`xt~C z6M7bSx!T6YtoF9L4%fY%{(j-OnhUI^%G`c(LL5Lscv2P>c;3pX-`U6^!8%CbY&Iw< ze0%i~p3_+&#KGXb?@txxOmHAecZS}hNjstZ{Y3U4vZ6BNuft5S56}*54(?w-o;Gt@ zAIlqgXuJuCucpBqGdMp=yQeEWppOxrfHF#n2j$N;zC0L* z0qcKskH(*xUaUg3j@3YxFfl)Ed~q@zFs%^}FLGchdAqbP0W)S(OrAAgQ0i222U|(0 zib!xd&QrmEqcCF(fWr7xqT+)-b}dOueRQk#$0PNpiyZh}j=TZnMF1o99vsqU%me7v z2LP#-(+!|JH>t4h_9#+j0SVbLJ6|{(3Pm{@*P!kWAvfC61A;OPeh$q))^R?3>n?F{ z0))T4Ei2lgIB-U5Lbg)LBoRH?5c!wsC{mp&xefg(oag%#SNlCas!b_gfY{-g2Pi`@ZD}Z3b z8|4ezXaXnuJ2QWultygE2E@SR6_b98CV6i{NFgDLpi=SQ*qxl5yz(vRuiec}8*}Gvc0&FZ`AcdufqMRtBv}eeaVKN9LJk%}z&V5G*Pvt?5)vj;?AkJojqYu`Du0zj^wY?A z?Eday&yoP<0Kp$q-J9cA86`&FW)C>CnPWZ-T}^d0A|APzLuKc><}IU2WWUGV9wHU& zc=7C4s6!Jn(&>t~mm0@M!QE?&zxaWVoOqUaryt$+Es%Dc2qoAG;$ z&61TAJ1oj4qX2kkMH$WAuzNI}Y*b-7wnnUQ&Vtg4QjXQcqC|;lBS7Nsc{Ny+3@$TB z0b((Vk>{^O9diaZw0QAV`ieSyV_-f+d zo9}(n@J!OtTi1x}8W|9^x+N%N9{XMub|+vWBCuTpfiL7-g*nTwDHBTjj5q;+3E4aG zX+czNGH5*JX~0u6xb?>^KEcw*&P)$qv()lpJmCmxgeR4uEP75ZqX^^uR7 zzA+-3vOZ2X)^gNnh}Rw-BfM;OG0QEqzq1!q=(LtkUV&2Ygn9k`d`7Ff68W-v4Qu1o z)N}n@mE$Sb1v+kmvPSGC+JRVEw@4#qqAvqJocZs5>PGp%=V#rP(!uiT)MlV4zUU7s zG?cLta~cpqbpRXinlaJ_DVR%~5cK4Pve0bE?nJR#-Dng(Q=f~Mw|zBJzZSFqTLk?s z*A=g-WoZPE!Qr7DMz(gHE(IH>j0t9S1aNZ`ZU5-#^x(hh2fsg+T4u5bLTdPOCd5|v z4_R96&w0kv>*3?O(N+Fy(}T;yiwG{*Rj@I;rR48?#{q90+kgBm#N*fa=T%hk@^bru z+swB*gWyxUOvkO44}!U_UICzwjUK>wyke9!!0+-lRLgj@+4}?ufY!{k`eARN#zcbt z186!li&m z#nw$CFM^bd_N&@l5&6WGM*BMOjhs@j#|cM-@5V&?cnC)D>%yo~MCQ|0C6?TQG8B8l zntoYaa$?t7McLRrNk2RQ1gJ5PMLFRG@t~_qenSv=>wUy_Ohr z0ywZyirK&fqaA=<$k%3w0U@3_%ab1qT|rkN`5LGzRvw)B0~3vJ=kS~=?b2x@ zj*%8DH?43k>OY=PodyL>RW-0Om=8FeKr578LlPO&?oP4;M1bzCrwQ%>+BTKO-tocP zwqvs3fCxQb32pWmD3o@m-x!40qMWI>wCbuREi4>JkIIhhA%eNP0V1km#(XQLTt0@18{;;7 zpW=>CHA;cAel|%6U^R4VfP2dzxAXCdvDoFGDBXS}VyaF!tN$1jcLGp_3qHibjQ!S( zHg)o1gUFOTB*p;Xq3IMBCGC#OJ`Y`)!ngld+n8dn0FgIJe4$H`7>x}6Ls@)R?IT`I z7#>gmXDO22CmKkrqQXG9zrXrX>mN7&5h~~Lt+VE_l&>EDlR^pX^#9eoDVoUlk%NO^ z6_r3B%_eyY_=94?6Lbjw=lX4WeM4IPxJXLhGF*1)X1RlD=b_k%3rpDX6d!gNMdFnv z<^$z+o6qS!w0$6e$@OcphlK;YNv6A`jUt0>x1w2ir!8+Vabp z%0ka~{^-uWOC!$`ErR7J(z2n2MTU=DBlUm&z*TduHkP`tVixG9pwt7+;{VC#p#S(} m@y{*)?+fJr!spj} Date: Sat, 28 Jun 2025 13:04:07 +0100 Subject: [PATCH 150/161] Fix polar inner patch boundary and spine location for log scale --- lib/matplotlib/projections/polar.py | 8 +++++++- lib/matplotlib/spines.py | 8 +++++++- lib/matplotlib/tests/test_polar.py | 20 ++++++++++++++++++++ lib/matplotlib/tests/test_spines.py | 12 ++++++++++++ 4 files changed, 46 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/projections/polar.py b/lib/matplotlib/projections/polar.py index 948b3a6e704f..8fdb31b4256e 100644 --- a/lib/matplotlib/projections/polar.py +++ b/lib/matplotlib/projections/polar.py @@ -817,6 +817,10 @@ def _init_axis(self): self.xaxis = ThetaAxis(self, clear=False) self.yaxis = RadialAxis(self, clear=False) self.spines['polar'].register_axis(self.yaxis) + inner_spine = self.spines.get('inner', None) + if inner_spine is not None: + # Subclasses may not have inner spine. + inner_spine.register_axis(self.yaxis) def _set_lim_and_transforms(self): # A view limit where the minimum radius can be locked if the user @@ -961,7 +965,9 @@ def draw(self, renderer): thetamin, thetamax = np.rad2deg(self._realViewLim.intervalx) if thetamin > thetamax: thetamin, thetamax = thetamax, thetamin - rmin, rmax = ((self._realViewLim.intervaly - self.get_rorigin()) * + rscale_tr = self.yaxis.get_transform() + rmin, rmax = ((rscale_tr.transform(self._realViewLim.intervaly) - + rscale_tr.transform(self.get_rorigin())) * self.get_rsign()) if isinstance(self.patch, mpatches.Wedge): # Backwards-compatibility: Any subclassed Axes might override the diff --git a/lib/matplotlib/spines.py b/lib/matplotlib/spines.py index 7e77a393f2a2..9732a2f3347a 100644 --- a/lib/matplotlib/spines.py +++ b/lib/matplotlib/spines.py @@ -265,11 +265,17 @@ def _adjust_location(self): self._path = mpath.Path.arc(np.rad2deg(low), np.rad2deg(high)) if self.spine_type == 'bottom': - rmin, rmax = self.axes.viewLim.intervaly + if self.axis is None: + tr = mtransforms.IdentityTransform() + else: + tr = self.axis.get_transform() + rmin, rmax = tr.transform(self.axes.viewLim.intervaly) try: rorigin = self.axes.get_rorigin() except AttributeError: rorigin = rmin + else: + rorigin = tr.transform(rorigin) scaled_diameter = (rmin - rorigin) / (rmax - rorigin) self._height = scaled_diameter self._width = scaled_diameter diff --git a/lib/matplotlib/tests/test_polar.py b/lib/matplotlib/tests/test_polar.py index 31e8cdd89a21..c0bf72b89eb0 100644 --- a/lib/matplotlib/tests/test_polar.py +++ b/lib/matplotlib/tests/test_polar.py @@ -482,6 +482,26 @@ def test_polar_log(): ax.plot(np.linspace(0, 2 * np.pi, n), np.logspace(0, 2, n)) +@check_figures_equal() +def test_polar_log_rorigin(fig_ref, fig_test): + # Test that equivalent linear and log radial settings give the same axes patch + # and spines. + ax_ref = fig_ref.add_subplot(projection='polar', facecolor='red') + ax_ref.set_rlim(0, 2) + ax_ref.set_rorigin(-3) + ax_ref.set_rticks(np.linspace(0, 2, 5)) + + ax_test = fig_test.add_subplot(projection='polar', facecolor='red') + ax_test.set_rscale('log') + ax_test.set_rlim(1, 100) + ax_test.set_rorigin(10**-3) + ax_test.set_rticks(np.logspace(0, 2, 5)) + + for ax in ax_ref, ax_test: + # Radial tick labels should be the only difference, so turn them off. + ax.tick_params(labelleft=False) + + def test_polar_neg_theta_lims(): fig = plt.figure() ax = fig.add_subplot(projection='polar') diff --git a/lib/matplotlib/tests/test_spines.py b/lib/matplotlib/tests/test_spines.py index 353aede00298..d6ddcabb6878 100644 --- a/lib/matplotlib/tests/test_spines.py +++ b/lib/matplotlib/tests/test_spines.py @@ -154,3 +154,15 @@ def test_spines_black_axes(): ax.set_xticks([]) ax.set_yticks([]) ax.set_facecolor((0, 0, 0)) + + +def test_arc_spine_inner_no_axis(): + # Backcompat: smoke test that inner arc spine does not need a registered + # axis in order to be drawn + fig = plt.figure() + ax = fig.add_subplot(projection="polar") + inner_spine = ax.spines["inner"] + inner_spine.register_axis(None) + assert ax.spines["inner"].axis is None + + fig.draw_without_rendering() From 6ede069136c6e9c7f1bceb9b1d4e264ba928aa55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Robert?= Date: Mon, 30 Jun 2025 13:41:34 +0200 Subject: [PATCH 151/161] fixup Co-authored-by: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> --- lib/matplotlib/backends/backend_pdf.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/matplotlib/backends/backend_pdf.py b/lib/matplotlib/backends/backend_pdf.py index 4429dc9ba707..a75a8a86eb92 100644 --- a/lib/matplotlib/backends/backend_pdf.py +++ b/lib/matplotlib/backends/backend_pdf.py @@ -1784,8 +1784,7 @@ def _writeImg(self, data, id, smask=None): data[:, :, 2]) indices = np.argsort(palette24).astype(np.uint8) rgb8 = indices[np.searchsorted(palette24, rgb24, sorter=indices)] - img = Image.fromarray(rgb8) - img.convert("P") + img = Image.fromarray(rgb8).convert("P") img.putpalette(palette) png_data, bit_depth, palette = self._writePng(img) if bit_depth is None or palette is None: From 0e430b9b19f6cdcdbfc583392f6887686a47b74c Mon Sep 17 00:00:00 2001 From: ZPyrolink <73246085+ZPyrolink@users.noreply.github.com> Date: Mon, 30 Jun 2025 21:43:52 +0200 Subject: [PATCH 152/161] Add explicit signatures for pyplot.{polar,savefig,set_loglevel} (#30200) * Create tests (cherry picked from commit 608b51fd6321ac07133b8d66a14e15a906e21169) * Update test_pyplot.py to include type on signature (cherry picked from commit 4ea0ff8e50f3a2460d18694aa1d58e7757c8726a) * Update polar and set_loglevel signature on pyplot.py (cherry picked from commit 41b701b41858cb2868485ca9f5747db4cd1f6d4a) * Update savefig signature on pyplot.py (cherry picked from commit b863ba298abe37c08c92f1ac1afc41f985d0bbff) * Add type hint on polar and set_loglevel on pyplot.py. Correct polar content (cherry picked from commit 92dc04501bab539586cac48a3266891c75a4cb7c) * Format with ruff (cherry picked from commit 64e7921b0b3f56c88c1f449a4f2081e862289279) * Revert polar on pyplot.py and remove corresponding test * Remove extra work when stub file doesn't exists Co-authored-by: Elliott Sales de Andrade * Replace assert_signatures_identical (check return_annotation and full parameters) with assert_same_signature (only check len(parameters), names and kinds) * Remove unused import * Renaming assert_signature arguments * Correct typo and ruff error --------- Co-authored-by: Corenthin ZOZOR Co-authored-by: Elliott Sales de Andrade --- lib/matplotlib/pyplot.py | 10 +++++----- lib/matplotlib/tests/test_pyplot.py | 24 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py index d77b06115268..8c9d1e1e5a29 100644 --- a/lib/matplotlib/pyplot.py +++ b/lib/matplotlib/pyplot.py @@ -50,7 +50,7 @@ import sys import threading import time -from typing import TYPE_CHECKING, cast, overload +from typing import IO, TYPE_CHECKING, cast, overload from cycler import cycler # noqa: F401 import matplotlib @@ -338,8 +338,8 @@ def uninstall_repl_displayhook() -> None: # Ensure this appears in the pyplot docs. @_copy_docstring_and_deprecators(matplotlib.set_loglevel) -def set_loglevel(*args, **kwargs) -> None: - return matplotlib.set_loglevel(*args, **kwargs) +def set_loglevel(level: str) -> None: + return matplotlib.set_loglevel(level) @_copy_docstring_and_deprecators(Artist.findobj) @@ -1259,11 +1259,11 @@ def draw() -> None: @_copy_docstring_and_deprecators(Figure.savefig) -def savefig(*args, **kwargs) -> None: +def savefig(fname: str | os.PathLike | IO, **kwargs) -> None: fig = gcf() # savefig default implementation has no return, so mypy is unhappy # presumably this is here because subclasses can return? - res = fig.savefig(*args, **kwargs) # type: ignore[func-returns-value] + res = fig.savefig(fname, **kwargs) # type: ignore[func-returns-value] fig.canvas.draw_idle() # Need this if 'transparent=True', to reset colors. return res diff --git a/lib/matplotlib/tests/test_pyplot.py b/lib/matplotlib/tests/test_pyplot.py index ab713707bace..55f7c33cb52e 100644 --- a/lib/matplotlib/tests/test_pyplot.py +++ b/lib/matplotlib/tests/test_pyplot.py @@ -1,4 +1,5 @@ import difflib +import inspect import numpy as np import sys @@ -484,3 +485,26 @@ def test_matshow(): # Smoke test that matshow does not ask for a new figsize on the existing figure plt.matshow(arr, fignum=fig.number) + + +def assert_same_signature(func1, func2): + """ + Assert that `func1` and `func2` have the same arguments, + i.e. same parameter count, names and kinds. + + :param func1: First function to check + :param func2: Second function to check + """ + params1 = inspect.signature(func1).parameters + params2 = inspect.signature(func2).parameters + + assert len(params1) == len(params2) + assert all([ + params1[p].name == params2[p].name and + params1[p].kind == params2[p].kind + for p in params1 + ]) + + +def test_setloglevel_signature(): + assert_same_signature(plt.set_loglevel, mpl.set_loglevel) From 4c06e718d4a28d14586b38fcad8d3734e901e719 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jun 2025 23:47:56 +0000 Subject: [PATCH 153/161] Bump github/codeql-action from 3.29.0 to 3.29.2 in the actions group Bumps the actions group with 1 update: [github/codeql-action](https://github.com/github/codeql-action). Updates `github/codeql-action` from 3.29.0 to 3.29.2 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/ce28f5bb42b7a9f2c824e633a3f6ee835bab6858...181d5eefc20863364f96762470ba6f862bdef56b) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: 3.29.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: actions ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c05454884b55..d6d1eba02560 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -32,7 +32,7 @@ jobs: persist-credentials: false - name: Initialize CodeQL - uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0 + uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2 with: languages: ${{ matrix.language }} @@ -43,4 +43,4 @@ jobs: pip install --user -v . - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0 + uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2 From b5235812a83c7eee9901757320c70120caea3d1e Mon Sep 17 00:00:00 2001 From: Antony Lee Date: Tue, 1 Jul 2025 12:47:28 +0200 Subject: [PATCH 154/161] Copy-edit the docstring of AuxTransformBox. It can like be made even clearer; here I tried to just repeat what was written but with a clearer style. Some minor additional edits are included as well. --- lib/matplotlib/offsetbox.py | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/lib/matplotlib/offsetbox.py b/lib/matplotlib/offsetbox.py index 1e07125cdc2a..974cc4f2db05 100644 --- a/lib/matplotlib/offsetbox.py +++ b/lib/matplotlib/offsetbox.py @@ -201,7 +201,7 @@ def _get_aligned_offsets(yspans, height, align="baseline"): class OffsetBox(martist.Artist): """ - The OffsetBox is a simple container artist. + A simple container artist. The child artists are meant to be drawn at a relative position to its parent. @@ -826,17 +826,18 @@ def draw(self, renderer): class AuxTransformBox(OffsetBox): """ - Offset Box with the aux_transform. Its children will be - transformed with the aux_transform first then will be - offsetted. The absolute coordinate of the aux_transform is meaning - as it will be automatically adjust so that the left-lower corner - of the bounding box of children will be set to (0, 0) before the - offset transform. - - It is similar to drawing area, except that the extent of the box - is not predetermined but calculated from the window extent of its - children. Furthermore, the extent of the children will be - calculated in the transformed coordinate. + An OffsetBox with an auxiliary transform. + + All child artists are first transformed with *aux_transform*, then + translated with an offset (the same for all children) so the bounding + box of the children matches the drawn box. (In other words, adding an + arbitrary translation to *aux_transform* has no effect as it will be + cancelled out by the later offsetting.) + + `AuxTransformBox` is similar to `.DrawingArea`, except that the extent of + the box is not predetermined but calculated from the window extent of its + children, and the extent of the children will be calculated in the + transformed coordinate. """ def __init__(self, aux_transform): self.aux_transform = aux_transform @@ -853,10 +854,7 @@ def add_artist(self, a): self.stale = True def get_transform(self): - """ - Return the :class:`~matplotlib.transforms.Transform` applied - to the children - """ + """Return the `.Transform` applied to the children.""" return (self.aux_transform + self.ref_offset_transform + self.offset_transform) @@ -908,7 +906,7 @@ def draw(self, renderer): class AnchoredOffsetbox(OffsetBox): """ - An offset box placed according to location *loc*. + An OffsetBox placed according to location *loc*. AnchoredOffsetbox has a single child. When multiple children are needed, use an extra OffsetBox to enclose them. By default, the offset box is From 1295158096805f6675cbb42f982ff6c1402e9ba7 Mon Sep 17 00:00:00 2001 From: Roman A <121314722+GameRoMan@users.noreply.github.com> Date: Tue, 1 Jul 2025 16:13:17 +0100 Subject: [PATCH 155/161] Add explicit `**options: Any` for `add_subplot` method to remove "partially unknown type" warnings from type checkers like Pyright and Pylance --- lib/matplotlib/figure.pyi | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/matplotlib/figure.pyi b/lib/matplotlib/figure.pyi index e7c5175d8af9..61dc79619a80 100644 --- a/lib/matplotlib/figure.pyi +++ b/lib/matplotlib/figure.pyi @@ -89,19 +89,20 @@ class FigureBase(Artist): # TODO: docstring indicates SubplotSpec a valid arg, but none of the listed signatures appear to be that @overload - def add_subplot(self, *args, projection: Literal["3d"], **kwargs) -> Axes3D: ... + def add_subplot(self, *args: Any, projection: Literal["3d"], **kwargs: Any) -> Axes3D: ... @overload def add_subplot( - self, nrows: int, ncols: int, index: int | tuple[int, int], **kwargs + self, nrows: int, ncols: int, index: int | tuple[int, int], **kwargs: Any ) -> Axes: ... @overload - def add_subplot(self, pos: int, **kwargs) -> Axes: ... + def add_subplot(self, pos: int, **kwargs: Any) -> Axes: ... @overload - def add_subplot(self, ax: Axes, **kwargs) -> Axes: ... + def add_subplot(self, ax: Axes, **kwargs: Any) -> Axes: ... @overload - def add_subplot(self, ax: SubplotSpec, **kwargs) -> Axes: ... + def add_subplot(self, ax: SubplotSpec, **kwargs: Any) -> Axes: ... @overload - def add_subplot(self, **kwargs) -> Axes: ... + def add_subplot(self, **kwargs: Any) -> Axes: ... + @overload def subplots( self, From c8361f0a33c8e88abf8f3862dce8388bd1a00eac Mon Sep 17 00:00:00 2001 From: Tim Hoffmann <2836374+timhoffm@users.noreply.github.com> Date: Wed, 2 Jul 2025 07:36:04 +0200 Subject: [PATCH 156/161] DOC: Recommend to use bare Figure instances for saving to file --- doc/users/faq.rst | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/doc/users/faq.rst b/doc/users/faq.rst index b08bd75cee4e..c6bbc5ca8d87 100644 --- a/doc/users/faq.rst +++ b/doc/users/faq.rst @@ -281,8 +281,23 @@ locators as desired because the two axes are independent. Generate images without having a window appear ---------------------------------------------- -Simply do not call `~matplotlib.pyplot.show`, and directly save the figure to -the desired format:: +The recommended approach since matplotlib 3.1 is to explicitly create a Figure +instance:: + + from matplotlib.figure import Figure + fig = Figure() + ax = fig.subplots() + ax.plot([1, 2, 3]) + fig.savefig('myfig.png') + +This prevents any interaction with GUI frameworks and the window manager. + +It's alternatively still possible to use the pyplot interface. Instead of +calling `matplotlib.pyplot.show`, call `matplotlib.pyplot.savefig`. + +Additionally, you must ensure to close the figure after saving it. Not +closing the figure is a memory leak, because pyplot keeps references +to all not-yet-shown figures:: import matplotlib.pyplot as plt plt.plot([1, 2, 3]) From 919c7b9c440fe97393ee8e15ff35ddc6a338c5c6 Mon Sep 17 00:00:00 2001 From: cvanelteren Date: Wed, 2 Jul 2025 08:34:51 +0200 Subject: [PATCH 157/161] adjust logic to allow inherritance --- lib/matplotlib/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py index 8ffd002d43bc..8f672af70ebc 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -799,13 +799,13 @@ def find_all(self, pattern): """ pattern_re = re.compile(pattern) - return RcParams((key, value) - for key, value in self.items() - if pattern_re.search(key)) + return self.__class__( + (key, value) for key, value in self.items() if pattern_re.search(key) + ) def copy(self): """Copy this RcParams instance.""" - rccopy = RcParams() + rccopy = self.__class__() for k in self: # Skip deprecations and revalidation. rccopy._set(k, self._get(k)) return rccopy From 77f868cbcc5e7cd6e8860fd5eb7934eb9397181c Mon Sep 17 00:00:00 2001 From: ianlv Date: Wed, 2 Jul 2025 15:54:25 +0800 Subject: [PATCH 158/161] chore: remove redundant words in comment Signed-off-by: ianlv --- doc/devel/tag_guidelines.rst | 2 +- doc/users/prev_whats_new/whats_new_3.8.0.rst | 4 ++-- galleries/examples/scales/custom_scale.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/devel/tag_guidelines.rst b/doc/devel/tag_guidelines.rst index 2c80065982bc..2ff77d5279d5 100644 --- a/doc/devel/tag_guidelines.rst +++ b/doc/devel/tag_guidelines.rst @@ -61,7 +61,7 @@ Proposing new tags 1. Review existing tag list, looking out for similar entries (i.e. ``axes`` and ``axis``). 2. If a relevant tag or subcategory does not yet exist, propose it. Each tag is two parts: ``subcategory: tag``. Tags should be one or two words. -3. New tags should be be added when they are relevant to existing gallery entries too. +3. New tags should be added when they are relevant to existing gallery entries too. Avoid tags that will link to only a single gallery entry. 4. Tags can recreate other forms of organization. diff --git a/doc/users/prev_whats_new/whats_new_3.8.0.rst b/doc/users/prev_whats_new/whats_new_3.8.0.rst index 88f987172adb..fe1d5f7a7952 100644 --- a/doc/users/prev_whats_new/whats_new_3.8.0.rst +++ b/doc/users/prev_whats_new/whats_new_3.8.0.rst @@ -359,7 +359,7 @@ The following delimiter names have been supported earlier, but can now be sized * ``\leftparen`` and ``\rightparen`` There are really no obvious advantages in using these. -Instead, they are are added for completeness. +Instead, they are added for completeness. ``mathtext`` documentation improvements --------------------------------------- @@ -513,7 +513,7 @@ Plot Directive now can make responsive images with "srcset" The plot sphinx directive (``matplotlib.sphinxext.plot_directive``, invoked in rst as ``.. plot::``) can be configured to automatically make higher res -figures and add these to the the built html docs. In ``conf.py``:: +figures and add these to the built html docs. In ``conf.py``:: extensions = [ ... diff --git a/galleries/examples/scales/custom_scale.py b/galleries/examples/scales/custom_scale.py index 0eedb16ec5cf..1b6bdd6f3e09 100644 --- a/galleries/examples/scales/custom_scale.py +++ b/galleries/examples/scales/custom_scale.py @@ -22,7 +22,7 @@ * You want to override the default locators and formatters for the axis (``set_default_locators_and_formatters`` below). - * You want to limit the range of the the axis (``limit_range_for_scale`` below). + * You want to limit the range of the axis (``limit_range_for_scale`` below). """ From 70d5ad48fc26045739d5c57538686f7619cfa8bb Mon Sep 17 00:00:00 2001 From: N R Navaneet <156576749+nrnavaneet@users.noreply.github.com> Date: Thu, 3 Jul 2025 10:44:51 +0530 Subject: [PATCH 159/161] Fix FancyArrow rendering for zero-length arrows (#30243) * WIP: changed FancyArrow empty logic * Update test_patches.py * Update test_patches.py * Fix crash when drawing FancyArrow with zero length * Update patches.py * Delete .python-version --- lib/matplotlib/patches.py | 2 +- lib/matplotlib/tests/test_patches.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py index 63453d416b99..477eee9f5a7a 100644 --- a/lib/matplotlib/patches.py +++ b/lib/matplotlib/patches.py @@ -1538,7 +1538,7 @@ def _make_verts(self): length = distance else: length = distance + head_length - if not length: + if np.size(length) == 0: self.verts = np.empty([0, 2]) # display nothing if empty else: # start by drawing horizontal arrow, point at (0, 0) diff --git a/lib/matplotlib/tests/test_patches.py b/lib/matplotlib/tests/test_patches.py index 4ed9222eb95e..d69a9dad4337 100644 --- a/lib/matplotlib/tests/test_patches.py +++ b/lib/matplotlib/tests/test_patches.py @@ -1093,3 +1093,9 @@ def test_facecolor_none_edgecolor_force_edgecolor(): rcParams['patch.edgecolor'] = 'red' rect = Rectangle((0, 0), 1, 1, facecolor="none") assert mcolors.same_color(rect.get_edgecolor(), rcParams['patch.edgecolor']) + + +def test_empty_fancyarrow(): + fig, ax = plt.subplots() + arrow = ax.arrow([], [], [], []) + assert arrow is not None From a87684faa62f86e65da21bfb0942046e5e59b55f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Tue, 1 Jul 2025 19:28:51 +0300 Subject: [PATCH 160/161] Upgrade to Visual Studio 2022 in appveyor.yml --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index a637fe545466..c3fcb0ea9591 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -17,7 +17,7 @@ skip_commits: clone_depth: 50 -image: Visual Studio 2019 +image: Visual Studio 2022 environment: From 6a01311f9181f3ba1801034cb81b31a427deae03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jouni=20K=2E=20Sepp=C3=A4nen?= Date: Thu, 3 Jul 2025 19:37:49 +0300 Subject: [PATCH 161/161] Time out in _get_executable_info Time out after 30 seconds. This is used for version queries which should be very fast, so a 30-second delay would be unusual. GitHub Actions test runs have been hanging trying to get the inkscape version when using Python 3.14: https://github.com/matplotlib/matplotlib/actions/runs/16043158943/job/45268507848#step:13:836 --- lib/matplotlib/__init__.py | 5 ++++- lib/matplotlib/tests/test_matplotlib.py | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py index 8f672af70ebc..e98e8ea07502 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -400,12 +400,15 @@ def impl(args, regex, min_ver=None, ignore_exit_code=False): try: output = subprocess.check_output( args, stderr=subprocess.STDOUT, - text=True, errors="replace") + text=True, errors="replace", timeout=30) except subprocess.CalledProcessError as _cpe: if ignore_exit_code: output = _cpe.output else: raise ExecutableNotFoundError(str(_cpe)) from _cpe + except subprocess.TimeoutExpired as _te: + msg = f"Timed out running {cbook._pformat_subprocess(args)}" + raise ExecutableNotFoundError(msg) from _te except OSError as _ose: raise ExecutableNotFoundError(str(_ose)) from _ose match = re.search(regex, output) diff --git a/lib/matplotlib/tests/test_matplotlib.py b/lib/matplotlib/tests/test_matplotlib.py index 37b41fafdb78..d0a3f8c617e1 100644 --- a/lib/matplotlib/tests/test_matplotlib.py +++ b/lib/matplotlib/tests/test_matplotlib.py @@ -1,6 +1,7 @@ import os import subprocess import sys +from unittest.mock import patch import pytest @@ -80,3 +81,16 @@ def test_importable_with__OO(): [sys.executable, "-OO", "-c", program], env={**os.environ, "MPLBACKEND": ""}, check=True ) + + +@patch('matplotlib.subprocess.check_output') +def test_get_executable_info_timeout(mock_check_output): + """ + Test that _get_executable_info raises ExecutableNotFoundError if the + command times out. + """ + + mock_check_output.side_effect = subprocess.TimeoutExpired(cmd=['mock'], timeout=30) + + with pytest.raises(matplotlib.ExecutableNotFoundError, match='Timed out'): + matplotlib._get_executable_info.__wrapped__('inkscape')