Merge pull request #24445 from rcomer/noplot-warning

tacaswell · web-flow · commit faf88bf807b9 · 2023-02-01T11:00:09.000-05:00
Makefile html-noplot,clean: constrained layout tutorial image handling
diff --git a/doc/Makefile b/doc/Makefile
@@ -24,6 +24,7 @@ clean:
 	rm -rf "$(SOURCEDIR)/tutorials"
 	rm -rf "$(SOURCEDIR)/savefig"
 	rm -rf "$(SOURCEDIR)/sphinxext/__pycache__"
+	rm -f $(SOURCEDIR)/_static/constrained_layout*.png
 
 show:
 	@python -c "import webbrowser; webbrowser.open_new_tab('file://$(shell pwd)/build/html/index.html')"
diff --git a/doc/conf.py b/doc/conf.py
@@ -252,8 +252,9 @@ def matplotlib_reduced_latex_scraper(block, block_vars, gallery_conf,
 
     def gallery_image_warning_filter(record):
         msg = record.msg
-        for gallery_dir in sphinx_gallery_conf['gallery_dirs']:
-            if msg.startswith(f'image file not readable: {gallery_dir}'):
+        for pattern in (sphinx_gallery_conf['gallery_dirs'] +
+                        ['_static/constrained_layout']):
+            if msg.startswith(f'image file not readable: {pattern}'):
                 return False
 
         if msg == 'Could not obtain image size. :scale: option is ignored.':
