Merge pull request #137 from hugovk/rm-eol

Drop support for EOL Python 2.7 and 3.5

Author: sallner

.github/workflows/test.yml

@@ -12,7 +12,6 @@ jobs:
       fail-fast: false
       matrix:
         python-version: [
-            "3.5",
             "3.6",
             "3.7",
             "3.8",

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ repos:
       rev: 19.10b0
       hooks:
           - id: black
-            args: [--safe, --quiet]
+            args: [--safe, --quiet, --target-version, py36]
     - repo: https://github.com/pre-commit/pre-commit-hooks
       rev: v3.1.0
       hooks:
@@ -30,7 +30,7 @@ repos:
       rev: v2.7.1
       hooks:
           - id: pyupgrade
-            args: [--py3-plus]
+            args: [--py36-plus]
     - repo: local
       hooks:
           - id: rst

.travis.yml

@@ -1,7 +1,6 @@
 ---
 language: python
 python:
-  - 3.5
   - 3.6
   - 3.7
   - 3.8
@@ -20,8 +19,7 @@ install:
   - pip install -q pre-commit
   - pre-commit install
 script:
-  - if [[ "$TRAVIS_PYTHON_VERSION" > "3.5"  ]] &&
-       [[ "$TRAVIS_PYTHON_VERSION" != pypy* ]]; then
+  - if [[ "$TRAVIS_PYTHON_VERSION" != pypy* ]]; then
       pre-commit run --all-files --show-diff-on-failure;
     fi
   - pytest

CHANGES.rst

@@ -1,10 +1,13 @@
 Changelog
 =========
 
-9.2 (unreleased)
-----------------
+10.0 (unreleased)
+-----------------
+
+Backwards incompatible changes
+++++++++++++++++++++++++++++++
 
-- Nothing changed yet.
+- Drop support for Python 3.5.
 
 
 9.1.1 (2020-09-29)

README.rst

@@ -19,7 +19,7 @@ Requirements
 
 You will need the following prerequisites in order to use pytest-rerunfailures:
 
-- Python 3.5, up to 3.8, or PyPy3
+- Python 3.6, up to 3.8, or PyPy3
 - pytest 5.0 or newer
 
 This package is currently tested against the last 5 minor pytest releases. In

pytest_rerunfailures.py

@@ -303,7 +303,7 @@ def show_rerun(terminalreporter, lines):
     if rerun:
         for rep in rerun:
             pos = rep.nodeid
-            lines.append("RERUN {}".format(pos))
+            lines.append(f"RERUN {pos}")
 
 
 if not PYTEST_GTE_61:

setup.py

@@ -14,7 +14,7 @@
     py_modules=["pytest_rerunfailures"],
     entry_points={"pytest11": ["rerunfailures = pytest_rerunfailures"]},
     install_requires=["setuptools>=40.0", "pytest >= 5.0"],
-    python_requires=">=3.5",
+    python_requires=">=3.6",
     license="Mozilla Public License 2.0 (MPL 2.0)",
     keywords="py.test pytest rerun failures flaky",
     zip_safe=False,
@@ -29,10 +29,11 @@
         "Topic :: Software Development :: Quality Assurance",
         "Topic :: Software Development :: Testing",
         "Topic :: Utilities",
-        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
     ],

test_pytest_rerunfailures.py

@@ -14,23 +14,20 @@
 
 
 def temporary_failure(count=1):
-    return """
+    return f"""
             import py
             path = py.path.local(__file__).dirpath().ensure('test.res')
             count = path.read() or 1
-            if int(count) <= {0}:
+            if int(count) <= {count}:
                 path.write(int(count) + 1)
-                raise Exception('Failure: {{0}}'.format(count))""".format(
-        count
-    )
+                raise Exception('Failure: {{0}}'.format(count))"""
 
 
 def check_outcome_field(outcomes, field_name, expected_value):
     field_value = outcomes.get(field_name, 0)
