matplotlib · shaynair · Feb 1, 2018 · Feb 25, 2018 · Feb 25, 2018 · Feb 26, 2018
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -59,7 +59,7 @@ install:
   #
   - conda create -q -n test-environment python=%PYTHON_VERSION%
     msinttypes freetype=2.6 "libpng>=1.6.21,<1.7" zlib=1.2 tk=8.5
-    pip setuptools numpy mock pandas sphinx tornado
+    pip setuptools numpy pandas sphinx tornado
   - activate test-environment
   - echo %PYTHON_VERSION% %TARGET_ARCH%
   # pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124

diff --git a/.travis.yml b/.travis.yml
@@ -48,7 +48,6 @@ env:
     - secure: "dfjNqGKzQG5bu3FnDNwLG8H/C4QoieFo4PfFmZPdM2RY7WIzukwKFNT6kiDfOrpwt+2bR7FhzjOGlDECGtlGOtYPN8XuXGjhcP4a4IfakdbDfF+D3NPIpf5VlE6776k0VpvcZBTMYJKNFIMc7QPkOwjvNJ2aXyfe3hBuGlKJzQU="
     - CYCLER=cycler
     - DATEUTIL=python-dateutil
-    - MOCK=
     - NOSE=
     - NUMPY=numpy
     - PANDAS=
@@ -71,7 +70,6 @@ matrix:
       env:
         - CYCLER=cycler==0.10
         - DATEUTIL=python-dateutil==2.1
-        - MOCK=mock
         - NOSE=nose
         - NUMPY=numpy==1.10.0
         - PANDAS='pandas<0.21.0'
@@ -87,7 +85,6 @@ matrix:
       env: PRE=--pre
     - os: osx
       language: generic  # https://github.com/travis-ci/travis-ci/issues/2312
-      env: MOCK=mock
       only: master
       cache:
         # As for now travis caches only "$HOME/.cache/pip"
@@ -110,9 +107,8 @@ before_install:
       export PATH=/usr/lib/ccache:$PATH
     else
       ci/travis/silence brew update
-      brew install python3 ffmpeg imagemagick mplayer ccache
-      # make 'python' mean 'python3'
-      ln -sf /usr/local/bin/python3 /usr/local/bin/python
+      brew upgrade python
+      brew install ffmpeg imagemagick mplayer ccache
       hash -r
       which python
       python --version
@@ -123,21 +119,18 @@ before_install:
     fi
 
 install:
-  # Upgrade pip and setuptools. Mock has issues with the default version of
-  # setuptools
   - |
-    # Setup environment
+    # Setup environment.
     ccache -s
     git describe
-    # Upgrade pip and setuptools and wheel to get as clean an install as possible
+    # Upgrade pip and setuptools and wheel to get as clean an install as possible.
     python -mpip install --upgrade pip setuptools wheel
   - |
-    # Install dependencies from PyPI
+    # Install dependencies from PyPI.
     python -mpip install --upgrade $PRE \
         codecov \
         coverage \
         $CYCLER \
-        $MOCK \
         $NOSE \
         $NUMPY \
         $PANDAS \

diff --git a/INSTALL.rst b/INSTALL.rst
@@ -54,9 +54,9 @@ To run the test suite:
  * extract the :file:`lib\\matplotlib\\tests` or
    :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, ImageMagick, and `Inkscape <https://inkscape.org/>`_;
- * run ``py.test path\to\tests\directory``.
+   Pillow, MiKTeX, GhostScript, ffmpeg, avconv, ImageMagick, and `Inkscape
+   <https://inkscape.org/>`_;
+ * run ``pytest path\to\tests\directory``.
 
 
 Third-party distributions of Matplotlib
@@ -159,7 +159,6 @@ optional Matplotlib backends and the capabilities they provide.
   * `PyQt4 <https://pypi.python.org/pypi/PyQt4>`_ (>= 4.4) or
     `PySide <https://pypi.python.org/pypi/PySide>`_: for the Qt4Agg backend;
   * `PyQt5 <https://pypi.python.org/pypi/PyQt5>`_: for the Qt5Agg backend;
