Merge branch 'master' into private-funcs-mplot3d

Author: rth

.appveyor.yml

@@ -7,6 +7,7 @@
 branches:
   except:
     - /auto-backport-.*/
+    - /^v\d+\.\d+\.[\dx]+-doc$/
 
 clone_depth: 50
 
@@ -15,7 +16,7 @@ environment:
   global:
     PYTHONIOENCODING: UTF-8
     PYTEST_ARGS: -raR --numprocesses=auto --timeout=300 --durations=25
-                 --cov-report= --cov=lib -m "not network"
+                 --cov-report= --cov=lib -m "not network" --log-level=DEBUG
 
   matrix:
     # theoretically the CONDA_INSTALL_LOCN could be only two: one for 32bit,

.circleci/config.yml

@@ -66,7 +66,7 @@ deps-run: &deps-install
   name: Install Python dependencies
   command: |
     python -mpip install --user numpy${NUMPY_VERSION} codecov coverage
-    python -mpip install --user -r doc-requirements.txt
+    python -mpip install --user -r requirements/doc/doc-requirements.txt
 
 mpl-run: &mpl-install
   name: Install Matplotlib

.flake8

@@ -28,38 +28,32 @@ per-file-ignores =
     tools/compare_backend_driver_results.py: E501
     tools/subset.py: E221, E251, E261, E302, E501
 
-    matplotlib/_cm.py: E202, E203, E302
-    matplotlib/_mathtext_data.py: E203, E261
-    matplotlib/backends/_backend_tk.py: E501
-    matplotlib/backends/backend_agg.py: E302
-    matplotlib/backends/backend_cairo.py: E203, E221, E402
-    matplotlib/backends/backend_gtk3.py: E203, E221, E222, E225, E251, E501
-    matplotlib/backends/backend_pgf.py: E731
-    matplotlib/backends/qt_editor/_formlayout.py: E501
-    matplotlib/font_manager.py: E203, E221, E251, E501
-    matplotlib/fontconfig_pattern.py: E201, E203, E221, E222, E225
-    matplotlib/mathtext.py: E201, E202, E203, E211, E221, E222, E225, E251, E301, E402
-    matplotlib/projections/geo.py: E203, E221, E502
-    matplotlib/pylab.py: E501
-    matplotlib/rcsetup.py: E501
-    matplotlib/sphinxext/plot_directive.py: E402
-    matplotlib/tests/test_mathtext.py: E501
-    matplotlib/transforms.py: E201, E202, E203, E501
-    matplotlib/tri/triinterpolate.py: E201, E221
-    matplotlib/type1font.py: E731
+    lib/matplotlib/_cm.py: E202, E203, E302
+    lib/matplotlib/_mathtext_data.py: E203, E261
+    lib/matplotlib/backends/_backend_tk.py: E501
+    lib/matplotlib/backends/backend_agg.py: E302
+    lib/matplotlib/backends/backend_cairo.py: E203, E221, E402
+    lib/matplotlib/backends/backend_gtk3.py: E203, E221, E222, E225, E251, E501
+    lib/matplotlib/backends/backend_pgf.py: E731
+    lib/matplotlib/backends/qt_editor/_formlayout.py: E501
+    lib/matplotlib/font_manager.py: E203, E221, E251, E501
+    lib/matplotlib/fontconfig_pattern.py: E201, E203, E221, E222, E225
+    lib/matplotlib/mathtext.py: E201, E202, E203, E211, E221, E222, E225, E251, E301, E402
+    lib/matplotlib/projections/geo.py: E203, E221, E502
+    lib/matplotlib/pylab.py: E501
+    lib/matplotlib/rcsetup.py: E501
+    lib/matplotlib/tests/test_mathtext.py: E501
+    lib/matplotlib/transforms.py: E201, E202, E203, E501
+    lib/matplotlib/tri/triinterpolate.py: E201, E221
+    lib/matplotlib/type1font.py: E731
 
