Skip to content

Commit 559c915

Browse files
committed
Merge pull request matplotlib#3390 from cgohlke/move_stylelib
Move stylelib directory to mpl-data
2 parents fb27b4c + d4abb37 commit 559c915

File tree

8 files changed

+3
-3
lines changed

8 files changed

+3
-3
lines changed

MANIFEST.in

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ include lib/matplotlib/mpl-data/images/*
99
include lib/matplotlib/mpl-data/fonts/ttf/*
1010
include lib/matplotlib/mpl-data/fonts/pdfcorefonts/*
1111
include lib/matplotlib/mpl-data/fonts/afm/*
12+
include lib/matplotlib/mpl-data/stylelib/*
1213
recursive-include lib/matplotlib/mpl-data/sample_data *
1314
recursive-include LICENSE *
1415
recursive-include examples *

lib/matplotlib/style/core.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
__all__ = ['use', 'context', 'available', 'library', 'reload_library']
2828

2929

30-
_here = os.path.abspath(os.path.dirname(__file__))
31-
BASE_LIBRARY_PATH = os.path.join(_here, 'stylelib')
30+
BASE_LIBRARY_PATH = os.path.join(mpl.get_data_path(), 'stylelib')
3231
# Users may want multiple library paths, so store a list of paths.
3332
USER_LIBRARY_PATHS = [os.path.join(mpl._get_configdir(), 'stylelib')]
3433
STYLE_EXTENSION = 'mplstyle'

setupext.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ def get_package_data(self):
585585
'backends/web_backend/jquery/css/themes/base/images/*',
586586
'backends/web_backend/css/*.*',
587587
'backends/Matplotlib.nib/*',
588-
'style/stylelib/*.mplstyle',
588+
'mpl-data/stylelib/*.mplstyle',
589589
]}
590590

591591

0 commit comments

Comments
 (0)