matplotlib · NelleV · Oct 19, 2016 · Jan 10, 2015 · Jan 10, 2015
diff --git a/ci/conda_recipe/run_test.py b/ci/conda_recipe/run_test.py
@@ -1,11 +1,10 @@
 import os
-import platform 
+import platform
 import sys

 import matplotlib
 import matplotlib.pyplot
 import matplotlib._cntr
-import matplotlib._delaunay
 import matplotlib._image
 import matplotlib._path
 import matplotlib._png

diff --git a/doc/api/api_changes/code_removal.rst b/doc/api/api_changes/code_removal.rst
@@ -0,0 +1,12 @@
+Code Removal
+````````````
+
+matplotlib.delaunay
+-------------------
+Remove the delaunay triangulation code which is now handled by Qhull
+via ``matplotlib.tri``
+
+
+qt4_compat.py
+-------------
+Moved to ``qt_compat.py``.  Renamed because it now handles Qt5 as well.
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1492,7 +1492,6 @@ def _jupyter_nbextension_paths():
    'matplotlib.tests.test_container',
    'matplotlib.tests.test_contour',
    'matplotlib.tests.test_dates',
-    'matplotlib.tests.test_delaunay',
    'matplotlib.tests.test_dviread',
    'matplotlib.tests.test_figure',
    'matplotlib.tests.test_font_manager',

diff --git a/lib/matplotlib/backends/qt4_compat.py b/lib/matplotlib/backends/qt4_compat.py