Merge master into features

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# info:
+# * https://help.github.com/en/articles/displaying-a-sponsor-button-in-your-repository
+# * https://tidelift.com/subscription/how-to-connect-tidelift-with-github
+tidelift: pypi/pytest

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,7 @@
 <!--
 Thanks for submitting a PR, your contribution is really appreciated!
 
-Here's a quick checklist that should be present in PRs.
+Here is a quick checklist that should be present in PRs.
 (please delete this text from the final description, this is just a guideline)
 -->
 

.pre-commit-config.yaml

@@ -13,10 +13,11 @@ repos:
         additional_dependencies: [black==19.3b0]
         language_version: python3
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.1.0
+    rev: v2.2.2
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
+    -   id: fix-encoding-pragma
     -   id: check-yaml
     -   id: debug-statements
         exclude: _pytest/debugging.py

AUTHORS

@@ -9,6 +9,7 @@ Abhijeet Kasurde
 Adam Johnson
 Adam Uhlir
 Ahn Ki-Wook
+Akiomi Kamakura
 Alan Velasco
 Alexander Johnson
 Alexei Kozlenok

CHANGELOG.rst

@@ -1630,7 +1630,7 @@ Bug Fixes
 - `#2220 <https://github.com/pytest-dev/pytest/issues/2220>`_: Fix a bug where fixtures overridden by direct parameters (for example parametrization) were being instantiated even if they were not being used by a test.
 
 
-- `#3695 <https://github.com/pytest-dev/pytest/issues/3695>`_: Fix ``ApproxNumpy`` initialisation argument mixup, ``abs`` and ``rel`` tolerances were flipped causing strange comparsion results.
+- `#3695 <https://github.com/pytest-dev/pytest/issues/3695>`_: Fix ``ApproxNumpy`` initialisation argument mixup, ``abs`` and ``rel`` tolerances were flipped causing strange comparison results.
   Add tests to check ``abs`` and ``rel`` tolerances for ``np.array`` and test for expecting ``nan`` with ``np.array()``
 
 

bench/bench.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import sys
 
 if __name__ == "__main__":

bench/bench_argcomplete.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # 10000 iterations, just for relative comparison
 #                      2.7.5     3.3.2
 # FilesCompleter       75.1109   69.2116

bench/empty.py

@@ -1,2 +1,3 @@
+# -*- coding: utf-8 -*-
 for i in range(1000):
     exec("def test_func_%d(): pass" % i)

bench/manyparam.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import pytest
 
 

bench/skip.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from six.moves import range
 
 import pytest

changelog/2064.bugfix.rst

@@ -0,0 +1 @@
+The debugging plugin imports the wrapped ``Pdb`` class (``--pdbcls``) on-demand now.

changelog/4908.bugfix.rst

@@ -0,0 +1 @@
+The ``pytest_enter_pdb`` hook gets called with post-mortem (``--pdb``).

changelog/5278.bugfix.rst

@@ -0,0 +1 @@
+Pytest's internal python plugin can be disabled using ``-p no:python`` again.

changelog/5286.bugfix.rst

@@ -0,0 +1 @@
+Fix issue with ``disable_test_id_escaping_and_forfeit_all_rights_to_community_support`` option doesn't work when using a list of test IDs in parametrized tests.

doc/en/_themes/flask_theme_support.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # flasky extensions.  flasky pygments style based on tango style
 from pygments.style import Style
 from pygments.token import Comment

doc/en/conftest.py

@@ -1 +1,2 @@
+# -*- coding: utf-8 -*-
 collect_ignore = ["conf.py"]

doc/en/contents.rst

@@ -50,6 +50,7 @@ Full pytest documentation
    projects
    faq
    contact
+   tidelift
 
 .. only:: html
 

doc/en/example/assertion/failure_demo.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import _pytest._code
 import pytest
 from pytest import raises

doc/en/example/assertion/global_testmodule_config/conftest.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import py
 
 import pytest

doc/en/example/assertion/global_testmodule_config/test_hello_world.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 hello = "world"
 
 

doc/en/example/assertion/test_failures.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import py
 
 failure_demo = py.path.local(__file__).dirpath("failure_demo.py")

doc/en/example/assertion/test_setup_flow_example.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 def setup_module(module):
     module.TestStateFullThing.classcount = 0
 

