Merge branch 'v2.0.x'

mdboom · mdboom · commit 9230cac7082a · 2015-12-03T07:55:26.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -78,7 +78,7 @@ install:
 
   - |
     if [[ $BUILD_DOCS == true ]]; then
-      pip install $PRE numpydoc ipython colorspacious
+      pip install $PRE numpydoc ipython jsonschema mistune colorspacious
       pip install -q $PRE linkchecker
       wget https://github.com/google/fonts/blob/master/ofl/felipa/Felipa-Regular.ttf?raw=true -O Felipa-Regular.ttf
       wget http://mirrors.kernel.org/ubuntu/pool/universe/f/fonts-humor-sans/fonts-humor-sans_1.0-1_all.deb
diff --git a/doc/api/backend_qt5agg_api.rst b/doc/api/backend_qt5agg_api.rst
@@ -0,0 +1,9 @@
+
+:mod:`matplotlib.backends.backend_qt5agg`
+=========================================
+
+.. automodule:: matplotlib.backends.backend_qt5agg
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
diff --git a/doc/api/index_backend_api.rst b/doc/api/index_backend_api.rst
@@ -9,6 +9,7 @@ backends
    backend_tools_api.rst
    backend_gtkagg_api.rst
    backend_qt4agg_api.rst
+   backend_qt5agg_api.rst
    backend_wxagg_api.rst
    backend_pdf_api.rst
 ..   backend_webagg.rst
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -4009,12 +4009,15 @@ def test_rc_spines():
 def test_rc_grid():
     fig = plt.figure()
     rc_dict0 = {
+        'axes.grid': True,
         'axes.grid.axis': 'both'
     }
     rc_dict1 = {
+        'axes.grid': True,
         'axes.grid.axis': 'x'
     }
     rc_dict2 = {
+        'axes.grid': True,
         'axes.grid.axis': 'y'
     }
     dict_list = [rc_dict0, rc_dict1, rc_dict2]

Original file line number	Diff line number	Diff line change
`@@ -4009,12 +4009,15 @@ def test_rc_spines():`
`4009`	`4009`	`def test_rc_grid():`
`4010`	`4010`	`fig = plt.figure()`
`4011`	`4011`	`rc_dict0 = {`
	`4012`	`+ 'axes.grid': True,`
`4012`	`4013`	`'axes.grid.axis': 'both'`
`4013`	`4014`	`}`
`4014`	`4015`	`rc_dict1 = {`
	`4016`	`+ 'axes.grid': True,`
`4015`	`4017`	`'axes.grid.axis': 'x'`
`4016`	`4018`	`}`
`4017`	`4019`	`rc_dict2 = {`
	`4020`	`+ 'axes.grid': True,`
`4018`	`4021`	`'axes.grid.axis': 'y'`
`4019`	`4022`	`}`
`4020`	`4023`	`dict_list = [rc_dict0, rc_dict1, rc_dict2]`