8000 Assume that mpl-data is in its standard location. · matplotlib/matplotlib@4833d99 · GitHub
[go: up one dir, main page]

Skip to content 8000

Commit 4833d99

Browse files
committed
Assume that mpl-data is in its standard location.
The previous candidates tested in get_candidate_paths were for 1) when matplotlib itself was a namespace package (a long time ago, before mpl_toolkits were move out of matplotlib proper), and 2) py2exe support, which is deprecated (see deprecation of get_py2exe_datafiles). Just to be sure in case someone else is relying on the paths in get_candidate_paths, emit a deprecation warning in case they are needed, but let's not bother with an API changes note (it's not even clear how to word that). Note that redistributors (e.g. linux distro packagers) who may want to move mpl-data out can still do so by patching out the entire `_get_data_path` function.
1 parent fdc7a8c commit 4833d99

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

lib/matplotlib/__init__.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,8 +607,16 @@ def _get_data_path():
607607
"3.1", name="MATPLOTLIBDATA", obj_type="environment variable")
608608
return path
609609

610+
path = Path(__file__).with_name("mpl-data")
611+
if path.is_dir():
612+
return str(path)
613+
614+
cbook.warn_deprecated(
615+
"3.2", message="Matplotlib installs where the data is not in the "
616+
"mpl-data subdirectory of the package are deprecated since %(since)s "
617+
"and support for them will be removed %(removal)s.")
618+
610619
def get_candidate_paths():
611-
yield Path(__file__).with_name('mpl-data')
612620
# setuptools' namespace_packages may hijack this init file
613621
# so need to try something known to be in Matplotlib, not basemap.
614622
import matplotlib.afm

0 commit comments

Comments
 (0)
0