Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 4b66272

Browse files
tacaswelltacaswell
committed
Merge remote-tracking branch 'matplotlib/v1.5.x' into v2.x
2 parents fa2204e + 06bd110 commit 4b66272

14 files changed

Lines changed: 125 additions & 787 deletions

File tree

‎LICENSE/LICENSE_SCIKIT-IMAGE‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎doc/conf.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,12 @@
4040
try:
4141
from IPython.sphinxext import ipython_console_highlighting
4242
except ImportError:
43-
extensions.append('matplotlib.sphinxext.ipython_console_highlighting')
43+
raise ImportError(
44+
"IPython must be installed to build the matplotlib docs")
4445
else:
45-
print("Using IPython's ipython_console_highlighting directive")
4646
extensions.append('IPython.sphinxext.ipython_console_highlighting')
4747
extensions.append('IPython.sphinxext.ipython_directive')
48+
4849
try:
4950
import numpydoc
5051
except ImportError:

0 commit comments

Comments
 (0)