doc/en/example/conftest.py

@@ -1 +1,2 @@
+# -*- coding: utf-8 -*-
 collect_ignore = ["nonpython"]

doc/en/example/costlysetup/conftest.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import pytest
 
 

doc/en/example/costlysetup/sub_a/__init__.py

@@ -1 +1,2 @@
+# -*- coding: utf-8 -*-
 #

doc/en/example/costlysetup/sub_a/test_quick.py

@@ -1,2 +1,3 @@
+# -*- coding: utf-8 -*-
 def test_quick(setup):
     pass

doc/en/example/costlysetup/sub_b/__init__.py

@@ -1 +1,2 @@
+# -*- coding: utf-8 -*-
 #

doc/en/example/costlysetup/sub_b/test_two.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 def test_something(setup):
     assert setup.timecostly == 1
 

doc/en/example/multipython.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 module containing a parametrized tests testing cross-python
 serialization via the pickle module.

doc/en/example/nonpython/conftest.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # content of conftest.py
 import pytest
 

doc/en/example/py2py3/conftest.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import sys
 
 import pytest

doc/en/example/py2py3/test_py3.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 def test_exception_syntax():
     try:
         0 / 0

doc/en/example/pythoncollection.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # run this with $ pytest --collect-only test_collectonly.py
 #
 

doc/en/example/xfail_demo.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import pytest
 
 xfail = pytest.mark.xfail

doc/en/fixture.rst

@@ -1179,6 +1179,8 @@ Given the tests file structure is:
 
         conftest.py
             # content of tests/conftest.py
+            import pytest
+
             @pytest.fixture
             def username():
                 return 'username'

doc/en/py27-py34-deprecation.rst

@@ -7,16 +7,20 @@ Python 3.4's last release is scheduled for
 `March 2019 <https://www.python.org/dev/peps/pep-0429/#release-schedule>`__. pytest is one of
 the participating projects of the https://python3statement.org.
 
-We plan to drop support for Python 2.7 and 3.4 at the same time with the release of **pytest 5.0**,
-scheduled to be released by **mid-2019**. Thanks to the `python_requires <https://packaging.python.org/guides/distributing-packages-using-setuptools/#python-requires>`__ ``setuptools`` option,
+The **pytest 4.6** series will be the last to support Python 2.7 and 3.4, and is scheduled
+to be released by **mid-2019**. **pytest 5.0** and onwards will support only Python 3.5+.
+
+Thanks to the `python_requires`_ ``setuptools`` option,
 Python 2.7 and Python 3.4 users using a modern ``pip`` version
-will install the last compatible pytest ``4.X`` version automatically even if ``5.0`` or later
+will install the last pytest ``4.6`` version automatically even if ``5.0`` or later
 are available on PyPI.
 
-During the period **from mid-2019 and 2020**, the pytest core team plans to make
-bug-fix releases of the pytest ``4.X`` series by back-porting patches to the ``4.x-maintenance``
-branch.
+While pytest ``5.0`` will be the new mainstream and development version, until **January 2020**
+the pytest core team plans to make bug-fix releases of the pytest ``4.6`` series by
+back-porting patches to the ``4.6-maintenance`` branch that affect Python 2 users.
+
+**After 2020**, the core team will no longer actively backport patches, but the ``4.6-maintenance``
+branch will continue to exist so the community itself can contribute patches. The core team will
+be happy to accept those patches and make new ``4.6`` releases **until mid-2020**.
 
-**After 2020**, the core team will no longer actively back port-patches, but the ``4.x-maintenance``
-branch will continue to exist so the community itself can contribute patches. The
-core team will be happy to accept those patches and make new ``4.X`` releases **until mid-2020**.
+.. _`python_requires`: https://packaging.python.org/guides/distributing-packages-using-setuptools/#python-requires>

doc/en/tidelift.rst

@@ -0,0 +1,4 @@
+
+
+
+.. include:: ../../TIDELIFT.rst

extra/get_issues.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import json
 
 import py

extra/setup-py.test/setup.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import sys
 from distutils.core import setup
 

