[CR] matplotlib modernization (#380)

* hacking toward display revisions, not yet finished but want to test on old builds before moving forward * fixed #332, pitch contour sonification supports nans (#379) * fixing up test fixtures * correcting fixture names and paths for display * fixing separation * toward a working implementation of axes weakkeydict storage * updated mpl regression tests for labeled intervals * fixing up ticks and margins * updated hierarchy fixtures * revised separation display to use property cyclers * working through some matplotlib hackery * almost done modernizing mpl code... * very nearly done modernizing * docs and styling * rewrote segments to use axvspans * blacked tests * skip segment with text plot tests on old matplotlib * blacked tests * skip certain tests when using old versions of freetype
mir-evaluation · May 13, 2024 · 485a425 · 485a425
1 parent 6b82dde
commit 485a425
Show file tree

Hide file tree

Showing 47 changed files with 408 additions and 178 deletions.
diff --git a/mir_eval/display.py b/mir_eval/display.py
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [tool:pytest]
-addopts = --cov-report term-missing --cov mir_eval --cov-report=xml
+addopts = --cov-report term-missing --cov mir_eval --cov-report=xml --mpl --mpl-baseline-path=baseline_images/test_display
 
 [pydocstyle]
 # convention = numpy

diff --git a/tests/baseline_images/test_display/events.png b/tests/baseline_images/test_display/events.png
diff --git a/tests/baseline_images/test_display/hierarchy_label.png b/tests/baseline_images/test_display/hierarchy_label.png
diff --git a/tests/baseline_images/test_display/hierarchy_nolabel.png b/tests/baseline_images/test_display/hierarchy_nolabel.png
diff --git a/tests/baseline_images/test_display/labeled_events.png b/tests/baseline_images/test_display/labeled_events.png
diff --git a/tests/baseline_images/test_display/labeled_intervals.png b/tests/baseline_images/test_display/labeled_intervals.png
diff --git a/tests/baseline_images/test_display/labeled_intervals_compare.png b/tests/baseline_images/test_display/labeled_intervals_compare.png
diff --git a/tests/baseline_images/test_display/labeled_intervals_compare_common.png b/tests/baseline_images/test_display/labeled_intervals_compare_common.png
diff --git a/tests/baseline_images/test_display/labeled_intervals_compare_noextend.png b/tests/baseline_images/test_display/labeled_intervals_compare_noextend.png
diff --git a/tests/baseline_images/test_display/labeled_intervals_noextend.png b/tests/baseline_images/test_display/labeled_intervals_noextend.png
diff --git a/tests/baseline_images/test_display/multipitch_hz_unvoiced.png b/tests/baseline_images/test_display/multipitch_hz_unvoiced.png
diff --git a/tests/baseline_images/test_display/multipitch_hz_voiced.png b/tests/baseline_images/test_display/multipitch_hz_voiced.png
diff --git a/tests/baseline_images/test_display/multipitch_midi.png b/tests/baseline_images/test_display/multipitch_midi.png
diff --git a/tests/baseline_images/test_display/piano_roll.png b/tests/baseline_images/test_display/piano_roll.png
diff --git a/tests/baseline_images/test_display/piano_roll_midi.png b/tests/baseline_images/test_display/piano_roll_midi.png
diff --git a/tests/baseline_images/test_display/pitch_hz.png b/tests/baseline_images/test_display/pitch_hz.png
diff --git a/tests/baseline_images/test_display/pitch_midi.png b/tests/baseline_images/test_display/pitch_midi.png
diff --git a/tests/baseline_images/test_display/pitch_midi_hz.png b/tests/baseline_images/test_display/pitch_midi_hz.png
diff --git a/tests/baseline_images/test_display/segment.png b/tests/baseline_images/test_display/segment.png
diff --git a/tests/baseline_images/test_display/segment_text.png b/tests/baseline_images/test_display/segment_text.png
diff --git a/tests/baseline_images/test_display/separation.png b/tests/baseline_images/test_display/separation.png
diff --git a/tests/baseline_images/test_display/separation_label.png b/tests/baseline_images/test_display/separation_label.png
diff --git a/tests/baseline_images/test_display/test_display_events.png b/tests/baseline_images/test_display/test_display_events.png
diff --git a/tests/baseline_images/test_display/test_display_hierarchy_label.png b/tests/baseline_images/test_display/test_display_hierarchy_label.png
diff --git a/tests/baseline_images/test_display/test_display_hierarchy_nolabel.png b/tests/baseline_images/test_display/test_display_hierarchy_nolabel.png
diff --git a/tests/baseline_images/test_display/test_display_labeled_events.png b/tests/baseline_images/test_display/test_display_labeled_events.png
diff --git a/tests/baseline_images/test_display/test_display_labeled_intervals.png b/tests/baseline_images/test_display/test_display_labeled_intervals.png
diff --git a/tests/baseline_images/test_display/test_display_labeled_intervals_compare.png b/tests/baseline_images/test_display/test_display_labeled_intervals_compare.png
diff --git a/.../baseline_images/test_display/test_display_labeled_intervals_compare_common.png b/.../baseline_images/test_display/test_display_labeled_intervals_compare_common.png
diff --git a/...aseline_images/test_display/test_display_labeled_intervals_compare_noextend.png b/...aseline_images/test_display/test_display_labeled_intervals_compare_noextend.png
diff --git a/tests/baseline_images/test_display/test_display_labeled_intervals_noextend.png b/tests/baseline_images/test_display/test_display_labeled_intervals_noextend.png
diff --git a/tests/baseline_images/test_display/test_display_multipitch_hz_unvoiced.png b/tests/baseline_images/test_display/test_display_multipitch_hz_unvoiced.png
diff --git a/tests/baseline_images/test_display/test_display_multipitch_hz_voiced.png b/tests/baseline_images/test_display/test_display_multipitch_hz_voiced.png
diff --git a/tests/baseline_images/test_display/test_display_multipitch_midi.png b/tests/baseline_images/test_display/test_display_multipitch_midi.png
diff --git a/tests/baseline_images/test_display/test_display_piano_roll.png b/tests/baseline_images/test_display/test_display_piano_roll.png
diff --git a/tests/baseline_images/test_display/test_display_piano_roll_midi.png b/tests/baseline_images/test_display/test_display_piano_roll_midi.png
diff --git a/tests/baseline_images/test_display/test_display_pitch_hz.png b/tests/baseline_images/test_display/test_display_pitch_hz.png
diff --git a/tests/baseline_images/test_display/test_display_pitch_midi.png b/tests/baseline_images/test_display/test_display_pitch_midi.png
diff --git a/tests/baseline_images/test_display/test_display_pitch_midi_hz.png b/tests/baseline_images/test_display/test_display_pitch_midi_hz.png
diff --git a/tests/baseline_images/test_display/test_display_segment.png b/tests/baseline_images/test_display/test_display_segment.png
diff --git a/tests/baseline_images/test_display/test_display_segment_text.png b/tests/baseline_images/test_display/test_display_segment_text.png
diff --git a/tests/baseline_images/test_display/test_display_separation.png b/tests/baseline_images/test_display/test_display_separation.png
diff --git a/tests/baseline_images/test_display/test_display_separation_label.png b/tests/baseline_images/test_display/test_display_separation_label.png
diff --git a/tests/baseline_images/test_display/test_display_ticker_midi_zoom.png b/tests/baseline_images/test_display/test_display_ticker_midi_zoom.png
diff --git a/tests/baseline_images/test_display/ticker_midi_zoom.png b/tests/baseline_images/test_display/ticker_midi_zoom.png