Skip to content

MNT: update black pin #30612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dstansby merged 1 commit into from
Sep 28, 2025
+18 −18
Merged

MNT: update black pin #30612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ dependencies:
- sphinxcontrib-video>=0.2.1
- pikepdf
# testing
- black<24
- black<26
- coverage
- gtk4
- ipykernel
Expand Down
30 changes: 15 additions & 15 deletions lib/matplotlib/pyplot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3269,8 +3269,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,
Expand Down Expand Up @@ -3327,9 +3328,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,
Expand Down Expand Up @@ -4004,9 +4005,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,
Expand Down Expand Up @@ -4114,9 +4115,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,
Expand Down Expand Up @@ -4433,10 +4434,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",
facecolor: Sequence[ColorType] | ColorType | None = None,
linecolor: Sequence[ColorType] | ColorType | None = None,
Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/tests/test_pyplot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,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():
Expand Down
2 changes: 1 addition & 1 deletion requirements/testing/all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# pip requirements for all the CI builds

black<24
black<26
certifi
coverage!=6.3
psutil
Expand Down