matplotlib · QuLogic · Jan 22, 2019 · Sep 19, 2018 · Jan 14, 2019 · Sep 26, 2018
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -66,8 +66,7 @@ install:
   - activate test-environment
   - echo %PYTHON_VERSION% %TARGET_ARCH%
   # pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124
-  - pip install -q "pytest!=3.3.0,>=3.2.0,<3.8" "pytest-cov>=2.3.1"
-    pytest-rerunfailures pytest-timeout pytest-xdist
+  - pip install -q "pytest>=3.6.1" "pytest-cov>=2.3.1" pytest-rerunfailures pytest-timeout pytest-xdist
 
   # Apply patch to `subprocess` on Python versions > 2 and < 3.6.3
   # https://github.com/matplotlib/matplotlib/issues/9176

diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,9 @@ language: python
 dist: xenial
 sudo: false
 
+services:
+  - xvfb
+
 branches:
   except:
   - /^auto-backport-of-pr-\d*/
@@ -37,6 +40,7 @@ addons:
       - texlive-latex-extra
       - texlive-latex-recommended
       - texlive-xetex
+      - xvfb
 
 env:
   global:
@@ -53,9 +57,7 @@ env:
     - PANDAS=
     - PILLOW=pillow
     - PYPARSING=pyparsing
-    # pytest-timeout master depends on pytest>=3.6.  Testing with pytest 3.1 is
-    # still supported; this is tested by the first matrix entry.
-    - PYTEST='pytest>=3.6,<3.8'
+    - PYTEST='pytest>=3.6.1'
     - PYTEST_COV=pytest-cov
     - PYTEST_RERUNFAILURES=pytest-rerunfailures
     - PYTEST_PEP8=
@@ -72,6 +74,7 @@ matrix:
   include:
     - python: 2.7
       # pytest-cov>=2.3.1 due to https://github.com/pytest-dev/pytest-cov/issues/124.
+      # pytest>=3.6.1 due to https://github.com/pytest-dev/pytest/commit/b5a94d8e6c49201c8c79a7c52b8466e020e6d6b8
       env:
         - CYCLER=cycler==0.10
         - DATEUTIL=python-dateutil==2.1
@@ -80,10 +83,10 @@ matrix:
         - NUMPY=numpy==1.7.1
         - PANDAS='pandas<0.21.0'
         - PYPARSING=pyparsing==2.0.1
-        - PYTEST=pytest==3.1.0
+        - PYTEST=pytest==3.6.1
         - PYTEST_COV=pytest-cov==2.3.1
+        - PYTEST_RERUNFAILURES='pytest-rerunfailures<6'  # 6 needs pytest >=3.8
         - PYTEST_TIMEOUT=pytest-timeout==1.2.1  # Newer pytest-timeouts don't support pytest <3.4.
-        - PYTEST_RERUNFAILURES='pytest-rerunfailures<5'  # 5 needs pytest>=3.6
         - SPHINX=sphinx==1.3
     - python: 3.4
       env: PYTHON_ARGS=-OO
@@ -122,7 +125,7 @@ before_install:
     else
       brew update
       brew tap homebrew/gui
-      brew install python libpng ffmpeg imagemagick mplayer ccache
+      # brew install python libpng ffmpeg imagemagick mplayer ccache
       # We could install ghostscript and inkscape here to test svg and pdf
       # but this makes the test time really long.
       # brew install ghostscript inkscape
@@ -189,12 +192,6 @@ install:
     # Install matplotlib
     pip install -ve .
 
-before_script:
-  - |
-    if [[ $TRAVIS_OS_NAME != 'osx' ]]; then
-      export DISPLAY=:99.0
-      sh -e /etc/init.d/xvfb start
-    fi
 
 script: ci/travis/test_script.sh
 

diff --git a/doc/devel/contributing.rst b/doc/devel/contributing.rst
@@ -109,7 +109,7 @@ value.
 Installing Matplotlib in developer mode
 ---------------------------------------
 
-To install Matplotlib (and compile the c-extensions) run the following
+To install Matplotlib (and compile the C-extensions) run the following
 command from the top-level directory ::
 
    python -mpip install -ve .
@@ -148,11 +148,11 @@ environment is set up properly::
 .. _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>
+.. _Inkscape: https://inkscape.org/
 
 .. note::
 
-  **Additional dependencies for testing**: pytest_ (version 3.1 or later),
+  **Additional dependencies for testing**: pytest_ (version 3.6 or later),
   mock_ (if Python 2), Ghostscript_, Inkscape_
 
 .. seealso::

diff --git a/doc/devel/testing.rst b/doc/devel/testing.rst
@@ -22,11 +22,11 @@ Requirements
 
 Install the latest version of Matplotlib as documented in
 :ref:`installing_for_devs` In particular, follow the instructions to use a
-local FreeType build
+local FreeType build.
 
 The following software is required to run the tests:
 
-  - pytest_ (>=3.1)
+  - pytest_ (>=3.6)
   - mock_, when running Python 2
   - Ghostscript_ (to render PDF files)
   - Inkscape_ (to render SVG files)

diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -391,7 +391,7 @@ def post_processing(image, dpi):
         self._update_methods()
 
         if w > 0 and h > 0:
-            img = np.fromstring(buffer, np.uint8)
+            img = np.frombuffer(buffer, np.uint8)
             img, ox, oy = post_processing(img.reshape((h, w, 4)) / 255.,
                                           self.dpi)
             gc = self.new_gc()

diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -1369,10 +1369,9 @@ def get_locator(self, dmin, dmax):
         else:
             locator = MicrosecondLocator(interval, tz=self.tz)
             if dmin.year > 20 and interval < 1000:
-                _log.warn('Plotting microsecond time intervals is not'
-                          ' well supported. Please see the'
-                          ' MicrosecondLocator documentation'
-                          ' for details.')
+                _log.warning('Plotting microsecond time intervals is not well '
+                             'supported. Please see the MicrosecondLocator '
+                             'documentation for details.')
 
         locator.set_axis(self.axis)
 

diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -1447,9 +1447,9 @@ def pil_to_array(pilImage):
         # return MxN luminance array of uint16
         raw = pilImage.tobytes('raw', pilImage.mode)
         if pilImage.mode.endswith('B'):
-            x = np.fromstring(raw, '>u2')
+            x = np.frombuffer(raw, '>u2')
         else:
-            x = np.fromstring(raw, '<u2')
+            x = np.frombuffer(raw, '<u2')
         return x.reshape(pilImage.size[::-1]).astype('=u2')
     else:  # try to convert to an rgba image
         try:

diff --git a/lib/matplotlib/testing/conftest.py b/lib/matplotlib/testing/conftest.py
@@ -24,19 +24,19 @@ def mpl_test_settings(request):
     original_settings = matplotlib.rcParams.copy()
 
     backend = None
-    backend_marker = request.keywords.get('backend')
+    backend_marker = request.node.get_closest_marker('backend')
     if backend_marker is not None:
         assert len(backend_marker.args) == 1, \
             "Marker 'backend' must specify 1 backend."
-        backend = backend_marker.args[0]
+        backend, = backend_marker.args
         prev_backend = matplotlib.get_backend()
 
     style = '_classic_test'  # Default of cleanup and image_comparison too.
-    style_marker = request.keywords.get('style')
+    style_marker = request.node.get_closest_marker('style')
     if style_marker is not None:
         assert len(style_marker.args) == 1, \
             "Marker 'style' must specify 1 style."
-        style = style_marker.args[0]
+        style, = style_marker.args
 
     matplotlib.testing.setup()
     if backend is not None:
@@ -64,7 +64,7 @@ def mpl_image_comparison_parameters(request, extension):
     # pytest won't get confused.
     # We annotate the decorated function with any parameters captured by this
     # fixture so that they can be used by the wrapper in image_comparison.
-    baseline_images = request.keywords['baseline_images'].args[0]
+    baseline_images, = request.node.get_closest_marker('baseline_images').args
     if baseline_images is None:
         # Allow baseline image list to be produced on the fly based on current
         # parametrization.

diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -223,15 +223,25 @@ def _xfail_if_format_is_uncomparable(extension):
 
 def _mark_xfail_if_format_is_uncomparable(extension):
     if isinstance(extension, six.string_types):
-        will_fail = extension not in comparable_formats()
+        name = extension
+        marks = []
+    elif isinstance(extension, tuple):
+        # Extension might be a pytest ParameterSet instead of a plain string.
+        # Unfortunately, this type is not exposed, so since it's a namedtuple,
+        # check for a tuple instead.
+        name = extension.values[0]
+        marks = list(extension.marks)
     else:
         # Extension might be a pytest marker instead of a plain string.
-        will_fail = extension.args[0] not in comparable_formats()
-    if will_fail:
-        fail_msg = 'Cannot compare %s files on this system' % extension
+        name = extension.args[0]
+        marks = [extension.mark]
+
+    if name not in comparable_formats():
+        fail_msg = 'Cannot compare %s files on this system' % (name, )
         import pytest
-        return pytest.mark.xfail(extension, reason=fail_msg, strict=False,
-                                 raises=ImageComparisonFailure)
+        marks += [pytest.mark.xfail(reason=fail_msg, strict=False,
+                                    raises=ImageComparisonFailure)]
+        return pytest.param(name, marks=marks)
     else:
         return extension
 

diff --git a/lib/matplotlib/tests/test_backend_pdf.py b/lib/matplotlib/tests/test_backend_pdf.py
@@ -8,6 +8,7 @@
 import os
 import sys
 import tempfile
+import warnings
 
 import numpy as np
 import pytest
@@ -20,9 +21,11 @@
                                             _determinism_check)
 
 