-    assert (
-        field_value == expected_value
-    ), "outcomes.{} has unexpected value. Expected '{}' but got '{}'".format(
-        field_name, expected_value, field_value
+    assert field_value == expected_value, (
+        f"outcomes.{field_name} has unexpected value. "
+        f"Expected '{expected_value}' but got '{field_value}'"
     )
 
 
@@ -61,14 +58,12 @@ def test_no_rerun_on_pass(testdir):
 def test_no_rerun_on_skipif_mark(testdir):
     reason = str(random.random())
     testdir.makepyfile(
-        """
+        f"""
         import pytest
-        @pytest.mark.skipif(reason='{}')
+        @pytest.mark.skipif(reason='{reason}')
         def test_skip():
             pass
-    """.format(
-            reason
-        )
+    """
     )
     result = testdir.runpytest("--reruns", "1")
     assert_outcomes(result, passed=0, skipped=1)
@@ -77,13 +72,11 @@ def test_skip():
 def test_no_rerun_on_skip_call(testdir):
     reason = str(random.random())
     testdir.makepyfile(
-        """
+        f"""
         import pytest
         def test_skip():
-            pytest.skip('{}')
-    """.format(
-            reason
-        )
+            pytest.skip('{reason}')
+    """
     )
     result = testdir.runpytest("--reruns", "1")
     assert_outcomes(result, passed=0, skipped=1)
@@ -105,13 +98,11 @@ def test_xfail():
 def test_no_rerun_on_xfail_call(testdir):
     reason = str(random.random())
     testdir.makepyfile(
-        """
+        f"""
         import pytest
         def test_xfail():
-            pytest.xfail('{}')
-    """.format(
-            reason
-        )
+            pytest.xfail('{reason}')
+    """
     )
     result = testdir.runpytest("--reruns", "1")
     assert_outcomes(result, passed=0, xfailed=1)
@@ -144,11 +135,9 @@ def pytest_runtest_setup(item):
 def test_rerun_passes_after_temporary_setup_failure(testdir):
     testdir.makepyfile("def test_pass(): pass")
     testdir.makeconftest(
-        """
+        f"""
         def pytest_runtest_setup(item):
-            {}""".format(
-            temporary_failure()
-        )
+            {temporary_failure()}"""
     )
     result = testdir.runpytest("--reruns", "1", "-r", "R")
     assert_outcomes(result, passed=1, rerun=1)
@@ -162,65 +151,55 @@ def test_rerun_fails_after_consistent_test_failure(testdir):
 
 def test_rerun_passes_after_temporary_test_failure(testdir):
     testdir.makepyfile(
-        """
+        f"""
         def test_pass():
-            {}""".format(
-            temporary_failure()
-        )
+            {temporary_failure()}"""
     )
     result = testdir.runpytest("--reruns", "1", "-r", "R")
     assert_outcomes(result, passed=1, rerun=1)
 
 
 def test_rerun_passes_after_temporary_test_failure_with_flaky_mark(testdir):
     testdir.makepyfile(
-        """
+        f"""
         import pytest
         @pytest.mark.flaky(reruns=2)
         def test_pass():
-            {}""".format(
-            temporary_failure(2)
-        )
+            {temporary_failure(2)}"""
     )
     result = testdir.runpytest("-r", "R")
     assert_outcomes(result, passed=1, rerun=2)
 
 
 def test_reruns_if_flaky_mark_is_called_without_options(testdir):
     testdir.makepyfile(
-        """
+        f"""
         import pytest
         @pytest.mark.flaky()
         def test_pass():
-            {}""".format(
-            temporary_failure(1)
-        )
+            {temporary_failure(1)}"""
     )
     result = testdir.runpytest("-r", "R")
     assert_outcomes(result, passed=1, rerun=1)
 
 
 def test_reruns_if_flaky_mark_is_called_with_positional_argument(testdir):
     testdir.makepyfile(
-        """
+        f"""
         import pytest
         @pytest.mark.flaky(2)
         def test_pass():
-            {}""".format(
-            temporary_failure(2)
-        )
+            {temporary_failure(2)}"""
     )
     result = testdir.runpytest("-r", "R")
     assert_outcomes(result, passed=1, rerun=2)
 
 
 def test_no_extra_test_summary_for_reruns_by_default(testdir):
     testdir.makepyfile(
-        """
+        f"""
         def test_pass():
-            {}""".format(
-            temporary_failure()
-        )
+            {temporary_failure()}"""
     )
     result = testdir.runpytest("--reruns", "1")
     assert "RERUN" not in result.stdout.str()
@@ -229,11 +208,9 @@ def test_pass():
 
 def test_extra_test_summary_for_reruns(testdir):
     testdir.makepyfile(
-        """
+        f"""
         def test_pass():
-            {}""".format(
-            temporary_failure()
-        )
+            {temporary_failure()}"""
     )
     result = testdir.runpytest("--reruns", "1", "-r", "R")
     result.stdout.fnmatch_lines_random(["RERUN test_*:*"])
@@ -242,11 +219,9 @@ def test_pass():
 
 def test_verbose(testdir):
     testdir.makepyfile(
-        """
+        f"""
         def test_pass():
-            {}""".format(
-            temporary_failure()
-        )
+            {temporary_failure()}"""
     )
     result = testdir.runpytest("--reruns", "1", "-v")
     result.stdout.fnmatch_lines_random(["test_*:* RERUN*"])
@@ -323,14 +298,12 @@ def test_fail():
 @pytest.mark.parametrize("delay_time", [-1, 0, 0.0, 1, 2.5])
 def test_reruns_with_delay_marker(testdir, delay_time):
     testdir.makepyfile(
-        """
+        f"""
         import pytest
 
-        @pytest.mark.flaky(reruns=2, reruns_delay={})
+        @pytest.mark.flaky(reruns=2, reruns_delay={delay_time})
         def test_fail_two():
-            assert False""".format(
-            delay_time
-        )
+            assert False"""
     )
 
     time.sleep = mock.MagicMock()
@@ -498,12 +471,10 @@ def test_pytest_runtest_logfinish_is_called(testdir):
     hook_message = "Message from pytest_runtest_logfinish hook"
     testdir.makepyfile("def test_pass(): pass")
     testdir.makeconftest(
-        r"""
+        fr"""
         def pytest_runtest_logfinish(nodeid, location):
-            print("\n{}\n")
-    """.format(
-            hook_message
-        )
+            print("\n{hook_message}\n")
+    """
     )
     result = testdir.runpytest("--reruns", "1", "-s")
     result.stdout.fnmatch_lines(hook_message)

tox.ini

@@ -11,7 +11,7 @@ max-line-length = 88
 [tox]
 envlist =
     linting
-    py{35,36,37,38,py3}-pytest{50,51,52,53,54,60,61}
+    py{36,37,38,py3}-pytest{50,51,52,53,54,60,61}
 minversion = 3.17.1
 
 [testenv]