Merge de479fd into d295763

docs/conf.py

@@ -28,22 +28,14 @@
 
 import sphinx.environment
 
-_warn_node_old = sphinx.environment.BuildEnvironment.warn_node
-
-
-def _warn_node(self, msg, *args, **kwargs):
-    """Do not warn on external images."""
-    if not msg.startswith('nonlocal image URI found:'):
-        _warn_node_old(self, msg, *args, **kwargs)
-
-sphinx.environment.BuildEnvironment.warn_node = _warn_node
-
-
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
 # needs_sphinx = '1.0'
 
+# Do not warn on external images.
+suppress_warnings = ['image.nonlocal_uri']
+
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.

setup.py

@@ -45,7 +45,7 @@
 
 extras_require = {
     'docs': [
-        'Sphinx>=1.3',
+        'Sphinx>=1.4.2',
     ],
     'tests': tests_require,
 }