-  * :term:`pygtk` (>= 2.4): for the GTK and the GTKAgg backend;
   * :term:`wxpython` (>= 2.9 or later): for the WX or WXAgg backend;
   * `cairocffi <https://cairocffi.readthedocs.io/en/latest/>`__ (>=
     v0.8): for cairo based backends;

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -4,7 +4,6 @@ include pytest.ini
 include Makefile MANIFEST.in
 include matplotlibrc.template setup.cfg.template
 include setupext.py setup.py distribute_setup.py
-include lib/matplotlib/mpl-data/lineprops.glade
 include lib/matplotlib/mpl-data/matplotlibrc
 include lib/matplotlib/mpl-data/images/*
 include lib/matplotlib/mpl-data/fonts/ttf/*

diff --git a/README.rst b/README.rst
@@ -52,16 +52,16 @@ Testing
 
 After installation, you can launch the test suite::
 
-  py.test
+  pytest
 
 Or from the Python interpreter::
 
   import matplotlib
   matplotlib.test()
 
-Consider reading http://matplotlib.org/devel/coding_guide.html#testing for
-more information. Note that the test suite requires pytest and, on Python 2.7,
-mock. Please install with pip or your package manager of choice.
+Consider reading http://matplotlib.org/devel/coding_guide.html#testing for more
+information. Note that the test suite requires pytest. Please install with pip
+or your package manager of choice.
 
 Contact
 =======

diff --git a/doc-requirements.txt b/doc-requirements.txt
@@ -10,7 +10,6 @@ sphinx>=1.3,!=1.5.0,!=1.6.4
 colorspacious
 ipython
 ipywidgets
-mock
 numpydoc>=0.4
 pillow
 sphinx-gallery>=0.1.12
diff --git a/doc/_static/mpl.css b/doc/_static/mpl.css
@@ -373,14 +373,24 @@ div.warning {
     border: 1px solid #eed3d7;
 }
 
+div.deprecated {
+    color: #606060;
+    background-color: #f0f0f0;
+    border: 1px solid #404040;
+}
+
+div.deprecated span.versionmodified {
+    color: #606060;
+    font-weight: bold;
+}
+
 div.green {
     color: #468847;
     background-color: #dff0d8;
     border: 1px solid #d6e9c6;
 }
 
-
-div.admonition p, div.warning p {
+div.admonition p, div.warning p, div.deprecated p {
     margin: 0.5em 1em 0.5em 1em;
     padding: 0;
 }
@@ -401,15 +411,14 @@ div.warning p.admonition-title {
     font-size: 14px;
 }
 
-div.admonition {
+div.admonition, div.deprecated {
     margin-bottom: 10px;
     margin-top: 10px;
     padding: 7px;
     border-radius: 4px;
     -moz-border-radius: 4px;
   }
 
-
 div.note {
     background-color: #eee;
     border: 1px solid #ccc;

diff --git a/doc/api/axes_api.rst b/doc/api/axes_api.rst
@@ -509,8 +509,6 @@ Interactive
    Axes.contains_point
 
    Axes.get_cursor_data
-   Axes.get_cursor_props
-   Axes.set_cursor_props
 
 Children
 ========

diff --git a/doc/api/backend_gtkagg_api.rst b/doc/api/backend_gtkagg_api.rst
diff --git a/doc/api/backend_gtkcairo_api.rst b/doc/api/backend_gtkcairo_api.rst
diff --git a/doc/api/index_backend_api.rst b/doc/api/index_backend_api.rst
@@ -10,8 +10,6 @@ backends
    backend_tools_api.rst
    backend_agg_api.rst
    backend_cairo_api.rst
-   backend_gtkagg_api.rst
-   backend_gtkcairo_api.rst
    backend_gtk3agg_api.rst
    backend_gtk3cairo_api.rst
    backend_nbagg_api.rst

diff --git a/doc/api/next_api_changes/2018-02-15-DS.rst b/doc/api/next_api_changes/2018-02-15-DS.rst
@@ -0,0 +1,7 @@
+Deprecated methods removed from `matplotlib.testing`
+----------------------------------------------------
+
+The deprecated methods `knownfailureif` and `remove_text` have been removed
+from :mod:`matplotlib.testing.decorators`.
+
+The entire contents of `testing.noseclasses` have also been removed.
diff --git a/doc/api/next_api_changes/2018-02-16-ES-removals.rst b/doc/api/next_api_changes/2018-02-16-ES-removals.rst
@@ -0,0 +1,9 @@
+Removal of deprecated backends
+------------------------------
+
+Deprecated backends have been removed:
+
+    * GTKAgg
+    * GTKCairo
+    * GTK
+    * GDK
diff --git a/doc/api/next_api_changes/2018-02-18-AL-removals.rst b/doc/api/next_api_changes/2018-02-18-AL-removals.rst
@@ -0,0 +1,5 @@
+Removal of deprecated functions
+```````````````````````````````
+The following previously deprecated functions have been removed:
+- ``matplotlib.font_manager.ttfdict_to_fnames``
+- ``matplotlib.font_manager.weight_as_number``
diff --git a/doc/api/next_api_changes/2018-02-26-AL-removals.rst b/doc/api/next_api_changes/2018-02-26-AL-removals.rst
@@ -0,0 +1,33 @@
+Removal of deprecated APIs
+``````````````````````````
+The following deprecated API elements have been removed:
+
+- ``matplotlib.checkdep_tex``, ``matplotlib.checkdep_xmllint``,
+- ``backend_bases.IdleEvent``,
+- ``cbook.converter``, ``cbook.tostr``, ``cbook.todatetime``, ``cbook.todate``,
+  ``cbook.tofloat``, ``cbook.toint``, ``cbook.unique``,
+  ``cbook.is_string_like``, ``cbook.is_sequence_of_strings``,
+  ``cbook.is_scalar``, ``cbook.soundex``, ``cbook.dict_delall``,
+  ``cbook.get_split_ind``, ``cbook.wrap``, ``cbook.get_recursive_filelist``,
+  ``cbook.pieces``, ``cbook.exception_to_str``, ``cbook.allequal``,
+  ``cbook.alltrue``, ``cbook.onetrue``, ``cbook.allpairs``, ``cbook.finddir``,
+  ``cbook.reverse_dict``, ``cbook.restrict_dict``, ``cbook.issubclass_safe``,
+  ``cbook.recursive_remove``, ``cbook.unmasked_index_ranges``,
+  ``cbook.Null``, ``cbook.RingBuffer``, ``cbook.Sorter``, ``cbook.Xlator``,
+- ``font_manager.weight_as_number``, ``font_manager.ttfdict_to_fnames``,
+- ``pyplot.colors``,
+- ``rcsetup.validate_negative_linestyle``,
+  ``rcsetup.validate_negative_linestyle_legacy``,
+- ``testing.compare.verifiers``, ``testing.compare.verify``,
+- ``testing.decorators.knownfailureif``,
+  ``testing.decorators.ImageComparisonTest.remove_text``,
+- ``tests.assert_str_equal``, ``tests.test_tinypages.file_same``,
+- ``texmanager.dvipng_hack_alpha``,
+- ``_AxesBase.axesPatch``, ``_AxesBase.get_cursor_props``,
+  ``_AxesBase.set_cursor_props``,
+- ``_ImageBase.iterpnames``,
+- ``Figure.figurePatch``,
+- ``FigureCanvasBase.dynamic_update``, ``FigureCanvasBase.idle_event``,
+  ``FigureCanvasBase.get_linestyle``, ``FigureCanvasBase.set_linestyle``,
+- ``FigureCanvasQTAgg.blitbox``,
+- passing ``frac`` to ``PolarAxes.set_theta_grids``,
diff --git a/doc/conf.py b/doc/conf.py
@@ -58,8 +58,6 @@ def _check_deps():
              "numpydoc": 'numpydoc',
              "PIL.Image": 'pillow',
              "sphinx_gallery": 'sphinx_gallery'}
-    if sys.version_info < (3, 3):
-        names["mock"] = 'mock'
     missing = []
     for name in names:
         try:

diff --git a/doc/devel/contributing.rst b/doc/devel/contributing.rst
@@ -142,18 +142,17 @@ Additionally you will need to copy :file:`setup.cfg.template` to
 In either case you can then run the tests to check your work
 environment is set up properly::
 
-  python tests.py
+  pytest
 
 .. _pytest: http://doc.pytest.org/en/latest/
 .. _pep8: https://pep8.readthedocs.io/en/latest/
-.. _mock: https://docs.python.org/dev/library/unittest.mock.html
 .. _Ghostscript: https://www.ghostscript.com/
 .. _Inkscape: https://inkscape.org>
 
 .. note::
 
   **Additional dependencies for testing**: pytest_ (version 3.1 or later),
-  mock_ (if Python 2), Ghostscript_, Inkscape_
+  Ghostscript_, Inkscape_
 
 .. seealso::
 

diff --git a/doc/devel/documenting_mpl.rst b/doc/devel/documenting_mpl.rst
@@ -45,7 +45,6 @@ requirements that are needed to build the documentation. They are listed in
 * Sphinx>=1.3, !=1.5.0, !=1.6.4
 * colorspacious
 * IPython
-* mock
 * numpydoc>=0.4
 * Pillow
 * sphinx-gallery>=0.1.12

diff --git a/doc/devel/testing.rst b/doc/devel/testing.rst
@@ -9,7 +9,6 @@ Matplotlib's testing infrastructure depends on pytest_. The tests are in
 infrastructure are in :mod:`matplotlib.testing`.
 
 .. _pytest: http://doc.pytest.org/en/latest/
-.. _mock: https://docs.python.org/3/library/unittest.mock.html
 .. _Ghostscript: https://www.ghostscript.com/
 .. _Inkscape: https://inkscape.org
 .. _pytest-cov: https://pytest-cov.readthedocs.io/en/latest/
@@ -27,7 +26,6 @@ local FreeType build
 The following software is required to run the tests:
 
   - pytest_ (>=3.1)
-  - mock_, when running Python 2
   - Ghostscript_ (to render PDF files)
   - Inkscape_ (to render SVG files)
 
@@ -44,7 +42,7 @@ Running the tests
 
 Running the tests is simple. Make sure you have pytest installed and run::
 
-   py.test
+   pytest
 
 or::
 
@@ -74,22 +72,22 @@ To run a single test from the command line, you can provide a file path,
 optionally followed by the function separated by two colons, e.g., (tests do
 not need to be installed, but Matplotlib should be)::
 
-  py.test lib/matplotlib/tests/test_simplification.py::test_clipping
+  pytest lib/matplotlib/tests/test_simplification.py::test_clipping
 
 or, if tests are installed, a dot-separated path to the module, optionally
 followed by the function separated by two colons, such as::
 
-  py.test --pyargs matplotlib.tests.test_simplification::test_clipping
+  pytest --pyargs matplotlib.tests.test_simplification::test_clipping
 
 If you want to run the full test suite, but want to save wall time try
 running the tests in parallel::
 
-  py.test --verbose -n 5
+  pytest --verbose -n 5
 
 Depending on your version of Python and pytest-xdist, you may need to set
 ``PYTHONHASHSEED`` to a fixed value when running in parallel::
 
-  PYTHONHASHSEED=0 py.test --verbose -n 5
+  PYTHONHASHSEED=0 pytest --verbose -n 5
 
 An alternative implementation that does not look at command line arguments
 and works from within Python is to run the tests from the Matplotlib library

diff --git a/doc/glossary/index.rst b/doc/glossary/index.rst
@@ -74,16 +74,9 @@ Glossary
       features of PyGObject.  However Matplotlib does not use any of these
       missing features.
 
-  pygtk
-      `pygtk <http://www.pygtk.org/>`_ provides python wrappers for
-      the :term:`GTK` widgets library for use with the GTK or GTKAgg
-      backend.  Widely used on linux, and is often packages as
-      'python-gtk2'
-
   PyGObject
-      Like :term:`pygtk`, `PyGObject <http://www.pygtk.org/>` provides
-      python wrappers for the :term:`GTK` widgets library; unlike pygtk,
-      PyGObject wraps GTK3 instead of the now obsolete GTK2.
+      `PyGObject <http://www.pygtk.org/>`_ provides Python wrappers for the
+      :term:`GTK` widgets library
 
   pyqt
       `pyqt <https://wiki.python.org/moin/PyQt>`_ provides python

diff --git a/doc/sphinxext/mock_gui_toolkits.py b/doc/sphinxext/mock_gui_toolkits.py
@@ -1,9 +1,5 @@
 import sys
-
-try:
-    from unittest.mock import MagicMock
-except ImportError:
-    from mock import MagicMock
+from unittest.mock import MagicMock
 
 
 class MyCairoCffi(MagicMock):