Merge branch 'master' into tkagg-cffi

Author: mattip

.appveyor.yml

@@ -101,7 +101,7 @@ test_script:
 
   # this are optional dependencies so that we don't skip so many tests...
   - if x%TEST_ALL% == xyes conda install -q ffmpeg inkscape miktex pillow
-  # missing packages on conda-forge for avconv mencoder imagemagick
+  # missing packages on conda-forge for avconv imagemagick
   # This install sometimes failed randomly :-(
   #- choco install imagemagick
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,27 +1,5 @@
-<!--Thank you so much for your PR! To help us review, fill out the form
-to the best of your ability.  Please make use of the development guide at
-https://matplotlib.org/devdocs/devel/index.html
-
-For help with git and github workflow, please see https://matplotlib.org/devel/gitwash/development_workflow.html
-
-Please do not create the PR out of master, but out of a separate branch. -->
-
-<!--Provide a general summary of your changes in the title above, for
-example "Raises ValueError on Non-Numeric Input to set_xlim".  Please avoid
-non-descriptive titles such as "Addresses issue #8576".-->
-
-<!--If you are contributing fixes to docstrings, please pay attention to
-http://matplotlib.org/devel/documenting_mpl.html#formatting.  In particular,
-note the difference between using single backquotes, double backquotes, and
-asterisks in the markup.-->
-
 ## PR Summary
 
-<!--Please provide at least 1-2 sentences describing the pull request in
-detail.  Why is this change required?  What problem does it solve?-->
-
-<!--If it fixes an open issue, please link to the issue here.-->
-
 ## PR Checklist
 
 - [ ] Has Pytest style unit tests
@@ -31,8 +9,33 @@ detail.  Why is this change required?  What problem does it solve?-->
 - [ ] Added an entry to doc/users/next_whats_new/ if major new feature (follow instructions in README.rst there)
 - [ ] Documented in doc/api/api_changes.rst if API changed in a backward-incompatible way
 
-<!--We understand that PRs can sometimes be overwhelming, especially as the
-reviews start coming in.  Please let us know if the reviews are unclear or the
-recommended next step seems overly demanding , or if you would like help in
-addressing a reviewer's comments.  And please ping us if you've been waiting
-too long to hear back on your PR.-->
+<!--
+Thank you so much for your PR!  To help us review your contribution, please
+consider the following points:
+
+- A development guide is available at https://matplotlib.org/devdocs/devel/index.html.
+
+- Help with git and github is available at
+  https://matplotlib.org/devel/gitwash/development_workflow.html.
+
+- Do not create the PR out of master, but out of a separate branch.
+
+- The PR title should summarize the changes, for example "Raise ValueError on
+  non-numeric input to set_xlim".  Avoid non-descriptive titles such as
+  "Addresses issue #8576".
+
+- The summary should provide at least 1-2 sentences describing the pull request
+  in detail (Why is this change required?  What problem does it solve?) and
+  link to any relevant issues.
+
+- If you are contributing fixes to docstrings, please pay attention to
+  http://matplotlib.org/devel/documenting_mpl.html#formatting.  In particular,
+  note the difference between using single backquotes, double backquotes, and
+  asterisks in the markup.
+
+We understand that PRs can sometimes be overwhelming, especially as the
+reviews start coming in.  Please let us know if the reviews are unclear or
+the recommended next step seems overly demanding, if you would like help in
+addressing a reviewer's comments, or if you have been waiting too long to hear
+back on your PR.
+-->

.travis.yml

@@ -19,22 +19,24 @@ addons:
     - result_images.tar.bz2
   apt:
     packages:
+      - cm-super
+      - dvipng
+      - gdb
+      - gir1.2-gtk-3.0
+      - graphviz
       - inkscape
       - libav-tools
-      - gdb
-      - mencoder
-      - dvipng
-      - pgf
+      - libcairo2
+      - libgeos-dev
+      - libgirepository-1.0.1
       - lmodern
-      - cm-super
+      - otf-freefont
+      - pgf
+      - texlive-fonts-recommended
       - texlive-latex-base
       - texlive-latex-extra
