pytest-sort 1.3.1__tar.gz → 1.3.3__tar.gz

{pytest-sort-1.3.1/src/pytest_sort.egg-info → pytest_sort-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pytest-sort
-Version: 1.3.1
+Version: 1.3.3
 Summary: Tools for sorting test cases
 Author-email: WiredNerd <pbuschmail-pytestsort@yahoo.com>
 Maintainer-email: WiredNerd <pbuschmail-pytestsort@yahoo.com>
@@ -34,15 +34,17 @@ Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Framework :: Pytest
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pytest>=7.4.0
 Requires-Dist: whatthepatch>=1.0.5
 Requires-Dist: coverage>=7.3.1
+Requires-Dist: zipp>=3.19.1
+Dynamic: license-file
 
 [![Homepage](https://img.shields.io/badge/Homepage-github-white?logo=github)](https://github.com/WiredNerd/pytest-sort)
-[![python>=3.8](https://img.shields.io/badge/python->=3.8-orange?logo=python&logoColor=green)](https://pypi.org/project/pytest-sort)
+[![python>=3.10](https://img.shields.io/badge/python->=3.10-orange?logo=python&logoColor=green)](https://pypi.org/project/pytest-sort)
 [![PyPI - Version](https://img.shields.io/pypi/v/pytest-sort?logo=pypi&logoColor=white)](https://pypi.org/project/pytest-sort)
 [![PyPI - Downloads](https://img.shields.io/pypi/dm/pytest-sort)](https://pypistats.org/packages/pytest-sort)
 [![PyPI - License](https://img.shields.io/pypi/l/pytest-sort)](https://github.com/WiredNerd/pytest-sort/blob/main/LICENSE)

{pytest-sort-1.3.1 → pytest_sort-1.3.3}/README.md

@@ -1,5 +1,5 @@
 [![Homepage](https://img.shields.io/badge/Homepage-github-white?logo=github)](https://github.com/WiredNerd/pytest-sort)
-[![python>=3.8](https://img.shields.io/badge/python->=3.8-orange?logo=python&logoColor=green)](https://pypi.org/project/pytest-sort)
+[![python>=3.10](https://img.shields.io/badge/python->=3.10-orange?logo=python&logoColor=green)](https://pypi.org/project/pytest-sort)
 [![PyPI - Version](https://img.shields.io/pypi/v/pytest-sort?logo=pypi&logoColor=white)](https://pypi.org/project/pytest-sort)
 [![PyPI - Downloads](https://img.shields.io/pypi/dm/pytest-sort)](https://pypistats.org/packages/pytest-sort)
 [![PyPI - License](https://img.shields.io/pypi/l/pytest-sort)](https://github.com/WiredNerd/pytest-sort/blob/main/LICENSE)
@@ -61,4 +61,4 @@ Or by opening an issue: https://github.com/WiredNerd/pytest-sort/issues
 
 ## License
 
-The project is licensed under the MIT license.
+The project is licensed under the MIT license.

{pytest-sort-1.3.1 → pytest_sort-1.3.3}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "pytest-sort"
 description = "Tools for sorting test cases"
-version = "1.3.1"
+version = "1.3.3"
 license = { file = "LICENSE" }
 keywords = [
     "test",
@@ -24,14 +24,14 @@ maintainers = [
     { name = "WiredNerd", email = "pbuschmail-pytestsort@yahoo.com" },
 ]
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Framework :: Pytest",
 ]
-dependencies = ["pytest>=7.4.0", "whatthepatch>=1.0.5", "coverage>=7.3.1"]
+dependencies = ["pytest>=7.4.0", "whatthepatch>=1.0.5", "coverage>=7.3.1", "zipp>=3.19.1"]
 
 [project.urls]
 "Documentation" = "https://pytest-sort.readthedocs.io/"
@@ -64,7 +64,7 @@ command_line = "pytest -x --assert=plain -o pythonpath='{PYTHONPATH}' --sort-mod
 
 [tool.black]
 line-length = 120
-target-version = ['py38', 'py39', 'py310', 'py311']
+target-version = ['py310', 'py311', 'py312', 'py313', 'py314']
 skip-string-normalization = true
 color = true
 
@@ -76,19 +76,8 @@ files = "src"
 mypy_path = "src"
 
 [tool.ruff]
-target-version = "py38"
-show-source = true
-select = ["ALL"]
-ignore = [
-    "ANN101", # Missing type annotation for self in method
-    "COM812", # missing-trailing-comma
-    "D203",   # 1 blank line required before class docstring
-    "D213",   # multi-line-summary-second-line
-    "EM101",  # Exception must not use a string literal, assign to variable first
-    "ISC001", # single-line-implicit-string-concatenation
-    "S311",   # Standard pseudo-random generators are not suitable for cryptographic purposes
-    "TRY003", # Avoid specifying long messages outside the exception class
-]
+target-version = "py310"
+output-format = "full"
 line-length = 120
 exclude = [
     ".eggs",
@@ -104,10 +93,25 @@ exclude = [
     "venv",
 ]
 
+[tool.ruff.lint]
+select = ["ALL"]
+ignore = [
+    "COM812", # missing-trailing-comma
+    "D203",   # 1 blank line required before class docstring
+    "D213",   # multi-line-summary-second-line
+    "EM101",  # Exception must not use a string literal, assign to variable first
+    "ISC001", # single-line-implicit-string-concatenation
+    "S311",   # Standard pseudo-random generators are not suitable for cryptographic purposes
+    "TRY003", # Avoid specifying long messages outside the exception class
+]
+
+[tool.ruff.lint.flake8-pytest-style]
+fixture-parentheses = true
+
 [tool.ruff.lint.isort]
 known-first-party = ["pytest_sort"]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "src/pytest_sort/core.py" = [
     "ARG005", # Unused lambda argument
     "T201",   # print found
@@ -136,4 +140,5 @@ known-first-party = ["pytest_sort"]
     "PLR2004", # Magic value used in comparison
     "S101",    # Use of `assert` detected
     "SLF001",  # Private member accessed
+    "RUF059",  # Unpacked variable is never used
 ]

{pytest-sort-1.3.1 → pytest_sort-1.3.3}/src/pytest_sort/core.py

@@ -4,9 +4,8 @@ from __future__ import annotations
 
 import hashlib
 import random
-import sys
 from functools import partial
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
 
 import pytest
 from _pytest import nodes as pytest_nodes
@@ -15,14 +14,18 @@ from pytest_sort.config import SortConfig
 from pytest_sort.database import get_all_totals, get_stats
 from pytest_sort.diffcov import get_diff_test_scores, get_mut_test_scores
 
-md5: Callable = hashlib.md5
-if sys.version_info >= (3, 9):
-    md5: Callable = partial(hashlib.md5, usedforsecurity=False)  # type: ignore[no-redef]
-
-
 if TYPE_CHECKING:
+    import sys
+
     from _pytest.terminal import TerminalReporter
 
+    if sys.version_info < (3, 14):  # nomut
+        from typing import Callable  # noqa: UP035  # pragma: no cover
+    else:
+        from collections.abc import Callable
+
+md5: Callable = partial(hashlib.md5, usedforsecurity=False)  # type: ignore[no-redef]
+
 
 def create_bucket_id_from_node(node: pytest_nodes.Node | None) -> str:
     """Extract portion of nodeid needed for bucket key."""
@@ -141,7 +144,7 @@ def validate_sort_marker(sort_marker: pytest.Mark, node_id: str) -> tuple:
         return (mode, bucket)
 
     try:
-        (mode, bucket_temp) = mark_sort_parse(*sort_marker.args, **sort_marker.kwargs)
+        mode, bucket_temp = mark_sort_parse(*sort_marker.args, **sort_marker.kwargs)
     except TypeError as e:
         msg = f"Incorrect arguments on marker 'sort'. Target:{node_id}"
         raise TypeError(msg) from e
@@ -169,7 +172,7 @@ def get_marker_settings(node: pytest_nodes.Node) -> tuple:
     node_id = node.nodeid
 
     if node.parent:
-        (mode, bucket, bucket_id, bucket_sort_key, item_sort_key) = get_marker_settings(node.parent)
+        mode, bucket, bucket_id, bucket_sort_key, item_sort_key = get_marker_settings(node.parent)
 
     for order in node.iter_markers("order"):
         sort_key = validate_order_marker(order, node_id)
@@ -180,7 +183,7 @@ def get_marker_settings(node: pytest_nodes.Node) -> tuple:
             bucket_id = create_bucket_id_from_node(node)
 
     for sort in node.iter_markers("sort"):
-        (mode, bucket_temp) = validate_sort_marker(sort, node_id)
+        mode, bucket_temp = validate_sort_marker(sort, node_id)
 
         if bucket_temp == "self":
             bucket_id = create_bucket_id_from_node(node)
@@ -200,7 +203,7 @@ def create_sort_keys(item: pytest.Item, idx: int, count: int) -> None:
 
     Store in SortConfig.item_sort_keys and SortConfig.bucket_sort_keys
     """
-    (mode, bucket, bucket_id, bucket_sort_key, item_sort_key) = get_marker_settings(item)
+    mode, bucket, bucket_id, bucket_sort_key, item_sort_key = get_marker_settings(item)
 
     SortConfig.item_sort_keys[item.nodeid] = item_sort_key or create_item_key[mode or SortConfig.mode](item, idx, count)
 
@@ -254,7 +257,7 @@ def print_recorded_times_report(terminal_reporter: TerminalReporter) -> None:
 
     print(
         f"\n*** {'pytest-sort maximum recorded times'.ljust(node_id_width)}"
-        f"{'Nanoseconds'.center(stat_width*4 - 4)} ***",
+        f"{'Nanoseconds'.center(stat_width * 4 - 4)} ***",
     )
     print(
         f"{'Test Case'.ljust(node_id_width)} {'setup'.rjust(stat_width)} "

{pytest-sort-1.3.1 → pytest_sort-1.3.3}/src/pytest_sort/database.py

@@ -31,24 +31,12 @@ def update_test_cases(recorded_times: dict) -> None:
     """Update Test Case Data with specfiied duration(s) and recalculate total(s)."""
     _load_data()
 
-    for nodeid in recorded_times:
+    for nodeid, recorded_node in recorded_times.items():
         node_data = _sort_data.get(nodeid, {})
 
-        node_data["setup"] = node_data.get("setup", 0)
-        node_data["call"] = node_data.get("call", 0)
-        node_data["teardown"] = node_data.get("teardown", 0)
-
-        setup = recorded_times[nodeid].get("setup", 0)
-        if node_data["setup"] < setup:
-            node_data["setup"] = setup
-
-        call = recorded_times[nodeid].get("call", 0)
-        if node_data["call"] < call:
-            node_data["call"] = call
-
-        teardown = recorded_times[nodeid].get("teardown", 0)
-        if node_data["teardown"] < teardown:
-            node_data["teardown"] = teardown
+        node_data["setup"] = max(node_data.get("setup", 0), recorded_node.get("setup", 0))
+        node_data["call"] = max(node_data.get("call", 0), recorded_node.get("call", 0))
+        node_data["teardown"] = max(node_data.get("teardown", 0), recorded_node.get("teardown", 0))
 
         node_data["total"] = node_data["setup"] + node_data["call"] + node_data["teardown"]
 

{pytest-sort-1.3.1 → pytest_sort-1.3.3}/src/pytest_sort/diffcov.py

@@ -7,11 +7,14 @@ import re
 import shlex
 import subprocess
 from pathlib import Path
-from typing import Any, Generator
+from typing import TYPE_CHECKING, Any
 
 import whatthepatch
 from coverage.sqldata import CoverageData
 
+if TYPE_CHECKING:
+    from collections.abc import Generator
+
 # pytest-cov populates test context as <nodeid>|(setup|run|teardown)
 PARSE_TEST_CONTEXT = re.compile(r"(?P<nodeid>.*)\|(?P<when>setup|run|teardown)")
 
@@ -50,10 +53,10 @@ def get_mut_changed_lines() -> dict[Path, set[int]]:
     """
     changed_lines = {}
     mut_source_file = os.environ.get("MUT_SOURCE_FILE", None)
-    mut_lineno = os.environ.get("MUT_LINENO", 0)
+    mut_lineno = os.environ.get("MUT_LINENO", "0")
     mut_end_lineno = os.environ.get("MUT_END_LINENO", mut_lineno)
 
-    if mut_source_file and mut_lineno:
+    if mut_source_file and int(mut_lineno):
         rpath = Path(mut_source_file).resolve()
         changed_lines[rpath] = set(range(int(mut_lineno), int(mut_end_lineno) + 1))
 
@@ -73,7 +76,7 @@ def get_line_coverage() -> Generator[tuple[Path, str, str, int], Any, None]:
             for test in tests:
                 match = PARSE_TEST_CONTEXT.search(test)
                 if match:
-                    (nodeid, when) = match.group("nodeid", "when")
+                    nodeid, when = match.group("nodeid", "when")
                     yield rpath, nodeid, when, line
 
 

{pytest-sort-1.3.1 → pytest_sort-1.3.3}/src/pytest_sort/plugin.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import argparse
-from typing import TYPE_CHECKING, Generator
+from typing import TYPE_CHECKING
 
 import pytest
 
@@ -12,10 +12,12 @@ from pytest_sort.core import print_recorded_times_report, sort_items
 from pytest_sort.database import clear_db, update_test_cases
 
 if TYPE_CHECKING:
+    from collections.abc import Generator
+
     from _pytest.terminal import TerminalReporter
 
 
-@pytest.hookimpl
+@pytest.hookimpl  # nomut: Decorator
 def pytest_addoption(parser: pytest.Parser) -> None:
     """pytest_sort: Add command line and ini options to pytest."""
     group = parser.getgroup("pytest-sort")
@@ -63,7 +65,7 @@ def pytest_addoption(parser: pytest.Parser) -> None:
     group.addoption("--sort_debug", action="store_true", dest="sort_debug", help=argparse.SUPPRESS)
 
 
-@pytest.hookimpl
+@pytest.hookimpl  # nomut: Decorator
 def pytest_configure(config: pytest.Config) -> None:
     """pytest_sort: Add markers to pytest."""
     config.addinivalue_line(
@@ -78,7 +80,7 @@ def pytest_configure(config: pytest.Config) -> None:
     SortConfig.from_pytest(config)
 
 
-@pytest.hookimpl
+@pytest.hookimpl  # nomut: Decorator
 def pytest_report_header(config: pytest.Config) -> str:  # noqa: ARG001
     """pytest_sort: Build Header for pytest to display."""
     header = "pytest-sort:"
@@ -89,7 +91,7 @@ def pytest_report_header(config: pytest.Config) -> str:  # noqa: ARG001
     return header
 
 
-@pytest.hookimpl
+@pytest.hookimpl  # nomut: Decorator
 def pytest_collection_modifyitems(
     session: pytest.Session,  # noqa: ARG001
     config: pytest.Config,  # noqa: ARG001
@@ -102,7 +104,7 @@ def pytest_collection_modifyitems(
     sort_items(items)
 
 
-@pytest.hookimpl(hookwrapper=True)  # pragma: no mutate
+@pytest.hookimpl(hookwrapper=True)  # nomut
 def pytest_runtest_makereport(item: pytest.Item, call: pytest.CallInfo) -> Generator:
     """pytest_sort: Record test runtimes in memory."""
     if SortConfig.record and call.when in ("setup", "call", "teardown"):
@@ -116,7 +118,7 @@ def pytest_runtest_makereport(item: pytest.Item, call: pytest.CallInfo) -> Gener
     yield
 
 
-@pytest.hookimpl
+@pytest.hookimpl  # nomut: Decorator
 def pytest_terminal_summary(
     terminalreporter: TerminalReporter,
     exitstatus: int,  # noqa: ARG001

{pytest-sort-1.3.1 → pytest_sort-1.3.3/src/pytest_sort.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pytest-sort
-Version: 1.3.1
+Version: 1.3.3
 Summary: Tools for sorting test cases
 Author-email: WiredNerd <pbuschmail-pytestsort@yahoo.com>
 Maintainer-email: WiredNerd <pbuschmail-pytestsort@yahoo.com>
@@ -34,15 +34,17 @@ Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Framework :: Pytest
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pytest>=7.4.0
 Requires-Dist: whatthepatch>=1.0.5
 Requires-Dist: coverage>=7.3.1
+Requires-Dist: zipp>=3.19.1
+Dynamic: license-file
 
 [![Homepage](https://img.shields.io/badge/Homepage-github-white?logo=github)](https://github.com/WiredNerd/pytest-sort)
-[![python>=3.8](https://img.shields.io/badge/python->=3.8-orange?logo=python&logoColor=green)](https://pypi.org/project/pytest-sort)
+[![python>=3.10](https://img.shields.io/badge/python->=3.10-orange?logo=python&logoColor=green)](https://pypi.org/project/pytest-sort)
 [![PyPI - Version](https://img.shields.io/pypi/v/pytest-sort?logo=pypi&logoColor=white)](https://pypi.org/project/pytest-sort)
 [![PyPI - Downloads](https://img.shields.io/pypi/dm/pytest-sort)](https://pypistats.org/packages/pytest-sort)
 [![PyPI - License](https://img.shields.io/pypi/l/pytest-sort)](https://github.com/WiredNerd/pytest-sort/blob/main/LICENSE)

{pytest-sort-1.3.1 → pytest_sort-1.3.3}/src/pytest_sort.egg-info/requires.txt

@@ -1,3 +1,4 @@
 pytest>=7.4.0
 whatthepatch>=1.0.5
 coverage>=7.3.1
+zipp>=3.19.1

{pytest-sort-1.3.1 → pytest_sort-1.3.3}/test/test_config.py

@@ -104,7 +104,7 @@ class TestSortConfig:
 
     def test_from_pytest_mode_invalid(self):
         pytest_config = self.PytestConfig({"sort_mode": "September"}, {})
-        with pytest.raises(ValueError, match="^Invalid Value for sort-mode='September'$"):
+        with pytest.raises(ValueError, match=r"^Invalid Value for sort-mode='September'$"):
             config.SortConfig.from_pytest(pytest_config)
 
     @pytest.mark.parametrize(
@@ -128,7 +128,7 @@ class TestSortConfig:
 
     def test_from_pytest_bucket_invalid(self):
         pytest_config = self.PytestConfig({"sort_bucket": "September"}, {})
-        with pytest.raises(ValueError, match="^Invalid Value for sort-bucket='September'$"):
+        with pytest.raises(ValueError, match=r"^Invalid Value for sort-bucket='September'$"):
             config.SortConfig.from_pytest(pytest_config)
 
     @pytest.mark.parametrize(
@@ -155,12 +155,12 @@ class TestSortConfig:
 
     def test_from_pytest_bucket_mode_invalid(self):
         pytest_config = self.PytestConfig({"sort_bucket_mode": "September"}, {})
-        with pytest.raises(ValueError, match="^Invalid Value for sort-bucket-mode='September'$"):
+        with pytest.raises(ValueError, match=r"^Invalid Value for sort-bucket-mode='September'$"):
             config.SortConfig.from_pytest(pytest_config)
 
     def test_from_pytest_sort_record_conflict(self):
         pytest_config = self.PytestConfig({"sort_no_record": True, "sort_record": True}, {})
-        with pytest.raises(ValueError, match="^Do not use both --sort-record-times and --sort-no-record-times$"):
+        with pytest.raises(ValueError, match=r"^Do not use both --sort-record-times and --sort-no-record-times$"):
             config.SortConfig.from_pytest(pytest_config)
 
     @pytest.mark.parametrize(
@@ -202,7 +202,7 @@ class TestSortConfig:
 
     def test_from_pytest_seed_invalid(self):
         pytest_config = self.PytestConfig({}, {"sort_seed": "ABC"})
-        with pytest.raises(ValueError, match="^Invalid seed value 'ABC' must be int$"):
+        with pytest.raises(ValueError, match=r"^Invalid seed value 'ABC' must be int$"):
             config.SortConfig.from_pytest(pytest_config)
 
     @pytest.mark.parametrize(

{pytest-sort-1.3.1 → pytest_sort-1.3.3}/test/test_core.py

@@ -2,7 +2,7 @@ import hashlib
 import importlib
 import sys
 from functools import partial
-from typing import Callable, ClassVar
+from typing import ClassVar
 from unittest import mock
 
 import pytest
@@ -10,9 +10,12 @@ from _pytest import nodes as pytest_nodes
 
 from pytest_sort import config, core
 
-md5: Callable = hashlib.md5
-if sys.version_info >= (3, 9):
-    md5: Callable = partial(hashlib.md5, usedforsecurity=False)  # type: ignore[no-redef]
+if sys.version_info < (3, 14):  # nomut
+    from typing import Callable  # noqa: UP035  # pragma: no cover
+else:
+    from collections.abc import Callable
+
+md5: Callable = partial(hashlib.md5, usedforsecurity=False)  # type: ignore[no-redef]
 
 
 class TestImports:
@@ -21,23 +24,12 @@ class TestImports:
         with mock.patch("hashlib.md5") as mock_md5:
             yield mock_md5
 
-    @pytest.fixture()
-    def version_info(self):
-        with mock.patch("sys.version_info") as version_info:
-            yield version_info
-
     @pytest.fixture(autouse=True)
     def _cleanup(self):
         yield
         importlib.reload(core)
 
-    def test_import_md5_38(self, version_info, mock_md5):
-        version_info.__ge__ = lambda _, __: False
-        importlib.reload(core)
-        assert core.md5 == mock_md5
-
-    def test_import_md5_39(self, version_info, mock_md5):
-        version_info.__ge__ = lambda _, v: v == (3, 9)
+    def test_import_md5_39(self, mock_md5):
         importlib.reload(core)
         assert isinstance(core.md5, partial)
         assert core.md5.func == mock_md5
@@ -92,7 +84,7 @@ class TestCreateBucketIdForNode:
         assert core.create_bucket_id_from_node(node) == bucket_id
 
     def test_create_bucket_id_for_package(self, mock_objects):
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         assert core.create_bucket_id_for_package(session) == "session"
         assert core.create_bucket_id_for_package(package) == "tests/core/"
@@ -104,7 +96,7 @@ class TestCreateBucketIdForNode:
         assert core.create_bucket_id_for_package(module) == ""
 
     def test_create_bucket_id_for_module(self, mock_objects):
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         assert core.create_bucket_id_for_module(session) == "session"
         assert core.create_bucket_id_for_module(package) == "tests/core/"
@@ -116,7 +108,7 @@ class TestCreateBucketIdForNode:
         assert core.create_bucket_id_for_module(cls) == ""
 
     def test_create_bucket_id_for_class(self, mock_objects):
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         assert core.create_bucket_id_for_class(session) == "session"
         assert core.create_bucket_id_for_class(package) == "tests/core/"
@@ -130,7 +122,7 @@ class TestCreateBucketIdForNode:
 
 class TestCreateBucketId:
     def test_create_bucket_id(self, mock_objects):
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         assert core.create_bucket_id["session"](func) == ""
         assert core.create_bucket_id["package"](func) == "tests/core/"
@@ -141,7 +133,7 @@ class TestCreateBucketId:
         assert core.create_bucket_id["grandparent"](func) == "tests/core/test_core.py"
 
     def test_create_item_key(self, mock_objects):
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         assert core.create_item_key["ordered"](func, 5, 20) == 6
         assert core.create_item_key["reverse"](func, 5, 20) == 15
@@ -152,21 +144,21 @@ class TestCreateBucketId:
         assert 0 <= core.create_item_key["random"](func, 5, 20) < 1
 
     def test_create_item_key_fastest(self, mock_objects):
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         assert core.create_item_key["fastest"](func, 5, 20) == 0
         core.SortConfig.item_totals = {func.nodeid: 123}
         assert core.create_item_key["fastest"](func, 5, 20) == 123
 
     def test_create_item_key_diffcov(self, mock_objects):
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         assert core.create_item_key["diffcov"](func, 5, 20) == 0
         core.SortConfig.diff_cov_scores = {func.nodeid: -123}
         assert core.create_item_key["diffcov"](func, 5, 20) == -123
 
     def test_create_item_key_mutcov(self, mock_objects):
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         assert core.create_item_key["mutcov"](func, 5, 20) == 0
         core.SortConfig.mut_cov_scores = {func.nodeid: -123}
@@ -232,10 +224,12 @@ class TestValidateMarker:
         order_marker.args = []
         order_marker.kwargs = {}
 
-        with pytest.raises(TypeError, match="^Incorrect arguments on marker 'order'. Target:testnodeid$") as type_error:
+        with pytest.raises(
+            TypeError, match=r"^Incorrect arguments on marker 'order'. Target:testnodeid$"
+        ) as type_error:
             core.validate_order_marker(order_marker, "testnodeid")
 
-        assert type(type_error.value.__cause__) == TypeError
+        assert isinstance(type_error.value.__cause__, TypeError)
 
     @pytest.mark.parametrize(
         ("args", "kwargs", "key"),
@@ -258,10 +252,10 @@ class TestValidateMarker:
         sort_marker.args = []
         sort_marker.kwargs = {}
 
-        with pytest.raises(TypeError, match="^Incorrect arguments on marker 'sort'. Target:testnodeid$") as type_error:
+        with pytest.raises(TypeError, match=r"^Incorrect arguments on marker 'sort'. Target:testnodeid$") as type_error:
             core.validate_sort_marker(sort_marker, "testnodeid")
 
-        assert type(type_error.value.__cause__) == TypeError
+        assert isinstance(type_error.value.__cause__, TypeError)
 
     def test_validate_sort_marker_value_error(self):
         sort_marker = mock.MagicMock()
@@ -269,7 +263,7 @@ class TestValidateMarker:
         sort_marker.kwargs = {}
 
         with pytest.raises(
-            ValueError, match="^Invalid Value for 'mode' on 'sort' marker. Value:invalid Target:testnodeid$"
+            ValueError, match=r"^Invalid Value for 'mode' on 'sort' marker. Value:invalid Target:testnodeid$"
         ) as type_error:
             core.validate_sort_marker(sort_marker, "testnodeid")
 
@@ -278,7 +272,7 @@ class TestValidateMarker:
 
 class TestMarkerSettings:
     def test_get_marker_settings_order_function(self, mock_objects):
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         order_1 = mock.MagicMock()
         order_1.args = [1]
@@ -296,7 +290,7 @@ class TestMarkerSettings:
         )
 
     def test_get_marker_settings_order_cls(self, mock_objects):
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         order_1 = mock.MagicMock()
         order_1.args = [1]
@@ -319,7 +313,7 @@ class TestMarkerSettings:
         )
 
     def test_get_marker_settings_order_mod(self, mock_objects):
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         order_1 = mock.MagicMock()
         order_1.args = [1]
@@ -342,7 +336,7 @@ class TestMarkerSettings:
         )
 
     def test_get_marker_settings_sort_self(self, mock_objects):
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         order_1 = mock.MagicMock()
         order_1.args = [1]
@@ -370,7 +364,7 @@ class TestMarkerSettings:
         )
 
     def test_get_marker_settings_sort_bucket(self, mock_objects):
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         order_1 = mock.MagicMock()
         order_1.args = [1]
@@ -391,12 +385,12 @@ class TestMarkerSettings:
         assert core.get_marker_settings(func) == ("random", "parent", None, None, 1)
 
     def test_get_marker_settings_no_markers(self, mock_objects):
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         assert core.get_marker_settings(func) == (None, None, None, None, None)
 
     def test_get_marker_settings_error(self, mock_objects):
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         sort_random = mock.MagicMock()
         sort_random.args = ["random", "hello"]
@@ -424,7 +418,7 @@ class TestCreateSortKey:
     def test_marker_bucketid_sortkey(self, get_marker_settings, mock_objects):
         get_marker_settings.return_value = (None, None, "test/core", None, 1234)
         config.SortConfig.bucket_mode = "ordered"
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         core.create_sort_keys(func, 6, 60)
 
@@ -438,7 +432,7 @@ class TestCreateSortKey:
         get_marker_settings.return_value = ("reverse", "class", None, None, None)
         config.SortConfig.mode = "ordered"
         config.SortConfig.bucket_mode = "ordered"
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         core.create_sort_keys(func, 6, 60)
 
@@ -453,7 +447,7 @@ class TestCreateSortKey:
         config.SortConfig.mode = "ordered"
         config.SortConfig.bucket_mode = "ordered"
         config.SortConfig.bucket = "module"
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         core.create_sort_keys(func, 6, 60)
 
@@ -468,7 +462,7 @@ class TestCreateSortKey:
         config.SortConfig.mode = "ordered"
         config.SortConfig.bucket = "module"
         config.SortConfig.bucket_mode = "reverse"
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         core.create_sort_keys(func, 6, 60)
 
@@ -481,7 +475,7 @@ class TestCreateSortKey:
         config.SortConfig.mode = "reverse"
         config.SortConfig.bucket = "module"
         config.SortConfig.bucket_mode = "ordered"
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         core.create_sort_keys(func, 6, 60)
 
@@ -494,7 +488,7 @@ class TestCreateSortKey:
         config.SortConfig.mode = "fastest"
         config.SortConfig.bucket = "class"
         config.SortConfig.bucket_mode = "fastest"
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         config.SortConfig.item_totals = {
             func.nodeid: 1.1,
@@ -512,7 +506,7 @@ class TestCreateSortKey:
         config.SortConfig.mode = "ordered"
         config.SortConfig.bucket = "module"
         config.SortConfig.bucket_mode = "ordered"
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         core.create_sort_keys(func, 0, 60)
         core.create_sort_keys(func, 1, 60)
@@ -526,7 +520,7 @@ class TestCreateSortKey:
         config.SortConfig.mode = "ordered"
         config.SortConfig.bucket = "module"
         config.SortConfig.bucket_mode = "md5"
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         md5.return_value.digest.side_effect = [b"DEF", b"ABC", b"GHI"]
 
@@ -537,7 +531,7 @@ class TestCreateSortKey:
         assert config.SortConfig.bucket_sort_keys == {module.nodeid: b"ABC"}
 
     def test_get_item_sort_key(self, mock_objects):
-        (session, package, module, cls, func) = mock_objects
+        session, package, module, cls, func = mock_objects
 
         core.SortConfig.item_sort_keys = {func.nodeid: 1.1}
         core.SortConfig.item_bucket_id = {func.nodeid: cls.nodeid}