Merge pull request #13552 from meeseeksmachine/auto-backport-of-pr-11241-on-v3.1.x

QuLogic · web-flow · commit 334d875891bd · 2019-02-28T23:33:54.000-05:00
Backport PR #11241 on branch v3.1.x (Deprecate the MATPLOTLIBDATA environment variable.)
diff --git a/doc/api/next_api_changes/2018-08-17-AL-deprecations.rst b/doc/api/next_api_changes/2018-08-17-AL-deprecations.rst
@@ -12,3 +12,6 @@ The following API elements are deprecated:
 - ``cbook.get_label``, ``cbook.iterable``,
 - ``font_manager.OSXInstalledFonts``,
 - ``mlab.demean``,
+
+The following environment variables are deprecated:
+- ``MATPLOTLIBDATA``,
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -606,6 +606,8 @@ def _get_data_path():
         if not os.path.isdir(path):
             raise RuntimeError('Path in environment MATPLOTLIBDATA not a '
                                'directory')
+        cbook.warn_deprecated(
+            "3.1", name="MATPLOTLIBDATA", obj_type="environment variable")
         return path
 
     def get_candidate_paths():