-      - texlive-fonts-recommended
       - texlive-latex-recommended
       - texlive-xetex
-      - graphviz
-      - libgeos-dev
-      - otf-freefont
 
 env:
   global:
@@ -43,25 +45,43 @@ env:
     - secure: RgJI7BBL8aX5FTOQe7xiXqWHMxWokd6GNUWp1NUV2mRLXPb9dI0RXqZt3UJwKTAzf1z/OtlHDmEkBoTVK81E9iUxK5npwyyjhJ8yTJmwfQtQF2n51Q1Ww9p+XSLORrOzZc7kAo6Kw6FIXN1pfctgYq2bQkrwJPRx/oPR8f6hcbY=
     - secure: E7OCdqhZ+PlwJcn+Hd6ns9TDJgEUXiUNEI0wu7xjxB2vBRRIKtZMbuaZjd+iKDqCKuVOJKu0ClBUYxmgmpLicTwi34CfTUYt6D4uhrU+8hBBOn1iiK51cl/aBvlUUrqaRLVhukNEBGZcyqAjXSA/Qsnp2iELEmAfOUa92ZYo1sk=
     - secure: "dfjNqGKzQG5bu3FnDNwLG8H/C4QoieFo4PfFmZPdM2RY7WIzukwKFNT6kiDfOrpwt+2bR7FhzjOGlDECGtlGOtYPN8XuXGjhcP4a4IfakdbDfF+D3NPIpf5VlE6776k0VpvcZBTMYJKNFIMc7QPkOwjvNJ2aXyfe3hBuGlKJzQU="
+    - CYCLER=cycler
+    - DATEUTIL=python-dateutil
+    - MOCK=
+    - NOSE=
     - NUMPY=numpy
-    - OPENBLAS_NUM_THREADS=1
     - PANDAS=
+    - PYPARSING=pyparsing
+    - PYTEST=pytest!=3.3.0
+    - PYTEST_COV=pytest-cov
+    - PYTEST_PEP8=
+    - SPHINX=sphinx
+    - OPENBLAS_NUM_THREADS=1
     - NPROC=2
-    - INSTALL_PEP8=
     - RUN_PEP8=
-    - NOSE=
     - PYTEST_ARGS="-rawR --maxfail=50 --timeout=300 --durations=25 --cov-report= --cov=lib -n $NPROC"
     - PYTHON_ARGS=
     - DELETE_FONT_CACHE=
 
 matrix:
   include:
     - python: 2.7
-      env: MOCK=mock NUMPY=numpy==1.7.1 PANDAS=pandas NOSE=nose
+      # pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124.
+      env:
+        - CYCLER=cycler==0.10
+        - DATEUTIL=python-dateutil==2.1
+        - MOCK=mock
+        - NOSE=nose
+        - NUMPY=numpy==1.7.1
+        - PANDAS='pandas<0.21.0'
+        - PYPARSING=pyparsing==2.0.1
+        - PYTEST=pytest==3.1.0
+        - PYTEST_COV=pytest-cov==2.3.1
+        - SPHINX=sphinx==1.3
     - python: 3.4
       env: PYTHON_ARGS=-OO
     - python: 3.6
-      env: DELETE_FONT_CACHE=1 INSTALL_PEP8=pytest-pep8 RUN_PEP8=--pep8 PANDAS=pandas
+      env: DELETE_FONT_CACHE=1 PANDAS='pandas<0.21.0' PYTEST_PEP8=pytest-pep8 RUN_PEP8=--pep8
     - python: "nightly"
       env: PRE=--pre
     - os: osx
@@ -108,21 +128,30 @@ install:
     # Upgrade pip and setuptools and wheel to get as clean an install as possible
     pip install --upgrade pip setuptools wheel
   - |
-    # Install dependencies from pypi
+    # Install dependencies from PyPI
     pip install --upgrade $PRE \