-    mpl_toolkits/axes_grid/axes_rgb.py: E501
-    mpl_toolkits/axes_grid1/axes_divider.py: E402, E501
-    mpl_toolkits/axes_grid1/axes_grid.py: E225
-    mpl_toolkits/axes_grid1/axes_size.py: E272, E501
-    mpl_toolkits/axes_grid1/colorbar.py: E225, E501
-    mpl_toolkits/axes_grid1/inset_locator.py: E501
-    mpl_toolkits/axes_grid1/mpl_axes.py: E501
-    mpl_toolkits/axisartist/angle_helper.py: E221
-    mpl_toolkits/axisartist/clip_path.py: E225, E501
-    mpl_toolkits/axisartist/floating_axes.py: E225, E402, E501
-    mpl_toolkits/axisartist/grid_helper_curvelinear.py: E225, E501
-    mpl_toolkits/tests/test_axes_grid1.py: E201, E202
+    lib/mpl_toolkits/axes_grid1/axes_divider.py: E402, E501
+    lib/mpl_toolkits/axes_grid1/axes_size.py: E272
+    lib/mpl_toolkits/axes_grid1/colorbar.py: E225, E501
+    lib/mpl_toolkits/axisartist/angle_helper.py: E221
+    lib/mpl_toolkits/axisartist/clip_path.py: E225
+    lib/mpl_toolkits/axisartist/floating_axes.py: E225, E402, E501
+    lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py: E225, E501
 
     doc/conf.py: E402, E501
     doc/sphinxext/github.py: E302, E501
@@ -142,11 +136,14 @@ per-file-ignores =
     examples/images_contours_and_fields/tripcolor_demo.py: E201, E402
     examples/images_contours_and_fields/triplot_demo.py: E201, E402
     examples/images_contours_and_fields/watermark_image.py: E402
+    examples/lines_bars_and_markers/errorbar_limits_simple.py: E402
     examples/lines_bars_and_markers/fill_between_demo.py: E402
     examples/lines_bars_and_markers/filled_step.py: E402
     examples/lines_bars_and_markers/joinstyle.py: E402
     examples/lines_bars_and_markers/scatter_piecharts.py: E402
+    examples/lines_bars_and_markers/scatter_with_legend.py: E402
     examples/lines_bars_and_markers/span_regions.py: E402
+    examples/lines_bars_and_markers/step_demo.py: E402
     examples/misc/agg_buffer.py: E402
     examples/misc/anchored_artists.py: E501
     examples/misc/contour_manual.py: E501
@@ -185,7 +182,7 @@ per-file-ignores =
     examples/pyplots/pyplot_simple.py: E231, E402
     examples/pyplots/pyplot_text.py: E402
     examples/pyplots/pyplot_three.py: E402
-    examples/pyplots/pyplot_two_subplots.py: E302, E402
+    examples/pyplots/pyplot_two_subplots.py: E402
     examples/pyplots/text_commands.py: E231, E402
     examples/pyplots/text_layout.py: E231, E402
     examples/pyplots/whats_new_1_subplot3d.py: E402
@@ -197,6 +194,7 @@ per-file-ignores =
     examples/pyplots/whats_new_99_spines.py: E231, E402
     examples/recipes/placing_text_boxes.py: E501
     examples/scales/power_norm.py: E402
+    examples/scales/scales.py: E402
     examples/shapes_and_collections/artist_reference.py: E402
     examples/shapes_and_collections/collections.py: E402
     examples/shapes_and_collections/compound_path.py: E402
@@ -227,6 +225,7 @@ per-file-ignores =
     examples/subplots_axes_and_figures/axes_zoom_effect.py: E402
     examples/subplots_axes_and_figures/demo_constrained_layout.py: E402
     examples/subplots_axes_and_figures/demo_tight_layout.py: E402
+    examples/subplots_axes_and_figures/secondary_axis.py: E402
     examples/subplots_axes_and_figures/two_scales.py: E402
     examples/subplots_axes_and_figures/zoom_inset_axes.py: E402
     examples/tests/backend_driver_sgskip.py: E402, E501
