Merge pull request #11808 from eseiver/pytest

choldgraf · web-flow · commit 70e7850c7676 · 2018-08-04T19:50:14.000-07:00
updates error message to run pytest instead of tests.py standalone
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -106,7 +106,7 @@ test_script:
   - python -c "import matplotlib as m; m.use('tkagg'); import matplotlib.pyplot as plt; print(plt.get_backend())"
   # tests
   - echo The following args are passed to pytest %PYTEST_ARGS%
-  - python tests.py %PYTEST_ARGS%
+  - pytest %PYTEST_ARGS%
 
 after_test:
   # After the tests were a success, build wheels with the static libs
diff --git a/doc/devel/contributing.rst b/doc/devel/contributing.rst
@@ -265,7 +265,7 @@ tools:
 * Code with a good unittest coverage (at least 70%, better 100%), check with::
 
    python -mpip install coverage
-   python tests.py --with-coverage
+   pytest --cov=matplotlib --showlocals -v
 
 * No pyflakes warnings, check with::
 
diff --git a/doc/devel/release_guide.rst b/doc/devel/release_guide.rst
@@ -20,7 +20,8 @@ We use `travis-ci <https://travis-ci.org/matplotlib/matplotlib>`__ for
 continuous integration.  When preparing for a release, the final
 tagged commit should be tested locally before it is uploaded::
 
-   python tests.py --processes=8 --process-timeout=300
+   pytest -n 8 .
+
 
 In addition the following two tests should be run and manually inspected::
 
diff --git a/doc/devel/testing.rst b/doc/devel/testing.rst
@@ -46,7 +46,8 @@ Running the tests is simple. Make sure you have pytest installed and run::
 
 or::
 
-   python tests.py
+   pytest .
+
 
 in the root directory of the distribution. The script takes a set of
 commands, such as:
diff --git a/setup.py b/setup.py
@@ -121,7 +121,7 @@
 class NoopTestCommand(TestCommand):
     def __init__(self, dist):
         print("Matplotlib does not support running tests with "
-              "'python setup.py test'. Please run 'python tests.py'.")
+              "'python setup.py test'. Please run 'pytest'.")
 
 
 class BuildExtraLibraries(BuildExtCommand):
diff --git a/tools/triage_tests.py b/tools/triage_tests.py
@@ -376,7 +376,7 @@ def launch(result_images, source):
 Triage image comparison test failures.
 
 If no arguments are provided, it assumes you ran the tests at the
-top-level of a source checkout as `python tests.py`.
+top-level of a source checkout as `pytest .`.
 
 Keys:
     left/right: Move between test, expected and diff images
