Remove redundant code for Python 2

.github/workflows/test.yml

@@ -16,15 +16,15 @@ jobs:
           - {python-version: "pypy-3.9", tox-python-version: "pypy3"}
           - {python-version: "3.11", tox-python-version: "py311"}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key:

ci/bootstrap.py

@@ -59,7 +59,7 @@ def main():
         # This uses sys.executable the same way that the call in
         # cookiecutter-pylibrary/hooks/post_gen_project.py
         # invokes this bootstrap.py itself.
-        for line in subprocess.check_output([sys.executable, '-m', 'tox', '--listenvs'], universal_newlines=True).splitlines()
+        for line in subprocess.check_output([sys.executable, '-m', 'tox', '--listenvs'], text=True).splitlines()
     ]
     tox_environments = [line for line in tox_environments if line.startswith('py')]
     for template in templates_path.rglob('*'):

tests/test_pytest_cov.py

@@ -6,6 +6,7 @@
 import re
 import subprocess
 import sys
+from io import StringIO
 from itertools import chain
 
 import coverage
@@ -20,11 +21,6 @@
 
 import pytest_cov.plugin
 
-try:
-    from StringIO import StringIO
-except ImportError:
-    from io import StringIO
-
 coverage, platform  # required for skipif mark on test_cov_min_from_coveragerc
 
 max_worker_restart_0 = '--max-worker-restart=0'
@@ -1240,8 +1236,7 @@ def test_run():
     stdout, stderr = proc.communicate()
     assert not stderr
     assert stdout == b""
-    # it appears signal handling is buggy on python 2?
-    if sys.version_info == 3: assert proc.returncode in [128 + signal.SIGTERM, -signal.SIGTERM]
+    assert proc.returncode in [128 + signal.SIGTERM, -signal.SIGTERM]
 
 if __name__ == "__main__":
     signal.signal(signal.SIGINT, signal.SIG_IGN)
@@ -1258,7 +1253,7 @@ def test_run():
 
     result = testdir.runpytest('-vv', '--assert=plain', f'--cov={script.dirpath()}', '--cov-report=term-missing', script)
 
-    result.stdout.fnmatch_lines(['*- coverage: platform *, python * -*', 'test_cleanup_on_sigterm* 89%   23-24', '*1 passed*'])
+    result.stdout.fnmatch_lines(['*- coverage: platform *, python * -*', 'test_cleanup_on_sigterm* 89%   22-23', '*1 passed*'])
     assert result.ret == 0
 
 
@@ -1480,7 +1475,7 @@ def test_dist_boxed(testdir):
 
 
 @pytest.mark.skipif('sys.platform == "win32"')
-@pytest.mark.skipif('sys.version_info[0] > 2 and platform.python_implementation() == "PyPy"', reason='strange optimization on PyPy3')
+@pytest.mark.skipif('platform.python_implementation() == "PyPy"', reason='strange optimization on PyPy3')
 def test_dist_bare_cov(testdir):
     script = testdir.makepyfile(SCRIPT_SIMPLE)