@@ -240,6 +239,7 @@ per-file-ignores =
     examples/text_labels_and_annotations/tex_demo.py: E402
     examples/text_labels_and_annotations/watermark_text.py: E402
     examples/ticks_and_spines/auto_ticks.py: E501
+    examples/ticks_and_spines/date_concise_formatter.py: E402 
     examples/user_interfaces/canvasagg.py: E402
     examples/user_interfaces/embedding_in_gtk3_panzoom_sgskip.py: E402
     examples/user_interfaces/embedding_in_gtk3_sgskip.py: E402

.github/ISSUE_TEMPLATE.md

@@ -9,7 +9,10 @@
 
 **Code for reproduction**
 
-<!--A minimum code snippet required to reproduce the bug, also minimizing the number of dependencies required-->
+<!--A minimum code snippet required to reproduce the bug.
+Please make sure to minimize the number of dependencies required, and provide
+any necessary plotted data.
+Avoid using threads, as Matplotlib is (explicitly) not thread-safe.-->
 
 ```python
 # Paste your code here

.travis.yml

@@ -3,9 +3,13 @@ language: python
 dist: xenial
 sudo: false
 
+services:
+  - xvfb
+
 branches:
   except:
   - /^auto-backport-of-pr-\d*/
+  - /^v\d+\.\d+\.[\dx]+-doc$/
 
 cache:
   pip: true
@@ -29,17 +33,22 @@ addons:
       - graphviz
       - inkscape
       - libcairo2
+      - libcairo2-dev
+      - libffi-dev
       - libgeos-dev
-      - libgirepository-1.0.1
+      - libgirepository1.0-dev
       - lmodern
       - otf-freefont
       - pgf
+      - pkg-config
+      - qtbase5-dev
       - texlive-fonts-recommended
       - texlive-latex-base
       - texlive-latex-extra
       - texlive-latex-recommended
-      - texlive-xetex
       - texlive-luatex
+      - texlive-xetex
+      - ttf-wqy-zenhei
 
 env:
   global:
@@ -63,7 +72,7 @@ env:
     - NPROC=2
     - OPENBLAS_NUM_THREADS=1
     - PYTHONFAULTHANDLER=1
-    - PYTEST_ADDOPTS="-raR --maxfail=50 --timeout=300 --durations=25 --cov-report= --cov=lib -n $NPROC"
+    - PYTEST_ADDOPTS="-raR --maxfail=50 --timeout=300 --durations=25 --cov-report= --cov=lib -n $NPROC --log-level=DEBUG"
     - RUN_PYTEST=1
     - RUN_FLAKE8=
 
@@ -83,7 +92,8 @@ matrix:
     - python: 3.7
       sudo: true
     - python: "nightly"
-      env: PRE=--pre
+      env:
+        - PRE=--pre
     - os: osx
       language: generic  # https://github.com/travis-ci/travis-ci/issues/2312
       only: master
@@ -107,7 +117,7 @@ before_install: |
     ci/silence brew update
     brew uninstall numpy gdal postgis
     brew upgrade python
-    brew install ffmpeg imagemagick mplayer ccache
+    brew install ffmpeg imagemagick mplayer ccache font-wenquanyi-zen-hei
     hash -r
     which python
     python --version
@@ -132,10 +142,11 @@ install:
     # install was successful by trying to import the toolkit (sometimes, the
     # install appears to be successful but shared libraries cannot be loaded at
     # runtime, so an actual import is a better check).
-    python -mpip install --upgrade cairocffi>=0.8 pgi>=0.0.11.2 &&
-      python -c 'import pgi as gi; gi.require_version("Gtk", "3.0"); from pgi.repository import Gtk' &&
-      echo 'pgi is available' ||
-      echo 'pgi is not available'
+    python -mpip install --upgrade pycairo cairocffi>=0.8
+    python -mpip install --upgrade PyGObject &&
+      python -c 'import gi; gi.require_version("Gtk", "3.0"); from gi.repository import Gtk' &&
+      echo 'PyGObject is available' ||
+      echo 'PyGObject is not available'
     python -mpip install --upgrade pyqt5 &&
       python -c 'import PyQt5.QtCore' &&
       echo 'PyQt5 is available' ||
@@ -152,10 +163,6 @@ install:
     python -mpip install -ve .
 
 before_script: |
-  if [[ $TRAVIS_OS_NAME != 'osx' ]]; then
-    export DISPLAY=:99.0
-    sh -e /etc/init.d/xvfb start
-  fi
   if [[ $DELETE_FONT_CACHE == 1 ]]; then
     rm -rf ~/.cache/matplotlib
   fi

INSTALL.rst

@@ -152,8 +152,7 @@ optional Matplotlib backends and the capabilities they provide.
   `PySide <https://pypi.org/project/PySide>`_ (>= 1.0.3): for the Qt4-based
   backends;
 * `PyQt5 <https://pypi.org/project/PyQt5>`_: for the Qt5-based backends;
