Skip to content

Commit 12cafa9

Browse files
committed
Merge remote-tracking branch 'matplotlib/v2.x'
2 parents 888bf17 + 0b88da5 commit 12cafa9

File tree

8 files changed

+1371
-1419
lines changed

8 files changed

+1371
-1419
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ install:
105105
pip install --upgrade setuptools
106106
- |
107107
# Install dependencies from pypi
108-
pip install $PRE python-dateutil $NUMPY pyparsing!=2.1.2 $PANDAS pep8 cycler coveralls coverage
108+
pip install $PRE python-dateutil $NUMPY pyparsing!=2.1.6 $PANDAS pep8 cycler coveralls coverage
109109
pip install $PRE pillow sphinx!=1.3.0 $MOCK numpydoc ipython colorspacious
110110
# Install nose from a build which has partial
111111
# support for python36 and suport for coverage output suppressing

lib/matplotlib/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1524,8 +1524,10 @@ def _jupyter_nbextension_paths():
15241524
'matplotlib.tests.test_png',
15251525
'matplotlib.tests.test_quiver',
15261526
'matplotlib.tests.test_rcparams',
1527+
'matplotlib.tests.test_sankey',
15271528
'matplotlib.tests.test_scale',
15281529
'matplotlib.tests.test_simplification',
1530+
'matplotlib.tests.test_skew',
15291531
'matplotlib.tests.test_spines',
15301532
'matplotlib.tests.test_streamplot',
15311533
'matplotlib.tests.test_style',
@@ -1538,6 +1540,7 @@ def _jupyter_nbextension_paths():
15381540
'matplotlib.tests.test_transforms',
15391541
'matplotlib.tests.test_triangulation',
15401542
'matplotlib.tests.test_type1font',
1543+
'matplotlib.tests.test_ttconv',
15411544
'matplotlib.tests.test_units',
15421545
'matplotlib.tests.test_widgets',
15431546
'matplotlib.tests.test_cycles',

lib/matplotlib/tests/baseline_images/test_skew/skew_axes.svg

Lines changed: 96 additions & 100 deletions
Loading

0 commit comments

Comments
 (0)