Merge remote-tracking branch 'origin/v3.1.1-doc' into v3.1.x

tacaswell · tacaswell · commit 6665d1f204f9 · 2019-08-12T13:57:28.000-04:00
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
@@ -184,11 +184,6 @@ <h3>{{ _('Navigation') }}</h3>
     </a>
 </div>
 {%- endif %}
-<div id="plotting-contest" style="padding: 6px; background-color: teal; color: white;">
-<p style="margin: 0;">The 2019 SciPy John Hunter Excellence in Plotting Contest is accepting submissions!
-  <br />
-  <a href="https://docs.google.com/forms/d/e/1FAIpQLSe-_AnKvYSzeQWfNDRoXgW0vl7_8q6jj3QbLIac8eUcb9lSAA/viewform?usp=sf_link" style="font-weight: bold;">Apply by June 8th</a></p>
-</div>
 
 <div style="background-color: white; text-align: left; padding: 10px 10px 15px 15px; position: relative;">
 {%- if builder in ('htmlhelp', 'devhelp', 'latex') %}
diff --git a/doc/citing.rst b/doc/citing.rst
@@ -27,6 +27,9 @@ pp. 90-95, 2007 <https://doi.org/10.1109/MCSE.2007.55>`_.
 
 DOIs
 ----
+v3.1.1
+   .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3264781.svg
+      :target: https://doi.org/10.5281/zenodo.3264781
 v3.1.0
    .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.2893252.svg
       :target: https://doi.org/10.5281/zenodo.2893252
diff --git a/doc/devel/testing.rst b/doc/devel/testing.rst
@@ -12,9 +12,10 @@ infrastructure are in :mod:`matplotlib.testing`.
 .. _Ghostscript: https://www.ghostscript.com/
 .. _Inkscape: https://inkscape.org
 .. _pytest-cov: https://pytest-cov.readthedocs.io/en/latest/
-.. _pytest-pep8: https://pypi.python.org/pypi/pytest-pep8
-.. _pytest-xdist: https://pypi.python.org/pypi/pytest-xdist
-.. _pytest-timeout: https://pypi.python.org/pypi/pytest-timeout
+.. _pytest-flake8: https://pypi.org/project/pytest-flake8/
+.. _pytest-xdist: https://pypi.org/project/pytest-xdist/
+.. _pytest-timeout: https://pypi.org/project/pytest-timeout/
+.. _flake8: https://pypi.org/project/flake8/
 
 Requirements
 ------------
@@ -32,7 +33,7 @@ The following software is required to run the tests:
 Optionally you can install:
 
 - pytest-cov_ (>=2.3.1) to collect coverage information
-- pytest-pep8_ to test coding standards
+- pytest-flake8_ to test coding standards using flake8_
 - pytest-timeout_ to limit runtime in case of stuck tests
 - pytest-xdist_ to run tests in parallel
 
@@ -44,29 +45,20 @@ Running the tests is simple. Make sure you have pytest installed and run::
 
    pytest
 
-or::
+in the root directory of the repository.
 
-   pytest .
-
-
-in the root directory of the distribution. The script takes a set of
-commands, such as:
-
-========================  ===========
-``--pep8``                Perform pep8 checks (requires pytest-pep8_)
-``-m "not network"``      Disable tests that require network access
-========================  ===========
-
-Additional arguments are passed on to pytest. See the pytest documentation for
-`supported arguments`_. Some of the more important ones are given here:
+`pytest` can be configured via a lot of `commandline parameters`_. Some
+particularly useful ones are:
 
 =============================  ===========
-``--verbose``                  Be more verbose
-``--n NUM``                    Run tests in parallel over NUM
+``-v`` or ``--verbose``        Be more verbose
+``-n NUM``                     Run tests in parallel over NUM
                                processes (requires pytest-xdist_)
 ``--timeout=SECONDS``          Set timeout for results from each test
                                process (requires pytest-timeout_)
 ``--capture=no`` or ``-s``     Do not capture stdout
+``--flake8``                   Check coding standards using flake8_
+                               (requires pytest-flake8_)
 =============================  ===========
 
 To run a single test from the command line, you can provide a file path,
@@ -98,7 +90,7 @@ function :func:`matplotlib.test`::
   matplotlib.test()
 
 
-.. _supported arguments: http://doc.pytest.org/en/latest/usage.html
+.. _commandline parameters: http://doc.pytest.org/en/latest/usage.html
 
 
 Writing a simple test
diff --git a/doc/thirdpartypackages/index.rst b/doc/thirdpartypackages/index.rst
@@ -100,7 +100,7 @@ class that can have a visual break to indicate a discontinuous range.
 DeCiDa
 ======
 
-`DeCiDa <https://pypi.python.org/pypi/DeCiDa>`_ is a library of functions
+`DeCiDa <https://pypi.org/project/DeCiDa/>`_ is a library of functions
 and classes for electron device characterization, electronic circuit design and
 general data visualization and analysis.
 