+        codecov \
+        coverage \
+        $CYCLER \
         $MOCK \
         $NOSE \
         $NUMPY \
         $PANDAS \
         codecov \
         coverage \
         pillow \
-        sphinx
+        $PYPARSING \
+        $DATEUTIL \
+        $SPHINX
     # GUI toolkits are pip-installable only for some versions of Python so
     # don't fail if we can't install them.  Make it easier to check whether the
     # 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).
+    pip install cairocffi pgi &&
+      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'
     pip install pyqt5 &&
       python -c 'import PyQt5.QtCore' &&
       echo 'PyQt5 is available' ||
@@ -134,15 +163,14 @@ install:
       echo 'wxPython is available' ||
       echo 'wxPython is not available'
 
-    # pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
     pip install $PRE \
-        pytest!=3.3.0 \
-        pytest-cov>=2.3.1 \
+        $PYTEST \
+        $PYTEST_COV \
         pytest-faulthandler \
+        $PYTEST_PEP8 \
         pytest-rerunfailures \
         pytest-timeout \
-        pytest-xdist \
-        $INSTALL_PEP8
+        pytest-xdist
 
     # Use the special local version of freetype for testing
     cp ci/travis/setup.cfg .

INSTALL.rst

@@ -84,8 +84,7 @@ To run the test suite:
    :file:`lib\\mpl_toolkits\\tests` directories from the source distribution;
  * install test dependencies: `pytest <https://pypi.python.org/pypi/pytest>`_,
    `mock <https://pypi.python.org/pypi/mock>`_, Pillow, MiKTeX, GhostScript,
-   ffmpeg, avconv, mencoder, ImageMagick, and `Inkscape
-   <https://inkscape.org/>`_;
+   ffmpeg, avconv, ImageMagick, and `Inkscape <https://inkscape.org/>`_;
  * run ``py.test path\to\tests\directory``.
 
 
@@ -171,7 +170,7 @@ Matplotlib requires a large number of dependencies:
   * `Python <https://www.python.org/downloads/>`_ (>= 2.7 or >= 3.4)
   * `NumPy <http://www.numpy.org>`_ (>= |minimum_numpy_version|)
   * `setuptools <https://setuptools.readthedocs.io/en/latest/>`__
-  * `dateutil <https://pypi.python.org/pypi/python-dateutil>`_ (>= 2.0)
+  * `dateutil <https://pypi.python.org/pypi/python-dateutil>`_ (>= 2.1)
   * `pyparsing <https://pyparsing.wikispaces.com/>`__
   * `libpng <http://www.libpng.org>`__ (>= 1.2)
   * `pytz <http://pytz.sourceforge.net/>`__

ci/travis/test_script.sh

@@ -1,6 +1,6 @@
 #! /bin/bash
 
-set -ev
+set -ex
 
 # This script is meant to be called by the "script" step defined in
 # .travis.yml. See http://docs.travis-ci.com/ for more details.
@@ -16,8 +16,5 @@ if [[ $DELETE_FONT_CACHE == 1 ]]; then
 fi
 
 echo The following args are passed to pytest $PYTEST_ARGS $RUN_PEP8
-if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
-  pytest $PYTEST_ARGS $RUN_PEP8
-else
-  gdb -return-child-result -batch -ex r -ex bt --args python $PYTHON_ARGS -m pytest $PYTEST_ARGS $RUN_PEP8
-fi
+
+pytest $PYTEST_ARGS $RUN_PEP8

doc/_static/mpl_template_example.png

@@ -1,5 +1,5 @@
 
 <div>
-<div onclick="open_window('MjI1OA==')" class="donate_button">Support matplotlib</div>
-<div onclick="open_window('MjM2OA==')" class="donate_button">Support NumFOCUS</div>
+  <a href="https://www.flipcause.com/secure/cause_pdetails/MjI1OA==" target="_blank"> <div class="donate_button" >Support Matplotlib</div></a>
+  <a href="https://www.flipcause.com/secure/cause_pdetails/MTY3NTU=" target="_blank"> <div class="donate_button" >Support NumFOCUS</div></a>
 </div>