Unbundle python-six (#1336740).

- Run tests (and temporarily disable failing ones).
- Use upstream-recommended way of running tests in parallel.
- python2-cycler and -mock are required for running tests.
This commit is contained in:
Dominik Mierzejewski
2016-06-02 16:05:01 +02:00
parent a6629ee97c
commit 0316efe86f
5 changed files with 328 additions and 7 deletions
+12
View File
@@ -22,3 +22,15 @@
fname = os.path.join(path, 'matplotlibrc')
if not os.path.exists(fname):
warnings.warn('Could not find matplotlibrc; using defaults')
--- a/lib/matplotlib/cbook.py 2016-05-20 14:14:52.000000000 +0200
+++ b/lib/matplotlib/cbook.py 2016-05-20 19:28:57.373601582 +0200
@@ -823,8 +823,7 @@ def get_sample_data(fname, asfileobj=Tru
if matplotlib.rcParams['examples.directory']:
root = matplotlib.rcParams['examples.directory']
else:
- root = os.path.join(os.path.dirname(__file__),
- "mpl-data", "sample_data")
+ root = os.path.join(matplotlib._get_data_path(), 'sample_data')
path = os.path.join(root, fname)
if asfileobj: