Merge pull request #8295 from akx/ruff-enforce-parametrize-style

hugovk · web-flow · commit 082e3234a176 · 2024-08-08T15:12:43.000+03:00
diff --git a/Tests/test_file_dds.py b/Tests/test_file_dds.py
@@ -152,7 +152,7 @@ def test_sanity_ati2_bc5u(image_path: str) -> None:
 
 
 @pytest.mark.parametrize(
-    ("image_path", "expected_path"),
+    "image_path, expected_path",
     (
         # hexeditted to be typeless
         (TEST_FILE_DX10_BC5_TYPELESS, TEST_FILE_DX10_BC5_UNORM),
@@ -248,7 +248,7 @@ def test_dx10_r8g8b8a8_unorm_srgb() -> None:
 
 
 @pytest.mark.parametrize(
-    ("mode", "size", "test_file"),
+    "mode, size, test_file",
     [
         ("L", (128, 128), TEST_FILE_UNCOMPRESSED_L),
         ("LA", (128, 128), TEST_FILE_UNCOMPRESSED_L_WITH_ALPHA),
@@ -373,7 +373,7 @@ def test_save_unsupported_mode(tmp_path: Path) -> None:
 
 
 @pytest.mark.parametrize(
-    ("mode", "test_file"),
+    "mode, test_file",
     [
         ("L", "Tests/images/linear_gradient.png"),
         ("LA", "Tests/images/uncompressed_la.png"),
diff --git a/Tests/test_file_eps.py b/Tests/test_file_eps.py
@@ -80,9 +80,7 @@
 
 
 @pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
-@pytest.mark.parametrize(
-    ("filename", "size"), ((FILE1, (460, 352)), (FILE2, (360, 252)))
-)
+@pytest.mark.parametrize("filename, size", ((FILE1, (460, 352)), (FILE2, (360, 252))))
 @pytest.mark.parametrize("scale", (1, 2))
 def test_sanity(filename: str, size: tuple[int, int], scale: int) -> None:
     expected_size = tuple(s * scale for s in size)
diff --git a/Tests/test_image_access.py b/Tests/test_image_access.py
@@ -230,7 +230,7 @@ def test_putpixel_type_error1(self, mode: str) -> None:
                 im.putpixel((0, 0), v)  # type: ignore[arg-type]
 
     @pytest.mark.parametrize(
-        ("mode", "band_numbers", "match"),
+        "mode, band_numbers, match",
         (
             ("L", (0, 2), "color must be int or single-element tuple"),
             ("LA", (0, 3), "color must be int, or tuple of one or two elements"),
diff --git a/Tests/test_pickle.py b/Tests/test_pickle.py
@@ -46,7 +46,7 @@ def helper_pickle_string(protocol: int, test_file: str, mode: str | None) -> Non
 
 
 @pytest.mark.parametrize(
-    ("test_file", "test_mode"),
+    "test_file, test_mode",
     [
         ("Tests/images/hopper.jpg", None),
         ("Tests/images/hopper.jpg", "L"),
diff --git a/pyproject.toml b/pyproject.toml
@@ -109,6 +109,7 @@ lint.select = [
   "ISC",    # flake8-implicit-str-concat
   "LOG",    # flake8-logging
   "PGH",    # pygrep-hooks
+  "PT006",  # pytest-parametrize-names-wrong-type
   "PYI",    # flake8-pyi
   "RUF100", # unused noqa (yesqa)
   "UP",     # pyupgrade
@@ -129,6 +130,7 @@ lint.per-file-ignores."Tests/oss-fuzz/fuzz_font.py" = [
 lint.per-file-ignores."Tests/oss-fuzz/fuzz_pillow.py" = [
   "I002",
 ]
+lint.flake8-pytest-style.parametrize-names-type = "csv"
 lint.isort.known-first-party = [
   "PIL",
 ]

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ def test_sanity_ati2_bc5u(image_path: str) -> None:`
`152`	`152`
`153`	`153`
`154`	`154`	`@pytest.mark.parametrize(`
`155`		`- ("image_path", "expected_path"),`
	`155`	`+ "image_path, expected_path",`
`156`	`156`	`(`
`157`	`157`	`# hexeditted to be typeless`
`158`	`158`	`(TEST_FILE_DX10_BC5_TYPELESS, TEST_FILE_DX10_BC5_UNORM),`
`@@ -248,7 +248,7 @@ def test_dx10_r8g8b8a8_unorm_srgb() -> None:`
`248`	`248`
`249`	`249`
`250`	`250`	`@pytest.mark.parametrize(`
`251`		`- ("mode", "size", "test_file"),`
	`251`	`+ "mode, size, test_file",`
`252`	`252`	`[`
`253`	`253`	`("L", (128, 128), TEST_FILE_UNCOMPRESSED_L),`
`254`	`254`	`("LA", (128, 128), TEST_FILE_UNCOMPRESSED_L_WITH_ALPHA),`
`@@ -373,7 +373,7 @@ def test_save_unsupported_mode(tmp_path: Path) -> None:`
`373`	`373`
`374`	`374`
`375`	`375`	`@pytest.mark.parametrize(`
`376`		`- ("mode", "test_file"),`
	`376`	`+ "mode, test_file",`
`377`	`377`	`[`
`378`	`378`	`("L", "Tests/images/linear_gradient.png"),`
`379`	`379`	`("LA", "Tests/images/uncompressed_la.png"),`
Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ def test_putpixel_type_error1(self, mode: str) -> None:`
`230`	`230`	`im.putpixel((0, 0), v) # type: ignore[arg-type]`
`231`	`231`
`232`	`232`	`@pytest.mark.parametrize(`
`233`		`- ("mode", "band_numbers", "match"),`
	`233`	`+ "mode, band_numbers, match",`
`234`	`234`	`(`
`235`	`235`	`("L", (0, 2), "color must be int or single-element tuple"),`
`236`	`236`	`("LA", (0, 3), "color must be int, or tuple of one or two elements"),`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ def helper_pickle_string(protocol: int, test_file: str, mode: str \| None) -> Non`
`46`	`46`
`47`	`47`
`48`	`48`	`@pytest.mark.parametrize(`
`49`		`- ("test_file", "test_mode"),`
	`49`	`+ "test_file, test_mode",`
`50`	`50`	`[`
`51`	`51`	`("Tests/images/hopper.jpg", None),`
`52`	`52`	`("Tests/images/hopper.jpg", "L"),`