-needs_usetex = pytest.mark.xfail(
-    not checkdep_usetex(True),
-    reason="This test needs a TeX installation")
+with warnings.catch_warnings():
+    warnings.simplefilter('ignore')
+    needs_usetex = pytest.mark.skipif(
+        not checkdep_usetex(True),
+        reason="This test needs a TeX installation")
 
 
 @image_comparison(baseline_images=['pdf_use14corefonts'],

diff --git a/lib/matplotlib/tests/test_backend_ps.py b/lib/matplotlib/tests/test_backend_ps.py
@@ -4,6 +4,7 @@
 
 import io
 import re
+import warnings
 
 import numpy as np
 import pytest
@@ -17,27 +18,30 @@
                                             _determinism_check)
 
 
-needs_ghostscript = pytest.mark.xfail(
-    matplotlib.checkdep_ghostscript()[0] is None,
-    reason="This test needs a ghostscript installation")
-
-
-needs_usetex = pytest.mark.xfail(
-    not matplotlib.checkdep_usetex(True),
-    reason="This test needs a TeX installation")
+with warnings.catch_warnings():
+    warnings.simplefilter('ignore')
+    needs_ghostscript = pytest.mark.skipif(
+        matplotlib.checkdep_ghostscript()[0] is None,
+        reason="This test needs a ghostscript installation")
+    needs_usetex = pytest.mark.skipif(
+        not matplotlib.checkdep_usetex(True),
+        reason="This test needs a TeX installation")
 
 
 # This tests tends to hit a TeX cache lock on AppVeyor.
 @pytest.mark.flaky(reruns=3)
 @pytest.mark.parametrize('format, use_log, rcParams', [
     ('ps', False, {}),
-    needs_ghostscript(('ps', False, {'ps.usedistiller': 'ghostscript'})),
-    needs_usetex(needs_ghostscript(('ps', False, {'text.latex.unicode': True,
-                                                  'text.usetex': True}))),
+    pytest.param('ps', False, {'ps.usedistiller': 'ghostscript'},
+                 marks=needs_ghostscript),
+    pytest.param('ps', False, {'text.latex.unicode': True,
+                               'text.usetex': True},
+                 marks=[needs_ghostscript, needs_usetex]),
     ('eps', False, {}),
     ('eps', True, {'ps.useafm': True}),
-    needs_usetex(needs_ghostscript(('eps', False, {'text.latex.unicode': True,
-                                                   'text.usetex': True}))),
+    pytest.param('eps', False, {'text.latex.unicode': True,
+                                'text.usetex': True},
+                 marks=[needs_ghostscript, needs_usetex]),
 ], ids=[
     'ps',
     'ps with distiller',

diff --git a/lib/matplotlib/tests/test_backend_qt4.py b/lib/matplotlib/tests/test_backend_qt4.py
@@ -29,7 +29,7 @@
     py_qt_ver = QtCore.__version_info__[0]
 
 if py_qt_ver != 4:
-    pytestmark = pytest.mark.xfail(reason='Qt4 is not available')
+    pytestmark = pytest.mark.skipif(reason='Qt4 is not available')
 
 
 @pytest.mark.backend('Qt4Agg')

diff --git a/lib/matplotlib/tests/test_backend_svg.py b/lib/matplotlib/tests/test_backend_svg.py
@@ -6,6 +6,7 @@
 from io import BytesIO
 import os
 import tempfile
+import warnings
 import xml.parsers.expat
 
 import pytest
@@ -16,9 +17,11 @@
 from matplotlib import dviread
 
 
-needs_usetex = pytest.mark.xfail(
-    not matplotlib.checkdep_usetex(True),
-    reason="This test needs a TeX installation")
+with warnings.catch_warnings():
+    warnings.simplefilter('ignore')
+    needs_usetex = pytest.mark.skipif(
+        not matplotlib.checkdep_usetex(True),
+        reason="This test needs a TeX installation")
 
 
 def test_visibility():
@@ -130,7 +133,7 @@ def _test_determinism_save(filename, usetex):
     "filename, usetex",
     # unique filenames to allow for parallel testing
     [("determinism_notex.svg", False),
-     needs_usetex(("determinism_tex.svg", True))])
+     pytest.param("determinism_tex.svg", True, marks=needs_usetex)])
 def test_determinism(filename, usetex):
     import sys
     from subprocess import check_output, STDOUT, CalledProcessError

diff --git a/lib/matplotlib/tests/test_backends_interactive.py b/lib/matplotlib/tests/test_backends_interactive.py
@@ -31,8 +31,10 @@ def _get_testable_interactive_backends():
             reason = "No $DISPLAY"
         elif any(importlib.util.find_spec(dep) is None for dep in deps):
             reason = "Missing dependency"
-        backends.append(pytest.mark.skip(reason=reason)(backend) if reason
-                        else backend)
+        if reason:
+            backend = pytest.param(
+                backend, marks=pytest.mark.skip(reason=reason))
+        backends.append(backend)
     return backends