Skip to content

Reduce redundant information in _process_plot_var_args.#26840

Merged
ksunden merged 2 commits intomatplotlib:mainfrom
anntzer:ppvars
Sep 20, 2023
Merged

Reduce redundant information in _process_plot_var_args.#26840
ksunden merged 2 commits intomatplotlib:mainfrom
anntzer:ppvars

Conversation

@anntzer
Copy link
Copy Markdown
Contributor

@anntzer anntzer commented Sep 20, 2023

_prop_keys is redundant with _cycler_items and not really needed anywhere. Removing it makes it less likely that a _process_plot_var_args gets in an invalid state if _cycler_items is updated while _prop_keys is not touched.

Inspired by #26831.

A second separate commit adds some minor cleanups.

PR summary

PR checklist

_prop_keys is redundant with _cycler_items and not really needed
anywhere.  Removing it makes it less likely that a
_process_plot_var_args gets in an invalid state if _cycler_items is
updated while _prop_keys is not touched.
- Swap arguments on _getdefaults so that ignores can be made optional.
- Inline some temporaries, and use more comprehensions.
@tacaswell
Copy link
Copy Markdown
Member

failures look unrelated (build system looks like it is fighting back):

ERROR  -   File "/home/runner/work/matplotlib/matplotlib/lib/matplotlib/_version.py", line 4
131
    __version__ : str = version : str = '3.9.0.dev259+gf912eb0767'
132
                                ^
133
SyntaxError: invalid syntax
134
ERROR  -   File "/home/runner/work/matplotlib/matplotlib/lib/matplotlib/_version.py", line 4
135
    __version__ : str = version : str = '3.9.0.dev259+gf912eb0767'
136
                                ^
137
SyntaxError: invalid syntax

@ksunden
Copy link
Copy Markdown
Member

ksunden commented Sep 20, 2023

Yes, that resulted from the (now yanked) setuptools-scm v8.0.0, so restarting tests now that that shouldn't be a problem.

@ksunden ksunden closed this Sep 20, 2023
@ksunden ksunden reopened this Sep 20, 2023
@ksunden
Copy link
Copy Markdown
Member

ksunden commented Sep 20, 2023

Remaining CI failures appear to be #26846 (plus the doc build which seems to have not rebooted on that power cycle, but this is only touching private functionality anyway, so not too concerned about that)

@ksunden ksunden merged commit ab1b6a3 into matplotlib:main Sep 20, 2023
@anntzer anntzer deleted the ppvars branch September 20, 2023 21:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants