diff --git a/bench/manyparam.py b/bench/manyparam.py index d2bca0e8a..6ba5b2691 100644 --- a/bench/manyparam.py +++ b/bench/manyparam.py @@ -9,4 +9,3 @@ def test_it(foo): pass def test_it2(foo): pass - diff --git a/doc/en/_templates/links.html b/doc/en/_templates/links.html index 3a1a27a26..6f27757a3 100644 --- a/doc/en/_templates/links.html +++ b/doc/en/_templates/links.html @@ -6,4 +6,3 @@
  • Issue Tracker
  • PDF Documentation - diff --git a/doc/en/announce/release-2.0.3.rst b/doc/en/announce/release-2.0.3.rst index 9bbfdaab3..8dc08b074 100644 --- a/doc/en/announce/release-2.0.3.rst +++ b/doc/en/announce/release-2.0.3.rst @@ -37,4 +37,3 @@ Changes between 2.0.2 and 2.0.3 internally) - fix issue37: avoid invalid characters in junitxml's output - diff --git a/doc/en/announce/release-2.1.1.rst b/doc/en/announce/release-2.1.1.rst index ecdd69f4d..c2285eba9 100644 --- a/doc/en/announce/release-2.1.1.rst +++ b/doc/en/announce/release-2.1.1.rst @@ -34,4 +34,3 @@ Changes between 2.1.0 and 2.1.1 - fix issue59: provide system-out/err tags for junitxml output - fix issue61: assertion rewriting on boolean operations with 3 or more operands - you can now build a man page with "cd doc ; make man" - diff --git a/doc/en/announce/release-2.1.2.rst b/doc/en/announce/release-2.1.2.rst index 51b7591d3..1975f368a 100644 --- a/doc/en/announce/release-2.1.2.rst +++ b/doc/en/announce/release-2.1.2.rst @@ -30,4 +30,3 @@ Changes between 2.1.1 and 2.1.2 - fix issue68 / packages now work with assertion rewriting - fix issue66: use different assertion rewriting caches when the -O option is passed - don't try assertion rewriting on Jython, use reinterp - diff --git a/doc/en/announce/release-2.2.4.rst b/doc/en/announce/release-2.2.4.rst index 67f0feb27..a8fb9b93c 100644 --- a/doc/en/announce/release-2.2.4.rst +++ b/doc/en/announce/release-2.2.4.rst @@ -36,4 +36,3 @@ Changes between 2.2.3 and 2.2.4 configure/sessionstart where called - fix issue #144: better mangle test ids to junitxml classnames - upgrade distribute_setup.py to 0.6.27 - diff --git a/doc/en/announce/release-2.3.0.rst b/doc/en/announce/release-2.3.0.rst index f863aad0a..e196832fd 100644 --- a/doc/en/announce/release-2.3.0.rst +++ b/doc/en/announce/release-2.3.0.rst @@ -131,4 +131,3 @@ Changes between 2.2.4 and 2.3.0 - don't show deselected reason line if there is none - py.test -vv will show all of assert comparisons instead of truncating - diff --git a/doc/en/announce/release-2.3.3.rst b/doc/en/announce/release-2.3.3.rst index 3a48b6ac4..9b4c37712 100644 --- a/doc/en/announce/release-2.3.3.rst +++ b/doc/en/announce/release-2.3.3.rst @@ -59,4 +59,3 @@ Changes between 2.3.2 and 2.3.3 - fix issue127 - improve documentation for pytest_addoption() and add a ``config.getoption(name)`` helper function for consistency. - diff --git a/doc/en/announce/release-2.3.5.rst b/doc/en/announce/release-2.3.5.rst index bb4e84af0..90b4ce753 100644 --- a/doc/en/announce/release-2.3.5.rst +++ b/doc/en/announce/release-2.3.5.rst @@ -94,4 +94,3 @@ Changes between 2.3.4 and 2.3.5 - fix issue134 - print the collect errors that prevent running specified test items - fix issue266 - accept unicode in MarkEvaluator expressions - diff --git a/doc/en/announce/release-2.4.0.rst b/doc/en/announce/release-2.4.0.rst index 4fb3d05cd..d7dedc722 100644 --- a/doc/en/announce/release-2.4.0.rst +++ b/doc/en/announce/release-2.4.0.rst @@ -222,4 +222,3 @@ Bug fixes: - pytest_terminal_summary(terminalreporter) hooks can now use ".section(title)" and ".line(msg)" methods to print extra information at the end of a test run. - diff --git a/doc/en/announce/release-2.5.0.rst b/doc/en/announce/release-2.5.0.rst index b04a825cd..3183d18a1 100644 --- a/doc/en/announce/release-2.5.0.rst +++ b/doc/en/announce/release-2.5.0.rst @@ -172,4 +172,3 @@ holger krekel does not duplicate the unittest-API into the "plain" namespace. - fix verbose reporting for @mock'd test functions - diff --git a/doc/en/announce/release-2.5.1.rst b/doc/en/announce/release-2.5.1.rst index a3a74cec6..569698fc9 100644 --- a/doc/en/announce/release-2.5.1.rst +++ b/doc/en/announce/release-2.5.1.rst @@ -44,4 +44,3 @@ holger krekel - fix issue407: fix addoption docstring to point to argparse instead of optparse. Thanks Daniel D. Wright. - diff --git a/doc/en/announce/release-2.5.2.rst b/doc/en/announce/release-2.5.2.rst index d5cfca2db..5df5d4beb 100644 --- a/doc/en/announce/release-2.5.2.rst +++ b/doc/en/announce/release-2.5.2.rst @@ -61,4 +61,3 @@ holger krekel expressions now work better. Thanks Floris Bruynooghe. - make capfd/capsys.capture private, its unused and shouldn't be exposed - diff --git a/doc/en/announce/release-2.6.1.rst b/doc/en/announce/release-2.6.1.rst index 2f3257cd8..fba6f2993 100644 --- a/doc/en/announce/release-2.6.1.rst +++ b/doc/en/announce/release-2.6.1.rst @@ -56,4 +56,3 @@ Changes 2.6.1 - don't use py.std import helper, rather import things directly. Thanks Bruno Oliveira. - diff --git a/doc/en/announce/release-2.6.2.rst b/doc/en/announce/release-2.6.2.rst index 4efc73a4e..f6ce178a1 100644 --- a/doc/en/announce/release-2.6.2.rst +++ b/doc/en/announce/release-2.6.2.rst @@ -49,4 +49,3 @@ holger krekel - Do not mark as universal wheel because Python 2.6 is different from other builds due to the extra argparse dependency. Fixes issue566. Thanks sontek. - diff --git a/doc/en/announce/release-2.6.3.rst b/doc/en/announce/release-2.6.3.rst index ee0d2692c..7353dfee7 100644 --- a/doc/en/announce/release-2.6.3.rst +++ b/doc/en/announce/release-2.6.3.rst @@ -49,4 +49,3 @@ Changes 2.6.3 - check xfail/skip also with non-python function test items. Thanks Floris Bruynooghe. - diff --git a/doc/en/announce/release-2.7.0.rst b/doc/en/announce/release-2.7.0.rst index 4e317ff8f..d63081edb 100644 --- a/doc/en/announce/release-2.7.0.rst +++ b/doc/en/announce/release-2.7.0.rst @@ -98,4 +98,3 @@ holger krekel - On failure, the ``sys.last_value``, ``sys.last_type`` and ``sys.last_traceback`` are set, so that a user can inspect the error via postmortem debugging (almarklein). - diff --git a/doc/en/announce/release-2.7.2.rst b/doc/en/announce/release-2.7.2.rst index 69130ad62..1e3950de4 100644 --- a/doc/en/announce/release-2.7.2.rst +++ b/doc/en/announce/release-2.7.2.rst @@ -55,4 +55,3 @@ The py.test Development Team - fix issue756, fix issue752 (and similar issues): depend on py-1.4.29 which has a refined algorithm for traceback generation. - diff --git a/doc/en/announce/release-2.8.3.rst b/doc/en/announce/release-2.8.3.rst index d080ac724..c20e140c1 100644 --- a/doc/en/announce/release-2.8.3.rst +++ b/doc/en/announce/release-2.8.3.rst @@ -56,4 +56,3 @@ The py.test Development Team - extend documentation on the --ignore cli option - use pytest-runner for setuptools integration - minor fixes for interaction with OS X El Capitan system integrity protection (thanks Florian) - diff --git a/doc/en/announce/release-2.8.7.rst b/doc/en/announce/release-2.8.7.rst index d98d73106..9005f5636 100644 --- a/doc/en/announce/release-2.8.7.rst +++ b/doc/en/announce/release-2.8.7.rst @@ -28,4 +28,4 @@ The py.test Development Team 2.8.7 (compared to 2.8.6) ------------------------- -- fix #1338: use predictable object resolution for monkeypatch \ No newline at end of file +- fix #1338: use predictable object resolution for monkeypatch diff --git a/doc/en/announce/release-2.9.0.rst b/doc/en/announce/release-2.9.0.rst index 011b1ffb9..db2f60f1e 100644 --- a/doc/en/announce/release-2.9.0.rst +++ b/doc/en/announce/release-2.9.0.rst @@ -156,4 +156,4 @@ The py.test Development Team .. _@tomviner: https://github.com/tomviner .. _@RonnyPfannschmidt: https://github.com/RonnyPfannschmidt .. _@rabbbit: https://github.com/rabbbit -.. _@hackebrot: https://github.com/hackebrot \ No newline at end of file +.. _@hackebrot: https://github.com/hackebrot diff --git a/doc/en/bash-completion.rst b/doc/en/bash-completion.rst index 81fe62183..58c3d878d 100644 --- a/doc/en/bash-completion.rst +++ b/doc/en/bash-completion.rst @@ -23,6 +23,3 @@ For permanent (but not global) ``pytest`` activation, use:: For one-time activation of argcomplete for ``pytest`` only, use:: eval "$(register-python-argcomplete pytest)" - - - diff --git a/doc/en/builtin.rst b/doc/en/builtin.rst index 554cf59b2..f5e1fd155 100644 --- a/doc/en/builtin.rst +++ b/doc/en/builtin.rst @@ -120,4 +120,3 @@ You can also interactively ask for help, e.g. by typing on the Python interactiv import pytest help(pytest) - diff --git a/doc/en/cache.rst b/doc/en/cache.rst index 57a091116..9af0e3477 100644 --- a/doc/en/cache.rst +++ b/doc/en/cache.rst @@ -260,5 +260,3 @@ by adding the ``--cache-clear`` option like this:: This is recommended for invocations from Continuous Integration servers where isolation and correctness is more important than speed. - - diff --git a/doc/en/check_sphinx.py b/doc/en/check_sphinx.py index 0f536ffa6..2968888da 100644 --- a/doc/en/check_sphinx.py +++ b/doc/en/check_sphinx.py @@ -13,5 +13,3 @@ def test_linkcheck(tmpdir): subprocess.check_call( ["sphinx-build", "-blinkcheck", "-d", str(doctrees), ".", str(htmldir)]) - - diff --git a/doc/en/contact.rst b/doc/en/contact.rst index 83d496640..7d968168a 100644 --- a/doc/en/contact.rst +++ b/doc/en/contact.rst @@ -47,4 +47,3 @@ Contact channels .. _`development mailing list`: .. _`pytest-dev at python.org (mailing list)`: http://mail.python.org/mailman/listinfo/pytest-dev .. _`pytest-commit at python.org (mailing list)`: http://mail.python.org/mailman/listinfo/pytest-commit - diff --git a/doc/en/contents.rst b/doc/en/contents.rst index 38a4be941..9f1d8d85a 100644 --- a/doc/en/contents.rst +++ b/doc/en/contents.rst @@ -62,4 +62,3 @@ Full pytest documentation :maxdepth: 1 changelog - diff --git a/doc/en/doctest.rst b/doc/en/doctest.rst index 2ee7110b3..ac470d105 100644 --- a/doc/en/doctest.rst +++ b/doc/en/doctest.rst @@ -168,5 +168,3 @@ by using one of standard doctest modules format in options pytest --doctest-modules --doctest-report cdiff pytest --doctest-modules --doctest-report ndiff pytest --doctest-modules --doctest-report only_first_failure - - diff --git a/doc/en/example/assertion/test_setup_flow_example.py b/doc/en/example/assertion/test_setup_flow_example.py index 100effa49..f2f7ec5cb 100644 --- a/doc/en/example/assertion/test_setup_flow_example.py +++ b/doc/en/example/assertion/test_setup_flow_example.py @@ -39,4 +39,3 @@ Note that ``setup_class(TestStateFullThing)`` is called and not to insert ``setup_class = classmethod(setup_class)`` to make your setup function callable. """ - diff --git a/doc/en/example/costlysetup/sub_b/test_two.py b/doc/en/example/costlysetup/sub_b/test_two.py index 6ed6ee4d8..381a82291 100644 --- a/doc/en/example/costlysetup/sub_b/test_two.py +++ b/doc/en/example/costlysetup/sub_b/test_two.py @@ -3,4 +3,3 @@ def test_something(setup): def test_something_more(setup): assert setup.timecostly == 1 - diff --git a/doc/en/example/py2py3/conftest.py b/doc/en/example/py2py3/conftest.py index 81cd1fb11..6fef90884 100644 --- a/doc/en/example/py2py3/conftest.py +++ b/doc/en/example/py2py3/conftest.py @@ -11,6 +11,3 @@ def pytest_pycollect_makemodule(path, parent): bn = path.basename if "py3" in bn and not py3 or ("py2" in bn and py3): return DummyCollector(path, parent=parent) - - - diff --git a/doc/en/example/py2py3/test_py2.py b/doc/en/example/py2py3/test_py2.py index e09ed9466..664acf178 100644 --- a/doc/en/example/py2py3/test_py2.py +++ b/doc/en/example/py2py3/test_py2.py @@ -4,4 +4,3 @@ def test_exception_syntax(): 0/0 except ZeroDivisionError, e: pass - diff --git a/doc/en/example/py2py3/test_py3.py b/doc/en/example/py2py3/test_py3.py index a811f2bbc..1cda64473 100644 --- a/doc/en/example/py2py3/test_py3.py +++ b/doc/en/example/py2py3/test_py3.py @@ -4,4 +4,3 @@ def test_exception_syntax(): 0/0 except ZeroDivisionError as e: pass - diff --git a/doc/en/example/simple.rst b/doc/en/example/simple.rst index 90d1bd4ad..e6737c012 100644 --- a/doc/en/example/simple.rst +++ b/doc/en/example/simple.rst @@ -854,4 +854,3 @@ This allows you to execute tests using the frozen application with standard ``pytest`` command-line options:: ./app_main --pytest --verbose --tb=long --junitxml=results.xml test-suite/ - diff --git a/doc/en/funcarg_compare.rst b/doc/en/funcarg_compare.rst index b857a014d..a744a457f 100644 --- a/doc/en/funcarg_compare.rst +++ b/doc/en/funcarg_compare.rst @@ -214,5 +214,3 @@ fixtures: and simplify your fixture function code to use the :ref:`@pytest.fixture` decorator instead. This will also allow to take advantage of the automatic per-resource grouping of tests. - - diff --git a/doc/en/funcargs.rst b/doc/en/funcargs.rst index bc2c04302..4173675cd 100644 --- a/doc/en/funcargs.rst +++ b/doc/en/funcargs.rst @@ -11,4 +11,3 @@ and you can read on here: - :ref:`fixtures` - :ref:`parametrize` - :ref:`funcargcompare` - diff --git a/doc/en/mark.rst b/doc/en/mark.rst index f07917653..7f39fd728 100644 --- a/doc/en/mark.rst +++ b/doc/en/mark.rst @@ -136,4 +136,3 @@ More details can be found in the `original PR