[WIP]fixing matplotlib generation flag for ALL images

SidharthBansal · SidharthBansal · commit cd7dda9ae2b6 · 2020-07-15T09:29:32.000+05:30
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -205,7 +205,7 @@ def copy_baseline(self, baseline, extension):
                 f"{orig_expected_path}") from err
         return expected_fname
 
-    def compare(self, idx, baseline, extension, *, _lock=False):
+    def compare(self, idx, baseline, extension, *, _lock=False, generating=False):
         __tracebackhide__ = True
         fignum = plt.get_fignums()[idx]
         fig = plt.figure(fignum)
@@ -222,9 +222,12 @@ def compare(self, idx, baseline, extension, *, _lock=False):
 
         lock = cbook._lock_path(actual_path) if _lock else nullcontext()
         with lock:
-            fig.savefig(actual_path, **kwargs)
-            expected_path = self.copy_baseline(baseline, extension)
-            _raise_on_image_difference(expected_path, actual_path, self.tol)
+            if(generating):
+                fig.savefig(actual_path, **kwargs)
+            else:
+                fig.savefig(actual_path, **kwargs)
+                expected_path = self.copy_baseline(baseline, extension)
+                _raise_on_image_difference(expected_path, actual_path, self.tol)
 
 
 def _pytest_image_comparison(baseline_images, extensions, tol,
@@ -255,6 +258,7 @@ def wrapper(*args, extension, request, **kwargs):
                 kwargs['extension'] = extension
             if 'request' in old_sig.parameters:
                 kwargs['request'] = request
+            matplotlib_baseline_image_generation = request.config.getoption("--matplotlib_baseline_image_generation")
 
             img = _ImageComparisonBase(func, tol=tol, remove_text=remove_text,
                                        savefig_kwargs=savefig_kwargs)
@@ -280,7 +284,7 @@ def wrapper(*args, extension, request, **kwargs):
                 "Test generated {} images but there are {} baseline images"
                 .format(len(plt.get_fignums()), len(our_baseline_images)))
             for idx, baseline in enumerate(our_baseline_images):
-                img.compare(idx, baseline, extension, _lock=needs_lock)
+                img.compare(idx, baseline, extension, _lock=needs_lock, generating=matplotlib_baseline_image_generation)
 
         parameters = list(old_sig.parameters.values())
         if 'extension' not in old_sig.parameters:
diff --git a/lib/matplotlib/tests/test_agg.py b/lib/matplotlib/tests/test_agg.py
@@ -80,7 +80,6 @@ def test_long_path():
     fig.savefig(buff, format='png')
 
 
-@pytest.mark.matplotlib_baseline_image_generation
 @image_comparison(['agg_filter.png'], remove_text=True)
 def test_agg_filter():
     def smooth1d(x, window_len):
diff --git a/lib/matplotlib/tests/test_agg_filter.py b/lib/matplotlib/tests/test_agg_filter.py
@@ -4,7 +4,6 @@
 from matplotlib.testing.decorators import image_comparison
 
 
-@pytest.mark.baseline_image_generation_test
 @image_comparison(baseline_images=['agg_filter_alpha'],
                   extensions=['png', 'pdf'])
 def test_agg_filter_alpha():
diff --git a/lib/mpl_toolkits/tests/__init__.py b/lib/mpl_toolkits/tests/__init__.py
@@ -1,9 +0,0 @@
-# Check for the mpl_toolkits_baseline_images.
-try:
-    import mpl_toolkits_baseline_images
-except:
-    raise ImportError(
-        'The baseline image directory does not exist. '
-        'This is most likely because the test data is not installed. '
-        'You may need to install mpl_toolkits_baseline_images to get the '
-        'test data.')
diff --git a/lib/mpl_toolkits/tests/conftest.py b/lib/mpl_toolkits/tests/conftest.py
@@ -1,3 +1,4 @@
 from matplotlib.testing.conftest import (mpl_test_settings,
                                          mpl_image_comparison_parameters,
-                                         pytest_configure, pytest_unconfigure)
+                                         pytest_configure, pytest_unconfigure, pytest_addoption, pytest_configure,
+                                         pytest_collection_modifyitems)
diff --git a/prog.py b/prog.py
@@ -0,0 +1,6 @@
+import argparse
+parser = argparse.ArgumentParser()
+parser.add_argument("matplotlib_baseline_images_generation_mode", type=int,
+                    help="Set the test suite in baseline image generation mode if value is 1 else set the test suite in")
+args = parser.parse_args()
+print(args.matplotlib_baseline_images_generation_mode)
