Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move stylelib directory to mpl-data #3390

Merged
merged 4 commits into from Aug 21, 2014
Merged

Move stylelib directory to mpl-data #3390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f27b180
Move stylelib to mpl-data
cgohlke Aug 20, 2014
31b63f9
Load styles from mpl-data
cgohlke Aug 20, 2014
7afa906
Include stylelib files in MANIFEST.in
cgohlke Aug 20, 2014
d4abb37
Include stylelib files in package_data
cgohlke Aug 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions MANIFEST.in
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ include lib/matplotlib/mpl-data/images/*
include lib/matplotlib/mpl-data/fonts/ttf/*
include lib/matplotlib/mpl-data/fonts/pdfcorefonts/*
include lib/matplotlib/mpl-data/fonts/afm/*
include lib/matplotlib/mpl-data/stylelib/*
recursive-include lib/matplotlib/mpl-data/sample_data *
recursive-include LICENSE *
recursive-include examples *
Expand Down
0 lib/matplotlib/style/stylelib/bmh.mplstyle → ...matplotlib/mpl-data/stylelib/bmh.mplstyle
View file
Open in desktop
File renamed without changes.
0 ...b/style/stylelib/dark_background.mplstyle → ...pl-data/stylelib/dark_background.mplstyle
View file
Open in desktop
File renamed without changes.
0 ...b/style/stylelib/fivethirtyeight.mplstyle → ...pl-data/stylelib/fivethirtyeight.mplstyle
View file
Open in desktop
File renamed without changes.
0 ...matplotlib/style/stylelib/ggplot.mplstyle → ...plotlib/mpl-data/stylelib/ggplot.mplstyle
View file
Open in desktop
File renamed without changes.
0 ...plotlib/style/stylelib/grayscale.mplstyle → ...tlib/mpl-data/stylelib/grayscale.mplstyle
View file
Open in desktop
File renamed without changes.
3 changes: 1 addition & 2 deletions lib/matplotlib/style/core.py
View file
Open in desktop
Expand Up @@ -27,8 +27,7 @@
__all__ = ['use', 'context', 'available', 'library', 'reload_library']


_here = os.path.abspath(os.path.dirname(__file__))
BASE_LIBRARY_PATH = os.path.join(_here, 'stylelib')
BASE_LIBRARY_PATH = os.path.join(mpl.get_data_path(), 'stylelib')
# Users may want multiple library paths, so store a list of paths.
USER_LIBRARY_PATHS = [os.path.join(mpl._get_configdir(), 'stylelib')]
STYLE_EXTENSION = 'mplstyle'
Expand Down
2 changes: 1 addition & 1 deletion setupext.py
View file
Open in desktop
Expand Up @@ -585,7 +585,7 @@ def get_package_data(self):
'backends/web_backend/jquery/css/themes/base/images/*',
'backends/web_backend/css/*.*',
'backends/Matplotlib.nib/*',
'style/stylelib/*.mplstyle',
'mpl-data/stylelib/*.mplstyle',
]}


Expand Down