-* `PyGObject <https://pypi.org/project/PyGObject/>`_ or
-  `pgi <https://pypi.org/project/pgi/>`_ (>= 0.0.11.2): for the GTK3-based
+* `PyGObject <https://pypi.org/project/PyGObject/>`_: for the GTK3-based
   backends;
 * :term:`wxpython` (>= 4): for the WX-based backends;
 * `cairocffi <https://cairocffi.readthedocs.io/en/latest/>`_ (>= 0.8) or

azure-pipelines.yml

@@ -41,7 +41,7 @@ jobs:
 
   - script: |
       env
-      pytest --junitxml=junit/test-results.xml -raR --maxfail=50 --timeout=300 --durations=25 --cov-report= --cov=lib -n 2
+      pytest --junitxml=junit/test-results.xml -raR --maxfail=50 --timeout=300 --durations=25 --cov-report= --cov=lib -n 2 --log-level=DEBUG
     displayName: 'pytest'
 
   - task: PublishTestResults@2

doc/_static/animatplot.png

@@ -122,7 +122,7 @@ artist at a global scope and let Python sort things out.  For example ::
                        init_func=init, blit=True)
    plt.show()
 
-The second method is to us `functools.partial` to 'bind' artists to
+The second method is to use `functools.partial` to 'bind' artists to
 function.  A third method is to use closures to build up the required
 artists and functions.  A fourth method is to create a class.
 

doc/api/animation_api.rst

@@ -42,7 +42,7 @@ API Changes for 3.0.1
 `.tight_layout.auto_adjust_subplotpars` can return ``None`` now if the new
 subplotparams will collapse axes to zero width or height.  This prevents
 ``tight_layout`` from being executed.  Similarly
-`.tight_layout.get_tight_layout_figure` will return None.  
+`.tight_layout.get_tight_layout_figure` will return None.
 
 API Changes for 3.0.0
 =====================
@@ -359,7 +359,7 @@ Changes regarding the text.latex.unicode rcParam
 ------------------------------------------------
 
 The rcParam now defaults to True and is deprecated (i.e., in future versions
-of Maplotlib, unicode input will always be supported).
+of Matplotlib, unicode input will always be supported).
 
 Moreover, the underlying implementation now uses ``\usepackage[utf8]{inputenc}``
 instead of ``\usepackage{ucs}\usepackage[utf8x]{inputenc}``.
@@ -514,7 +514,7 @@ Removals
 Hold machinery
 ``````````````
 
-Setting or unsetting ``hold`` (deprecated in version 2.1) has now
+Setting or unsetting ``hold`` (:ref:`deprecated in version 2.0<v200_deprecate_hold>`) has now
 been completely removed. Matplotlib now always behaves as if ``hold=True``.
 To clear an axes you can manually use :meth:`~.axes.Axes.cla()`,
 or to clear an entire figure use :meth:`~.figure.Figure.clf()`.