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

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: pytest-sort
-Version: 1.3.1
+Version: 1.3.2
 Summary: Tools for sorting test cases
 Author-email: WiredNerd <pbuschmail-pytestsort@yahoo.com>
 Maintainer-email: WiredNerd <pbuschmail-pytestsort@yahoo.com>
@@ -40,6 +40,7 @@ License-File: LICENSE
 Requires-Dist: pytest>=7.4.0
 Requires-Dist: whatthepatch>=1.0.5
 Requires-Dist: coverage>=7.3.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)

{pytest-sort-1.3.1 → pytest_sort-1.3.2}/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.2"
 license = { file = "LICENSE" }
 keywords = [
     "test",
@@ -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 = ['py39', 'py310', 'py311', 'py312', 'py313']
 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 = "py39"
+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

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

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

{pytest-sort-1.3.1 → pytest_sort-1.3.2}/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.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-sort-1.3.1 → pytest_sort-1.3.2/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.2
 Summary: Tools for sorting test cases
 Author-email: WiredNerd <pbuschmail-pytestsort@yahoo.com>
 Maintainer-email: WiredNerd <pbuschmail-pytestsort@yahoo.com>
@@ -40,6 +40,7 @@ License-File: LICENSE
 Requires-Dist: pytest>=7.4.0
 Requires-Dist: whatthepatch>=1.0.5
 Requires-Dist: coverage>=7.3.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)

{pytest-sort-1.3.1 → pytest_sort-1.3.2}/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 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]
+md5: Callable = partial(hashlib.md5, usedforsecurity=False)  # type: ignore[no-redef]
 
 
 class TestImports:
@@ -21,23 +18,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
@@ -235,7 +221,7 @@ class TestValidateMarker:
         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 @@ class TestValidateMarker:
         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()