Move pytest_configure into installed area.

QuLogic · QuLogic · commit 25fdef89a429 · 2017-02-02T18:20:33.000-05:00
This allows it to work when run via matplotlib.test().
diff --git a/conftest.py b/conftest.py
diff --git a/lib/matplotlib/sphinxext/tests/conftest.py b/lib/matplotlib/sphinxext/tests/conftest.py
@@ -1,4 +1,5 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 
-from matplotlib.tests.conftest import mpl_test_settings
+from matplotlib.tests.conftest import (mpl_test_settings,
+                                       pytest_configure, pytest_unconfigure)
diff --git a/lib/matplotlib/tests/conftest.py b/lib/matplotlib/tests/conftest.py
@@ -6,6 +6,16 @@
 import matplotlib
 
 
+def pytest_configure(config):
+    matplotlib.use('agg')
+    matplotlib._called_from_pytest = True
+    matplotlib._init_tests()
+
+
+def pytest_unconfigure(config):
+    matplotlib._called_from_pytest = False
+
+
 @pytest.fixture(autouse=True)
 def mpl_test_settings(request):
     from matplotlib.testing.decorators import _do_cleanup
diff --git a/lib/mpl_toolkits/tests/conftest.py b/lib/mpl_toolkits/tests/conftest.py
@@ -1,4 +1,5 @@
 from __future__ import (absolute_import, division, print_function,
                         unicode_literals)
 
-from matplotlib.tests.conftest import mpl_test_settings
+from matplotlib.tests.conftest import (mpl_test_settings,
+                                       pytest_configure, pytest_unconfigure)
