diff --git a/changelog/4698.feature.rst b/changelog/4698.feature.rst new file mode 100644 index 000000000..18d4c0216 --- /dev/null +++ b/changelog/4698.feature.rst @@ -0,0 +1,5 @@ +The warning about Python 2.7 and 3.4 not being supported in pytest 5.0 has been removed. + +In the end it was considered to be more +of a nuisance than actual utility and users of those Python versions shouldn't have problems as ``pip`` will not +install pytest 5.0 on those interpreters. diff --git a/src/_pytest/terminal.py b/src/_pytest/terminal.py index eb35577f1..f4f8b3dd2 100644 --- a/src/_pytest/terminal.py +++ b/src/_pytest/terminal.py @@ -653,7 +653,6 @@ class TerminalReporter(object): self.summary_passes() # Display any extra warnings from teardown here (if any). self.summary_warnings() - self.summary_deprecated_python() def pytest_keyboard_interrupt(self, excinfo): self._keyboardinterrupt_memo = excinfo.getrepr(funcargs=True) @@ -775,20 +774,6 @@ class TerminalReporter(object): self.write_sep("_", msg) self._outrep_summary(rep) - def summary_deprecated_python(self): - if sys.version_info[:2] <= (3, 4) and self.verbosity >= 0: - self.write_sep("=", "deprecated python version", yellow=True, bold=False) - using_version = ".".join(str(x) for x in sys.version_info[:3]) - self.line( - "You are using Python {}, which will no longer be supported in pytest 5.0".format( - using_version - ), - yellow=True, - bold=False, - ) - self.line("For more information, please read:") - self.line(" https://docs.pytest.org/en/latest/py27-py34-deprecation.html") - def print_teardown_sections(self, rep): showcapture = self.config.option.showcapture if showcapture == "no": diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py index 95c419599..59771185f 100644 --- a/testing/acceptance_test.py +++ b/testing/acceptance_test.py @@ -854,9 +854,7 @@ class TestDurations(object): result = testdir.runpytest("--durations=2") assert result.ret == 0 lines = result.stdout.get_lines_after("*slowest*durations*") - # account for the "deprecated python version" header - index = 2 if sys.version_info[:2] > (3, 4) else 6 - assert "4 passed" in lines[index] + assert "4 passed" in lines[2] def test_calls_showall(self, testdir): testdir.makepyfile(self.source) diff --git a/testing/deprecated_test.py b/testing/deprecated_test.py index 5db3cceed..536370f92 100644 --- a/testing/deprecated_test.py +++ b/testing/deprecated_test.py @@ -3,7 +3,6 @@ from __future__ import division from __future__ import print_function import os -import sys import pytest from _pytest.warning_types import PytestDeprecationWarning @@ -223,24 +222,6 @@ def test_fixture_named_request(testdir): ) -def test_python_deprecation(testdir): - result = testdir.runpytest() - python_ver = ".".join(str(x) for x in sys.version_info[:3]) - msg = "You are using Python {}, which will no longer be supported in pytest 5.0".format( - python_ver - ) - if sys.version_info[:2] <= (3, 4): - result.stdout.fnmatch_lines( - [ - msg, - "For more information, please read:", - " https://docs.pytest.org/en/latest/py27-py34-deprecation.html", - ] - ) - else: - assert msg not in result.stdout.str() - - def test_pytest_warns_unknown_kwargs(): with pytest.warns( PytestDeprecationWarning,