diff --git a/doc/api/next_api_changes/removals.rst b/doc/api/next_api_changes/removals.rst index 8c41ada50790..3d36e452625e 100644 --- a/doc/api/next_api_changes/removals.rst +++ b/doc/api/next_api_changes/removals.rst @@ -2,6 +2,11 @@ Removals -------- The following deprecated APIs have been removed: +Modules +~~~~~~~ +- ``backends.qt_editor.formlayout`` (use the formlayout module available on + PyPI instead). + Classes and methods ~~~~~~~~~~~~~~~~~~~ - ``backend_bases.RendererBase.strip_math()`` @@ -126,3 +131,7 @@ rcParams :rc:`savefig.facecolor` to "none" to get a transparent background. - The ``pgf.debug``, ``verbose.fileo`` and ``verbose.verbose.level`` rcParams, which had no effect, have been removed. + +Environment variables +~~~~~~~~~~~~~~~~~~~~~ +- ``MATPLOTLIBDATA`` (no replacement). diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py index 323794f0632c..ff6e46975d10 100644 --- a/lib/matplotlib/__init__.py +++ b/lib/matplotlib/__init__.py @@ -510,15 +510,6 @@ def get_cachedir(): def _get_data_path(): """Return the path to matplotlib data.""" - if 'MATPLOTLIBDATA' in os.environ: - path = os.environ['MATPLOTLIBDATA'] - 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 - path = Path(__file__).with_name("mpl-data") if path.is_dir(): return str(path) diff --git a/lib/matplotlib/backends/qt_editor/formlayout.py b/lib/matplotlib/backends/qt_editor/formlayout.py deleted file mode 100644 index a6c3f75ee167..000000000000 --- a/lib/matplotlib/backends/qt_editor/formlayout.py +++ /dev/null @@ -1,7 +0,0 @@ -from .. import cbook -from ._formlayout import * - - -cbook.warn_deprecated( - "3.1", name=__name__, obj_type="module", - alternative="the formlayout module available on PyPI")