fix: ruff findings

Author: WiredNerd

.github/workflows/python-test-scan.yml

@@ -116,7 +116,7 @@ jobs:
         uses: chartboost/ruff-action@v1
         with:
           src: src
-          args: check --show-source
+          args: check --show-files
       - name: Ruff src diff
         uses: chartboost/ruff-action@v1
         if: ${{ always() }}
@@ -128,7 +128,7 @@ jobs:
         if: ${{ always() }}
         with:
           src: test
-          args: check --show-source
+          args: check --show-files
       - name: Ruff test diff
         uses: chartboost/ruff-action@v1
         if: ${{ always() }}

pyproject.toml

@@ -105,6 +105,9 @@ ignore = [
     "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"]
 

req/requirements.txt

@@ -1,4 +1,3 @@
 pytest>=7.4.0
 whatthepatch>=1.0.5
-coverage>=7.3.1
-zipp>=3.19.1 # not directly required, pinned by Snyk to avoid a vulnerability
+coverage>=7.3.1

req/tools.txt

@@ -4,4 +4,5 @@ isort
 
 -r pytest.txt
 -r mypy.txt
--r build.txt
+-r build.txt
+-r poodle.txt

src/pytest_sort/core.py

@@ -4,7 +4,6 @@
 
 import hashlib
 import random
-import sys
 from functools import partial
 from typing import TYPE_CHECKING, Any, Callable
 
@@ -15,9 +14,7 @@
 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]
+md5: Callable = partial(hashlib.md5, usedforsecurity=False)  # type: ignore[no-redef]
 
 
 if TYPE_CHECKING:

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"]
 

src/pytest_sort/diffcov.py

@@ -7,11 +7,14 @@
 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))
 

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,6 +12,8 @@
 from pytest_sort.database import clear_db, update_test_cases
 
 if TYPE_CHECKING:
+    from collections.abc import Generator
+
     from _pytest.terminal import TerminalReporter
 
 

test/test_core.py

@@ -1,6 +1,5 @@
 import hashlib
 import importlib
-import sys
 from functools import partial
 from typing import Callable, ClassVar
 from unittest import mock
@@ -10,9 +9,7 @@
 
 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]
+md5: Callable = partial(hashlib.md5, usedforsecurity=False)  # type: ignore[no-redef]
 
 
 class TestImports:
@@ -21,23 +18,12 @@ def mock_md5(self):
         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
@@ -235,7 +221,7 @@ def test_validate_order_marker_error(self):
         with pytest.raises(TypeError, match="^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"),
@@ -261,7 +247,7 @@ def test_validate_sort_marker_type_error(self):
         with pytest.raises(TypeError, match="^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()

tools.ipynb

@@ -157,7 +157,7 @@
    },
    "outputs": [],
    "source": [
-    "!ruff check --show-files src test"
+    "!ruff check src test"
    ]
   },
   {