Patch out the rctemplate tests properly.
This commit is contained in:
@@ -1,15 +1,16 @@
|
||||
From 69c596604b1dee1b8aeb066907a4543053e375a9 Mon Sep 17 00:00:00 2001
|
||||
From 47e4d5c14793503a7af7919a1fb7aaa04016c9e3 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
|
||||
|
||||
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
|
||||
---
|
||||
lib/matplotlib/__init__.py | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
lib/matplotlib/__init__.py | 8 +++++---
|
||||
lib/matplotlib/tests/test_rcparams.py | 23 ++++++++++++++++-------
|
||||
2 files changed, 21 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
|
||||
index 93397070f..c68b8ca9a 100644
|
||||
index 93397070f..98560d9db 100644
|
||||
--- a/lib/matplotlib/__init__.py
|
||||
+++ b/lib/matplotlib/__init__.py
|
||||
@@ -739,9 +739,12 @@ def _get_data_path():
|
||||
@@ -25,7 +26,17 @@ index 93397070f..c68b8ca9a 100644
|
||||
# setuptools' namespace_packages may highjack this init file
|
||||
# so need to try something known to be in matplotlib, not basemap
|
||||
import matplotlib.afm
|
||||
@@ -836,7 +839,7 @@ def matplotlib_fname():
|
||||
@@ -822,8 +825,7 @@ def matplotlib_fname():
|
||||
|
||||
- `$HOME/.matplotlib/matplotlibrc` if `$HOME` is defined.
|
||||
|
||||
- - Lastly, it looks in `$MATPLOTLIBDATA/matplotlibrc` for a
|
||||
- system-defined copy.
|
||||
+ - Lastly, it looks in `/etc/matplotlibrc` for a system-defined copy.
|
||||
"""
|
||||
|
||||
def gen_candidates():
|
||||
@@ -836,7 +838,7 @@ def matplotlib_fname():
|
||||
yield matplotlibrc
|
||||
yield os.path.join(matplotlibrc, 'matplotlibrc')
|
||||
yield os.path.join(_get_configdir(), 'matplotlibrc')
|
||||
@@ -34,6 +45,54 @@ index 93397070f..c68b8ca9a 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
|
||||
--- a/lib/matplotlib/tests/test_rcparams.py
|
||||
+++ b/lib/matplotlib/tests/test_rcparams.py
|
||||
@@ -424,15 +424,25 @@ def test_rcparams_reset_after_fail():
|
||||
assert mpl.rcParams['text.usetex'] is False
|
||||
|
||||
|
||||
-def test_if_rctemplate_is_up_to_date():
|
||||
+@pytest.fixture
|
||||
+def mplrc():
|
||||
+ # This is the Fedora-specific location ...
|
||||
+ if 'MATPLOTLIBDATA' in os.environ:
|
||||
+ # ... in buildroot.
|
||||
+ return os.path.join(os.environ['MATPLOTLIBDATA'],
|
||||
+ '../../../../etc/matplotlibrc')
|
||||
+ else:
|
||||
+ # ... on installed systems.
|
||||
+ return '/etc/matplotlibrc'
|
||||
+
|
||||
+
|
||||
+def test_if_rctemplate_is_up_to_date(mplrc):
|
||||
# This tests if the matplotlibrc.template file
|
||||
# contains all valid rcParams.
|
||||
dep1 = mpl._all_deprecated
|
||||
dep2 = mpl._deprecated_set
|
||||
deprecated = list(dep1.union(dep2))
|
||||
- #print(deprecated)
|
||||
- path_to_rc = mpl.matplotlib_fname()
|
||||
- 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():
|
||||
.format(missing.items()))
|
||||
|
||||
|
||||
-def test_if_rctemplate_would_be_valid(tmpdir):
|
||||
+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()
|
||||
- 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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user