matplotlib · pizzathief · Oct 31, 2015 · Nov 4, 2015 · Nov 4, 2015 · Nov 4, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -33,7 +33,7 @@ env:
     - NUMPY=numpy
     - PANDAS=
     - NPROC=2
-    - TEST_ARGS=--no-pep8
+    - TEST_ARGS=
     - NOSE_ARGS="--processes=$NPROC --process-timeout=300"
 
 language: python
@@ -46,7 +46,7 @@ matrix:
     - python: 3.5
       env: PANDAS=pandas NOSE_ARGS=--with-coverage
     - python: 3.5
-      env: TEST_ARGS=--pep8
+      env: TEST_ARGS=--pep8 -m pep8
     - python: 3.5
       env: BUILD_DOCS=true
     - python: "nightly"
@@ -77,7 +77,15 @@ install:
     fi
   # Always install from pypi
   - pip install $PRE pep8 cycler coveralls coverage
-  - 'pip install git+https://github.com/jenshnielsen/nose.git@matplotlibnose'
+  # 'pip install git+https://github.com/jenshnielsen/nose.git@matplotlibnose'
+  - pip install pytest
+
+  # some handy plugins for pytest, is this the right place to install them?
+  # https://pypi.python.org/pypi/pytest-cov for docs
+  - pip install pytest-cov
+  # https://pypi.python.org/pypi/pytest-pep8 for docs
+  - pip install pytest-pep8
+
 
   # We manually install humor sans using the package from Ubuntu 14.10. Unfortunatly humor sans is not
   # availible in the Ubuntu version used by Travis but we can manually install the deb from a later
@@ -111,7 +119,7 @@ script:
   - |
     if [[ $BUILD_DOCS == false ]]; then
       export MPL_REPO_DIR=$PWD  # needed for pep8-conformance test of the examples
-      gdb -return-child-result -batch -ex r -ex bt --args python tests.py $NOSE_ARGS $TEST_ARGS
+      gdb -return-child-result -batch -ex r -ex bt --args python tests.py $TEST_ARGS
     else
       cd doc
       python make.py html --small --warningsaserrors

diff --git a/INSTALL b/INSTALL
@@ -114,13 +114,13 @@ not contain test data or example code.  If you want to try the many
 demos that come in the matplotlib source distribution, download the
 :file:`*.tar.gz` file and look in the :file:`examples` subdirectory.
 To run the test suite, copy the :file:`lib\matplotlib\tests` and
-:file:`lib\mpl_toolkits\tests` directories from the source
-distribution to :file:`sys.prefix\Lib\site-packages\matplotlib` and
-:file:`sys.prefix\Lib\site-packages\mpl_toolkits` respectively, and
-install `nose <https://pypi.python.org/pypi/nose>`_, `mock
-<https://pypi.python.org/pypi/mock>`_, Pillow, MiKTeX, GhostScript,
-ffmpeg, avconv, mencoder, ImageMagick, and `Inkscape
-<http://inkscape.org/>`_.
+:file:`lib\mpl_toolkits\tests` directories from the source distribution to
+:file:`sys.prefix\Lib\site-packages\matplotlib` and
+:file:`sys.prefix\Lib\site-packages\mpl_toolkits` respectively, and install
+`pytest <https://pypi.python.org/pypi/pytest>`_,
+`mock <https://pypi.python.org/pypi/mock>`_,
+Pillow, MiKTeX, GhostScript, ffmpeg, avconv, mencoder, ImageMagick, and
+`Inkscape <http://inkscape.org/>`_.
 
 
 

diff --git a/conftest.py b/conftest.py
diff --git a/doc/devel/testing.rst b/doc/devel/testing.rst
@@ -3,20 +3,20 @@
 Testing
 =======
 
-Matplotlib has a testing infrastructure based on nose_, making it easy
+Matplotlib has a testing infrastructure based on pytest, making it easy
 to write new tests. The tests are in :mod:`matplotlib.tests`, and
-customizations to the nose testing infrastructure are in
+customizations to the pytest testing infrastructure are in
 :mod:`matplotlib.testing`. (There is other old testing cruft around,
 please ignore it while we consolidate our testing to these locations.)
 
-.. _nose: http://nose.readthedocs.org/en/latest/
+.. pytest: http://pytest.readthedocs.org/en/latest/
 
 Requirements
 ------------
 
 The following software is required to run the tests:
 
-  - nose_, version 1.0 or later
+  - pytest
 
   - `mock <http://www.voidspace.org.uk/python/mock/>`_, when running python
     versions < 3.3
@@ -33,6 +33,10 @@ Optionally you can install:
 
   - `pep8 <http://pep8.readthedocs.org/en/latest>`_ to test coding standards
 
+  - `pytest-cov <https://pypi.python.org/pypi/pytest-cov>`_ for coverage stats in pytest
+
+  - `pytest-pep8 <https://pypi.python.org/pypi/pytest-pep8>`_ for pep8 conformance in pytest
+
 Building matplotlib for image comparison tests
 ----------------------------------------------
 
@@ -52,7 +56,7 @@ matplotlib source directory::
 Running the tests
 -----------------
 
-Running the tests is simple. Make sure you have nose installed and run::
+Running the tests is simple. Make sure you have pytest installed and run::
 
    python tests.py
 
@@ -112,15 +116,15 @@ Writing a simple test
 Many elements of Matplotlib can be tested using standard tests. For
 example, here is a test from :mod:`matplotlib.tests.test_basic`::
 
-  from nose.tools import assert_equal
+  import pytest
 
   def test_simple():
       """
       very simple example test
       """
-      assert_equal(1+1,2)
+      assert 1+1 == 2
 
-Nose determines which functions are tests by searching for functions
+Pytest determines which functions are tests by searching for functions
 beginning with "test" in their name.
 
 If the test has side effects that need to be cleaned up, such as