scripts/release.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 Invoke development tasks.
 """

setup.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from setuptools import setup
 
 # TODO: if py gets upgrade to >=1.6,

src/_pytest/__init__.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 __all__ = ["__version__"]
 
 try:

src/_pytest/_argcomplete.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """allow bash-completion for argparse with argcomplete if installed
 needs argcomplete>=0.5.6 for python 3.2/3.3 (older versions fail
 to find the magic string, so _ARGCOMPLETE env. var is never set, and

src/_pytest/_code/__init__.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """ python inspection/code generation API """
 from __future__ import absolute_import
 from __future__ import division

src/_pytest/_code/_py2traceback.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # copied from python-2.7.3's traceback.py
 # CHANGES:
 # - some_str is replaced, trying to create unicode strings

src/_pytest/_code/code.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
@@ -564,10 +565,11 @@ def __unicode__(self):
 
     def match(self, regexp):
         """
-        Match the regular expression 'regexp' on the string representation of
-        the exception. If it matches then True is returned (so that it is
-        possible to write 'assert excinfo.match()'). If it doesn't match an
-        AssertionError is raised.
+        Check whether the regular expression 'regexp' is found in the string
+        representation of the exception using ``re.search``. If it matches
+        then True is returned (so that it is possible to write
+        ``assert excinfo.match()``). If it doesn't match an AssertionError is
+        raised.
         """
         __tracebackhide__ = True
         if not re.search(regexp, str(self.value)):

src/_pytest/_code/source.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function

src/_pytest/_io/saferepr.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import pprint
 
 from six.moves import reprlib

src/_pytest/assertion/__init__.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 support for presenting detailed information in failing assertions.
 """

src/_pytest/assertion/rewrite.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """Rewrite assertion AST to produce nice error messages"""
 from __future__ import absolute_import
 from __future__ import division
@@ -60,7 +61,10 @@ class AssertionRewritingHook(object):
 
     def __init__(self, config):
         self.config = config
-        self.fnpats = config.getini("python_files")
+        try:
+            self.fnpats = config.getini("python_files")
+        except ValueError:
+            self.fnpats = ["test_*.py", "*_test.py"]
         self.session = None
         self.modules = {}
         self._rewritten_names = set()

src/_pytest/assertion/truncate.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 Utilities for truncating assertion output.
 

src/_pytest/assertion/util.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """Utilities for assertion debugging"""
 from __future__ import absolute_import
 from __future__ import division

src/_pytest/cacheprovider.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 merged implementation of the cache provider
 

src/_pytest/capture.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 per-test stdout/stderr capturing mechanism.
 
@@ -358,8 +359,7 @@ def __init__(self, captureclass, request):
         self._captured_err = self.captureclass.EMPTY_BUFFER
 
     def _start(self):
-        # Start if not started yet
-        if getattr(self, "_capture", None) is None:
+        if self._capture is None:
             self._capture = MultiCapture(
                 out=True, err=True, in_=False, Capture=self.captureclass
             )
@@ -389,11 +389,13 @@ def readouterr(self):
 
     def _suspend(self):
         """Suspends this fixture's own capturing temporarily."""
-        self._capture.suspend_capturing()
+        if self._capture is not None:
+            self._capture.suspend_capturing()
 
     def _resume(self):
         """Resumes this fixture's own capturing temporarily."""
-        self._capture.resume_capturing()
+        if self._capture is not None:
+            self._capture.resume_capturing()
 
     @contextlib.contextmanager
     def disabled(self):

src/_pytest/compat.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """
 python version compatibility code
 """

src/_pytest/config/__init__.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 """ command line options, ini-file and conftest.py processing. """
 from __future__ import absolute_import
 from __future__ import division
@@ -115,16 +116,16 @@ def directory_arg(path, optname):
 
 
 # Plugins that cannot be disabled via "-p no:X" currently.
-essential_plugins = (
+essential_plugins = (  # fmt: off
     "mark",
     "main",
     "runner",
-    "python",
     "fixtures",
     "helpconfig",  # Provides -p.
-)
+)  # fmt: on
 
 default_plugins = essential_plugins + (
+    "python",
     "terminal",
     "debugging",
     "unittest",

src/_pytest/config/argparsing.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import argparse
 import warnings
 

src/_pytest/config/exceptions.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 class UsageError(Exception):
     """ error in pytest usage or invocation"""
 

src/_pytest/config/findpaths.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import os
 
 import py