Drop pytest-mpl

.gitignore

@@ -116,3 +116,4 @@ TODO.txt
 b_asic/_version.py
 docs_sphinx/_build/
 docs_sphinx/examples
+result_images/

.gitlab-ci.yml

@@ -23,7 +23,7 @@ before_script:
 .run-test:
   stage: test
   script:
-    - pytest --cov=b_asic --cov-report=xml:cov.xml --cov-report=term --cov-branch --color=yes test --mpl --timeout=20 --durations=10
+    - pytest --cov=b_asic --cov-report=xml:cov.xml --cov-report=term --cov-branch --color=yes test --timeout=20 --durations=10
     # - lcov --capture --directory . --output-file coverage.info
     # - lcov --output-file coverage.info --extract coverage.info $PWD/src/'*' $PWD/b_asic/'*'
     # - lcov --list coverage.info

README.md

@@ -127,13 +127,15 @@ pytest
 pytest --cov=b_asic --cov-report=html test
 ```
 
-#### Test including plots
+#### Generate new baseline images for the tests
+
+In `B-ASIC`:
 
 ```
-pytest --mpl
+pytest      # The image comparison tests will fail
+cp -a result_images/* test/baseline_images/
 ```
 
-
 ### Generating documentation
 
 ```

requirements_test.txt

 pytest
 pytest-cov
 pytest-qt
-pytest-mpl
 pytest-timeout
 pytest-xvfb
 pytest-xdist

test/test_resources.py

@@ -2,6 +2,7 @@ import re
 
 import matplotlib.pyplot as plt
 import pytest
+import matplotlib.testing.decorators
 
 from b_asic.core_operations import ConstantMultiplication
 from b_asic.process import PlainMemoryVariable
@@ -13,13 +14,13 @@ from b_asic.resources import ProcessCollection, _ForwardBackwardTable
 
 
 class TestProcessCollectionPlainMemoryVariable:
-    @pytest.mark.mpl_image_compare(style='mpl20')
+    @matplotlib.testing.decorators.image_comparison(['test_draw_process_collection.png'])
     def test_draw_process_collection(self, simple_collection):
         fig, ax = plt.subplots()
         simple_collection.plot(ax=ax, show_markers=False)
         return fig
 
-    @pytest.mark.mpl_image_compare(style='mpl20')
+    @matplotlib.testing.decorators.image_comparison(['test_draw_matrix_transposer_4.png'])
     def test_draw_matrix_transposer_4(self):
         fig, ax = plt.subplots()
         generate_matrix_transposer(4).plot(ax=ax)  # type: ignore
@@ -31,7 +32,7 @@ class TestProcessCollectionPlainMemoryVariable:
         )
         assert len(collection_split) == 3
 
-    @pytest.mark.mpl_image_compare(style='mpl20')
+    @matplotlib.testing.decorators.image_comparison(['test_left_edge_cell_assignment.png'])
     def test_left_edge_cell_assignment(self, simple_collection: ProcessCollection):
         fig, ax = plt.subplots(1, 2)
         assignment = list(simple_collection._left_edge_assignment())
@@ -157,7 +158,7 @@ class TestProcessCollectionPlainMemoryVariable:
         assert len(simple_collection) == 7
         assert new_proc not in simple_collection
 
-    @pytest.mark.mpl_image_compare(style='mpl20')
+    @matplotlib.testing.decorators.image_comparison(['test_max_min_lifetime_bar_plot.png'])
     def test_max_min_lifetime_bar_plot(self):
         fig, ax = plt.subplots()
         collection = ProcessCollection(

test/test_schedule.py

@@ -4,6 +4,7 @@ B-ASIC test suite for the schedule module and Schedule class.
 import re
 
 import pytest
+import matplotlib.testing.decorators
 
 from b_asic.core_operations import Addition, Butterfly, ConstantMultiplication
 from b_asic.process import OperatorProcess
@@ -681,7 +682,7 @@ class TestProcesses:
 
 
 class TestFigureGeneration:
-    @pytest.mark.mpl_image_compare(remove_text=True, style='mpl20')
+    @matplotlib.testing.decorators.image_comparison(['test__get_figure_no_execution_times.png'], remove_text=True)
     def test__get_figure_no_execution_times(self, secondorder_iir_schedule):
         return secondorder_iir_schedule._get_figure()