@@ -203,15 +207,15 @@ Known failing tests
 -------------------
 
 If you're writing a test, you may mark it as a known failing test with
-the :func:`~matplotlib.testing.decorators.knownfailureif`
+the :func:`~pytest.mark.xfail`
 decorator. This allows the test to be added to the test suite and run
 on the buildbots without causing undue alarm. For example, although
 the following test will fail, it is an expected failure::
 
   from nose.tools import assert_equal
   from matplotlib.testing.decorators import knownfailureif
 
-  @knownfailureif(True)
+  @pytest.mark.xfail()
   def test_simple_fail():
       '''very simple example test that should fail'''
       assert_equal(1+1,3)

diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1515,21 +1515,22 @@ def _init_tests():
             "Expect many image comparison failures below.")
 
     try:
-        import nose
+        # import nose
         try:
             from unittest import mock
         except:
             import mock
     except ImportError:
-        print("matplotlib.test requires nose and mock to run.")
+        print("matplotlib.test requires mock to run. nose is currently being removed")
         raise
 
 
 def _get_extra_test_plugins():
-    from .testing.noseclasses import KnownFailure
-    from nose.plugins import attrib
+    # from .testing.noseclasses import KnownFailure
+    # from nose.plugins import attrib
 
-    return [KnownFailure, attrib.Plugin]
+    #return [KnownFailure, attrib.Plugin]
+    pass
 
 
 def _get_nose_env():

diff --git a/lib/matplotlib/ignorenumpytests.py b/lib/matplotlib/ignorenumpytests.py
@@ -0,0 +1,29 @@
+import pytest
+"""
+So pytest is trying to load tests in numpy, and generates this error
+
+____________________________ ERROR at setup of test ____________________________
+file /home/travis/build/matplotlib/matplotlib/venv/lib/python2.7/site-packages/
+numpy/testing/nosetester.py, line 249
+      def test(self, label='fast', verbose=1, extra_argv=None, doctests=False,
+        fixture 'self' not found
+        available fixtures: tmpdir_factory, pytestconfig, cov, cache, recwarn,
+        monkeypatch, record_xml_property, capfd, capsys, tmpdir
+
+        use 'py.test --fixtures [testpath]' for help on them.
+/home/travis/build/matplotlib/matplotlib/venv/lib/python2.7/site-packages/
+ numpy/testing/nosetester.py:249
+
+this file is intended to stop that behaviour, by blocking files from
+being considered for collection if "numpy" is in the path
+"""
+
+def pytest_ignore_collect(path, config):
+    if 'numpy' not in path.basename:
+        print('allowing ', path)
+        return True
+    else:
+        print('blocking ', path)
+        return False
+
+#    return 'numpy' not in path.basename:
diff --git a/lib/matplotlib/sphinxext/tests/test_tinypages.py b/lib/matplotlib/sphinxext/tests/test_tinypages.py
@@ -7,8 +7,7 @@
 
 from subprocess import call, Popen, PIPE
 
-from nose import SkipTest
-from nose.tools import assert_true
+import pytest
 
 HERE = dirname(__file__)
 TINY_PAGES = pjoin(HERE, 'tinypages')
@@ -19,7 +18,7 @@ def setup():
     try:
         ret = call(['sphinx-build', '--help'], stdout=PIPE, stderr=PIPE)
     except OSError:
-        raise SkipTest('Need sphinx-build on path for these tests')
+        raise pytest.skip('Need sphinx-build on path for these tests')
     if ret != 0:
         raise RuntimeError('sphinx-build does not return 0')
 
@@ -62,29 +61,29 @@ def teardown_class(cls):
         shutil.rmtree(cls.page_build)
 
     def test_some_plots(self):
-        assert_true(isdir(self.html_dir))
+        assert isdir(self.html_dir)
 
         def plot_file(num):
             return pjoin(self.html_dir, 'some_plots-{0}.png'.format(num))
 
         range_10, range_6, range_4 = [plot_file(i) for i in range(1, 4)]
         # Plot 5 is range(6) plot
-        assert_true(file_same(range_6, plot_file(5)))
+        assert file_same(range_6, plot_file(5))
         # Plot 7 is range(4) plot
-        assert_true(file_same(range_4, plot_file(7)))
+        assert file_same(range_4, plot_file(7))
         # Plot 11 is range(10) plot
-        assert_true(file_same(range_10, plot_file(11)))
+        assert file_same(range_10, plot_file(11))
         # Plot 12 uses the old range(10) figure and the new range(6) figure
-        assert_true(file_same(range_10, plot_file('12_00')))
-        assert_true(file_same(range_6, plot_file('12_01')))
+        assert file_same(range_10, plot_file('12_00'))
+        assert file_same(range_6, plot_file('12_01'))
         # Plot 13 shows close-figs in action
-        assert_true(file_same(range_4, plot_file(13)))
+        assert file_same(range_4, plot_file(13))
         # Plot 14 has included source
         with open(pjoin(self.html_dir, 'some_plots.html'), 'rt') as fobj:
             html_contents = fobj.read()
-        assert_true('# Only a comment' in html_contents)
+        assert '# Only a comment' in html_contents
         # check plot defined in external file.
-        assert_true(file_same(range_4, pjoin(self.html_dir, 'range4.png')))
-        assert_true(file_same(range_6, pjoin(self.html_dir, 'range6.png')))
+        assert file_same(range_4, pjoin(self.html_dir, 'range4.png'))
+        assert file_same(range_6, pjoin(self.html_dir, 'range6.png'))
         # check if figure caption made it into html file
-        assert_true('This is the caption for plot 15.' in html_contents)
+        assert 'This is the caption for plot 15.' in html_contents