From 481e267fb1f98d352e86efa17a7f5ff7485852e4 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Wed, 15 Jun 2016 07:45:19 +0100 Subject: [PATCH 1/3] Include matplotlibrc from _static It may not be in lib unless matplotlib has been build from source here --- doc/users/customizing.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/users/customizing.rst b/doc/users/customizing.rst index b9aa3cb7162b..ae9bc5c4efb8 100644 --- a/doc/users/customizing.rst +++ b/doc/users/customizing.rst @@ -94,4 +94,4 @@ A sample matplotlibrc file `(download) <../_static/matplotlibrc>`__ -.. literalinclude:: ../../lib/matplotlib/mpl-data/matplotlibrc +.. literalinclude:: ../_static/matplotlibrc From f99c93fe0083fd23f308a86527fa3a7b212ae8c8 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Wed, 15 Jun 2016 07:46:05 +0100 Subject: [PATCH 2/3] Change python references in docs to a version that we support --- doc/users/customizing.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/users/customizing.rst b/doc/users/customizing.rst index ae9bc5c4efb8..7fcdc7ba7594 100644 --- a/doc/users/customizing.rst +++ b/doc/users/customizing.rst @@ -70,8 +70,8 @@ locations, in the following order: 4. :file:`{INSTALL}/matplotlib/mpl-data/matplotlibrc`, where :file:`{INSTALL}` is something like - :file:`/usr/lib/python2.5/site-packages` on Linux, and maybe - :file:`C:\\Python25\\Lib\\site-packages` on Windows. Every time you + :file:`/usr/lib/python3.5/site-packages` on Linux, and maybe + :file:`C:\\Python35\\Lib\\site-packages` on Windows. Every time you install matplotlib, this file will be overwritten, so if you want your customizations to be saved, please move this file to your user-specific matplotlib directory. From db3316a33e1cc34dadc8f0aec28adb5ce6cec140 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Wed, 15 Jun 2016 07:48:07 +0100 Subject: [PATCH 3/3] Remove no longer existing example from backend_driver --- examples/tests/backend_driver.py | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/tests/backend_driver.py b/examples/tests/backend_driver.py index 8f2eddad61a9..d57d19553b4d 100755 --- a/examples/tests/backend_driver.py +++ b/examples/tests/backend_driver.py @@ -202,7 +202,6 @@ 'masked_demo.py', 'mathtext_demo.py', 'mathtext_examples.py', - 'matplotlib_icon.py', 'matshow.py', 'mri_demo.py', 'mri_with_eeg.py',