peeweep/python-matplotlib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to latest version.

Browse Source
This commit is contained in:
Elliott Sales de Andrade
2018-08-13 21:27:10 -04:00
parent 862f207d27
commit a6c4a06cef
7 changed files with 106 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
0001-matplotlibrc-path-search-fix.patch
+14 -15
View File
@@ -1,4 +1,4 @@
From 47e4d5c14793503a7af7919a1fb7aaa04016c9e3 Mon Sep 17 00:00:00 2001
From e318adb6b70cdb27eb8cd5235909b8e8430080d7 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Wed, 27 Sep 2017 19:35:59 -0400
Subject: [PATCH 1/3] matplotlibrc path search fix
@@ -6,14 +6,14 @@ Subject: [PATCH 1/3] matplotlibrc path search fix
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
lib/matplotlib/__init__.py | 8 +++++---
lib/matplotlib/tests/test_rcparams.py | 23 ++++++++++++++++-------
2 files changed, 21 insertions(+), 10 deletions(-)
lib/matplotlib/tests/test_rcparams.py | 22 ++++++++++++++++------
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
index 93397070f..98560d9db 100644
index c5accc3c3..bc38f316c 100644
--- a/lib/matplotlib/__init__.py
+++ b/lib/matplotlib/__init__.py
@@ -739,9 +739,12 @@ def _get_data_path():
@@ -738,9 +738,12 @@ def _get_data_path():
_file = _decode_filesystem_path(__file__)
path = os.sep.join([os.path.dirname(_file), 'mpl-data'])
@@ -26,7 +26,7 @@ index 93397070f..98560d9db 100644
# setuptools' namespace_packages may highjack this init file
# so need to try something known to be in matplotlib, not basemap
import matplotlib.afm
@@ -822,8 +825,7 @@ def matplotlib_fname():
@@ -821,8 +824,7 @@ def matplotlib_fname():
- `$HOME/.matplotlib/matplotlibrc` if `$HOME` is defined.
@@ -36,7 +36,7 @@ index 93397070f..98560d9db 100644
"""
def gen_candidates():
@@ -836,7 +838,7 @@ def matplotlib_fname():
@@ -835,7 +837,7 @@ def matplotlib_fname():
yield matplotlibrc
yield os.path.join(matplotlibrc, 'matplotlibrc')
yield os.path.join(_get_configdir(), 'matplotlibrc')
@@ -46,10 +46,10 @@ index 93397070f..98560d9db 100644
for fname in gen_candidates():
if os.path.exists(fname):
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
index 4d93a9914..1d2097827 100644
index c0378e1bf..7f14bcc46 100644
--- a/lib/matplotlib/tests/test_rcparams.py
+++ b/lib/matplotlib/tests/test_rcparams.py
@@ -424,15 +424,25 @@ def test_rcparams_reset_after_fail():
@@ -424,14 +424,25 @@ def test_rcparams_reset_after_fail():
assert mpl.rcParams['text.usetex'] is False
@@ -72,14 +72,13 @@ index 4d93a9914..1d2097827 100644
dep1 = mpl._all_deprecated
dep2 = mpl._deprecated_set
deprecated = list(dep1.union(dep2))
- #print(deprecated)
- path_to_rc = mpl.matplotlib_fname()
- path_to_rc = os.path.join(mpl.get_data_path(), 'matplotlibrc')
- with open(path_to_rc, "r") as f:
+ with open(mplrc, "r") as f:
rclines = f.readlines()
missing = {}
for k,v in mpl.defaultParams.items():
@@ -454,11 +464,10 @@ def test_if_rctemplate_is_up_to_date():
for k, v in mpl.defaultParams.items():
@@ -453,11 +464,10 @@ def test_if_rctemplate_is_up_to_date():
.format(missing.items()))
@@ -87,12 +86,12 @@ index 4d93a9914..1d2097827 100644
+def test_if_rctemplate_would_be_valid(tmpdir, mplrc):
# This tests if the matplotlibrc.template file would result in a valid
# rc file if all lines are uncommented.
- path_to_rc = mpl.matplotlib_fname()
- path_to_rc = os.path.join(mpl.get_data_path(), 'matplotlibrc')
- with open(path_to_rc, "r") as f:
+ with open(mplrc, "r") as f:
rclines = f.readlines()
newlines = []
for line in rclines:
--
2.14.3
2.17.1