Update some ci config, reformat and apply some lint fixes.

Author: ionelmc

ci/bootstrap.py

@@ -20,8 +20,6 @@ def exec_in_env():
     else:
         bin_path = env_path / 'bin'
     if not env_path.exists():
-        import subprocess
-
         print(f'Making bootstrap env in: {env_path} ...')
         try:
             check_call([sys.executable, '-m', 'venv', env_path])
@@ -59,7 +57,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'], text=True).splitlines()
+        for line in subprocess.check_output([sys.executable, '-m', 'tox', '--listenvs'], universal_newlines=True).splitlines()
     ]
     tox_environments = [line for line in tox_environments if line.startswith('py')]
     for template in templates_path.rglob('*'):

ci/requirements.txt

@@ -1,5 +1,4 @@
-virtualenv>=16.6.0
-pip>=19.1.1
-setuptools>=18.0.1
-tox
-twine
+pip>=25
+setuptools>=80
+tox>=4
+virtualenv>=20.34

pyproject.toml

@@ -52,21 +52,18 @@ dependencies = [
 
 [project.optional-dependencies]
 testing = [
-    "fields",
-    "hunter",
     "process-tests",
     "pytest-xdist",
-    "six",
     "virtualenv",
 ]
 
 [project.entry-points.pytest11]
 pytest_cov = "pytest_cov.plugin"
 
 [project.urls]
-Changelog = "https://pytest-cov.readthedocs.io/en/latest/changelog.html"
-Documentation = "https://pytest-cov.readthedocs.io/"
-Homepage = "https://github.com/pytest-dev/pytest-cov"
+"Sources" = "https://github.com/pytest-dev/pytest-cov"
+"Documentation" = "https://pytest-cov.readthedocs.io/"
+"Changelog" = "https://pytest-cov.readthedocs.io/en/latest/changelog.html"
 "Issue Tracker" = "https://github.com/pytest-dev/pytest-cov/issues"
 
 [tool.hatch.metadata.hooks.fancy-pypi-readme]
@@ -87,30 +84,31 @@ target-version = "py39"
 
 [tool.ruff.lint]
 ignore = [
-    "RUF001", # ruff-specific rules ambiguous-unicode-character-string
-    "S101", # flake8-bandit assert
-    "S308", # flake8-bandit suspicious-mark-safe-usage
-    "E501", # pycodestyle line-too-long
+    "PLC0415", # `import` should be at the top-level of a file
+    "RUF001",  # ruff-specific rules ambiguous-unicode-character-string
+    "S101",    # flake8-bandit assert
+    "S308",    # flake8-bandit suspicious-mark-safe-usage
+    "E501",    # pycodestyle line-too-long
 ]
 select = [
-    "B", # flake8-bugbear
-    "C4", # flake8-comprehensions
+    "B",   # flake8-bugbear
+    "C4",  # flake8-comprehensions
     "DTZ", # flake8-datetimez
-    "E", # pycodestyle errors
+    "E",   # pycodestyle errors
     "EXE", # flake8-executable
-    "F", # pyflakes
-    "I", # isort
+    "F",   # pyflakes
+    "I",   # isort
     "INT", # flake8-gettext
     "PIE", # flake8-pie
     "PLC", # pylint convention
     "PLE", # pylint errors
-    "PT", # flake8-pytest-style
+    "PT",  # flake8-pytest-style
     "PTH", # flake8-use-pathlib
     "RSE", # flake8-raise
     "RUF", # ruff-specific rules
-    "S", # flake8-bandit
-    "UP", # pyupgrade
-    "W", # pycodestyle warnings
+    "S",   # flake8-bandit
+    "UP",  # pyupgrade
+    "W",   # pycodestyle warnings
 ]
 
 [tool.ruff.lint.flake8-pytest-style]
@@ -123,4 +121,3 @@ force-single-line = true
 
 [tool.ruff.format]
 quote-style = "single"
-

tests/test_pytest_cov.py

@@ -1,27 +1,23 @@
-# ruff: noqa
 import collections
 import glob
 import os
 import platform
 import re
-import subprocess
 import sys
-from io import StringIO
 from itertools import chain
+from pathlib import Path
+from types import SimpleNamespace
 
 import coverage
-import py
 import pytest
-import virtualenv
-import xdist
-from fields import Namespace
 from process_tests import TestProcess as _TestProcess
 from process_tests import dump_on_error
 from process_tests import wait_for_strings
 
 import pytest_cov.plugin
 
-coverage, platform  # required for skipif mark on test_cov_min_from_coveragerc
+# required for skipif mark on test_cov_min_from_coveragerc
+coverage, platform  # noqa: B018
 
 max_worker_restart_0 = '--max-worker-restart=0'
 
@@ -168,7 +164,7 @@ def test_foo(cov):
 def adjust_sys_path():
     """Adjust PYTHONPATH during tests to make "helper" importable in SCRIPT."""
     orig_path = os.environ.get('PYTHONPATH', None)
-    new_path = os.path.dirname(__file__)
+    new_path = str(Path(__file__).parent)
     if orig_path is not None:
         new_path = os.pathsep.join([new_path, orig_path])
     os.environ['PYTHONPATH'] = new_path
@@ -191,7 +187,7 @@ def adjust_sys_path():
     ids=['branch2x', 'branch1c', 'branch1a', 'nobranch'],
 )
 def prop(request):
