Merge pull request matplotlib#30614 from meeseeksmachine/auto-backport-of-pr-30612-on-v3.10.x

Backport PR matplotlib#30612 on branch v3.10.x (MNT: update black pin)

Author: timhoffm

environment.yml

@@ -51,7 +51,7 @@ dependencies:
       - sphinxcontrib-video>=0.2.1
       - pikepdf
   # testing
-  - black<24
+  - black<26
   - coverage
   - flake8>=3.8,<7.2
   - flake8-docstrings>=1.4.0

lib/matplotlib/pyplot.py

@@ -3145,8 +3145,9 @@ def cohere(
     NFFT: int = 256,
     Fs: float = 2,
     Fc: int = 0,
-    detrend: Literal["none", "mean", "linear"]
-    | Callable[[ArrayLike], ArrayLike] = mlab.detrend_none,
+    detrend: (
+        Literal["none", "mean", "linear"] | Callable[[ArrayLike], ArrayLike]
+    ) = mlab.detrend_none,
     window: Callable[[ArrayLike], ArrayLike] | ArrayLike = mlab.window_hanning,
     noverlap: int = 0,
     pad_to: int | None = None,
@@ -3203,9 +3204,9 @@ def csd(
     NFFT: int | None = None,
     Fs: float | None = None,
     Fc: int | None = None,
-    detrend: Literal["none", "mean", "linear"]
-    | Callable[[ArrayLike], ArrayLike]
-    | None = None,
+    detrend: (
+        Literal["none", "mean", "linear"] | Callable[[ArrayLike], ArrayLike] | None
+    ) = None,
     window: Callable[[ArrayLike], ArrayLike] | ArrayLike | None = None,
     noverlap: int | None = None,
     pad_to: int | None = None,
@@ -3876,9 +3877,9 @@ def psd(
     NFFT: int | None = None,
     Fs: float | None = None,
     Fc: int | None = None,
-    detrend: Literal["none", "mean", "linear"]
-    | Callable[[ArrayLike], ArrayLike]
-    | None = None,
+    detrend: (
+        Literal["none", "mean", "linear"] | Callable[[ArrayLike], ArrayLike] | None
+    ) = None,
     window: Callable[[ArrayLike], ArrayLike] | ArrayLike | None = None,
     noverlap: int | None = None,
     pad_to: int | None = None,
@@ -3986,9 +3987,9 @@ def specgram(
     NFFT: int | None = None,
     Fs: float | None = None,
     Fc: int | None = None,
-    detrend: Literal["none", "mean", "linear"]
-    | Callable[[ArrayLike], ArrayLike]
-    | None = None,
+    detrend: (
+        Literal["none", "mean", "linear"] | Callable[[ArrayLike], ArrayLike] | None
+    ) = None,
     window: Callable[[ArrayLike], ArrayLike] | ArrayLike | None = None,
     noverlap: int | None = None,
     cmap: str | Colormap | None = None,
@@ -4299,10 +4300,9 @@ def violinplot(
     showmedians: bool = False,
     quantiles: Sequence[float | Sequence[float]] | None = None,
     points: int = 100,
-    bw_method: Literal["scott", "silverman"]
-    | float
-    | Callable[[GaussianKDE], float]
-    | None = None,
+    bw_method: (
+        Literal["scott", "silverman"] | float | Callable[[GaussianKDE], float] | None
+    ) = None,
     side: Literal["both", "low", "high"] = "both",
     *,
     data=None,

lib/matplotlib/tests/test_pyplot.py

@@ -12,7 +12,7 @@
 
 
 def test_pyplot_up_to_date(tmp_path):
-    pytest.importorskip("black")
+    pytest.importorskip("black", minversion="24.1")
 
     gen_script = Path(mpl.__file__).parents[2] / "tools/boilerplate.py"
     if not gen_script.exists():

requirements/testing/all.txt

@@ -1,6 +1,6 @@
 # pip requirements for all the CI builds
 
-black<24
+black<26
 certifi
 coverage!=6.3
 psutil