-    return Namespace(
+    return SimpleNamespace(
         code=SCRIPT,
         code2=SCRIPT2,
         conf=request.param[0],
@@ -348,7 +344,7 @@ def test_xml_output_dir(testdir):
 def test_json_output_dir(testdir):
     script = testdir.makepyfile(SCRIPT)
 
-    result = testdir.runpytest('-v', '--cov=%s' % script.dirpath(), '--cov-report=json:' + JSON_REPORT_NAME, script)
+    result = testdir.runpytest('-v', f'--cov={script.dirpath()}', '--cov-report=json:' + JSON_REPORT_NAME, script)
 
     result.stdout.fnmatch_lines(
         [
@@ -364,7 +360,7 @@ def test_json_output_dir(testdir):
 def test_markdown_output_dir(testdir):
     script = testdir.makepyfile(SCRIPT)
 
-    result = testdir.runpytest('-v', '--cov=%s' % script.dirpath(), '--cov-report=markdown:' + MARKDOWN_REPORT_NAME, script)
+    result = testdir.runpytest('-v', f'--cov={script.dirpath()}', '--cov-report=markdown:' + MARKDOWN_REPORT_NAME, script)
 
     result.stdout.fnmatch_lines(
         [
@@ -380,7 +376,7 @@ def test_markdown_output_dir(testdir):
 def test_markdown_append_output_dir(testdir):
     script = testdir.makepyfile(SCRIPT)
 
-    result = testdir.runpytest('-v', '--cov=%s' % script.dirpath(), '--cov-report=markdown-append:' + MARKDOWN_APPEND_REPORT_NAME, script)
+    result = testdir.runpytest('-v', f'--cov={script.dirpath()}', '--cov-report=markdown-append:' + MARKDOWN_APPEND_REPORT_NAME, script)
 
     result.stdout.fnmatch_lines(
         [
@@ -398,7 +394,7 @@ def test_markdown_and_markdown_append_work_together(testdir):
 
     result = testdir.runpytest(
         '-v',
-        '--cov=%s' % script.dirpath(),
+        f'--cov={script.dirpath()}',
         '--cov-report=markdown:' + MARKDOWN_REPORT_NAME,
         '--cov-report=markdown-append:' + MARKDOWN_APPEND_REPORT_NAME,
         script,
@@ -421,7 +417,7 @@ def test_markdown_and_markdown_append_pointing_to_same_file_throws_error(testdir
 
     result = testdir.runpytest(
         '-v',
-        '--cov=%s' % script.dirpath(),
+        f'--cov={script.dirpath()}',
         '--cov-report=markdown:' + MARKDOWN_REPORT_NAME,
         '--cov-report=markdown-append:' + MARKDOWN_REPORT_NAME,
         script,
@@ -467,7 +463,7 @@ def test_term_missing_output_dir(testdir):
 
     result.stderr.fnmatch_lines(
         [
-            '*argument --cov-report: output specifier not supported for: "term-missing:%s"*' % DEST_DIR,
+            f'*argument --cov-report: output specifier not supported for: "term-missing:{DEST_DIR}"*',
         ]
     )
     assert result.ret != 0
@@ -754,7 +750,7 @@ def test_add_task(celery_worker):
     result.stdout.fnmatch_lines(
         [
             '*_ coverage: platform *, python * _*',
-            f'small_celery* 100%*',
+            'small_celery* 100%*',
         ]
     )
     assert result.ret == 0
@@ -1337,7 +1333,7 @@ def test_run():
         '-v', '--assert=plain', f'--cov={script.dirpath()}', '--cov-report=term-missing', '--cov-report=html', script
     )
 
-    result.stdout.fnmatch_lines(['*_ coverage: platform *, python * _*', f'test_cleanup_on_sigterm* 88% * 18-19', '*1 passed*'])
+    result.stdout.fnmatch_lines(['*_ coverage: platform *, python * _*', 'test_cleanup_on_sigterm* 88% * 18-19', '*1 passed*'])
     assert result.ret == 0
 
 
@@ -1644,7 +1640,7 @@ def test_dist_bare_cov(testdir):
 
 def test_not_started_plugin_does_not_fail(testdir):
     class ns:
-        cov_source = [True]
+        cov_source = (True,)
         cov_report = ''
 
     plugin = pytest_cov.plugin.CovPlugin(ns, None, start=False)
@@ -1692,14 +1688,13 @@ def test_external_data_file(testdir):
     testdir.tmpdir.join('.coveragerc').write(
         """
 [run]
-data_file = %s
-"""
-        % testdir.tmpdir.join('some/special/place/coverage-data').ensure()
+data_file = {}
+""".format(testdir.tmpdir.join('some/special/place/coverage-data').ensure())
     )
 
     result = testdir.runpytest('-v', f'--cov={script.dirpath()}', script)
     assert result.ret == 0
-    assert glob.glob(str(testdir.tmpdir.join('some/special/place/coverage-data*')))
+    assert glob.glob(str(testdir.tmpdir.join('some/special/place/coverage-data*')))  # noqa: PTH207
 
 
 @pytest.mark.skipif('sys.platform == "win32" and platform.python_implementation() == "PyPy"')
@@ -1709,14 +1704,13 @@ def test_external_data_file_xdist(testdir):
         """
 [run]
 parallel = true
-data_file = %s
-"""
-        % testdir.tmpdir.join('some/special/place/coverage-data').ensure()
+data_file = {}
+""".format(testdir.tmpdir.join('some/special/place/coverage-data').ensure())
     )
 
     result = testdir.runpytest('-v', f'--cov={script.dirpath()}', '-n', '1', max_worker_restart_0, script)
     assert result.ret == 0
-    assert glob.glob(str(testdir.tmpdir.join('some/special/place/coverage-data*')))
+    assert glob.glob(str(testdir.tmpdir.join('some/special/place/coverage-data*')))  # noqa: PTH207
 
 
 @pytest.mark.skipif('sys.platform == "win32" and platform.python_implementation() == "PyPy"')
@@ -1743,7 +1737,7 @@ def test_external_data_file_negative(testdir):
 
     result = testdir.runpytest('-v', f'--cov={script.dirpath()}', script)
     assert result.ret == 0
-    assert glob.glob(str(testdir.tmpdir.join('.coverage*')))
+    assert glob.glob(str(testdir.tmpdir.join('.coverage*')))  # noqa: PTH207
 
 
 @xdist_params
@@ -1851,7 +1845,7 @@ def test_do_not_append_coverage(pytester, testdir, opts, prop):
 
 @pytest.mark.skipif('sys.platform == "win32" and platform.python_implementation() == "PyPy"')
 def test_append_coverage_subprocess(testdir):
-    testdir.makepyprojecttoml(f"""
+    testdir.makepyprojecttoml("""
 [tool.coverage.run]
 patch = ["subprocess"]
 """)
@@ -1965,7 +1959,7 @@ def find_labels(text, pattern):
 
 @xdist_params
 def test_contexts(pytester, testdir, opts):
-    with open(os.path.join(os.path.dirname(__file__), 'contextful.py')) as f:
+    with Path(__file__).parent.joinpath('contextful.py').open() as f:
         contextful_tests = f.read()
     script = testdir.makepyfile(contextful_tests)
     result = testdir.runpytest('-v', f'--cov={script.dirpath()}', '--cov-context=test', script, *opts.split())
@@ -1982,7 +1976,7 @@ def test_contexts(pytester, testdir, opts):
     measured = data.measured_files()
     assert len(measured) == 1
     test_context_path = next(iter(measured))
-    assert test_context_path.lower() == os.path.abspath('test_contexts.py').lower()
+    assert test_context_path.lower() == os.path.abspath('test_contexts.py').lower()  # noqa: PTH100
 
     line_data = find_labels(contextful_tests, r'[crst]\d+(?:-\d+)?')
     for context, label in EXPECTED_CONTEXTS.items():