8000 Merge pull request #25620 from meeseeksmachine/auto-backport-of-pr-25… · matplotlib/matplotlib@b5263fa · GitHub
[go: up one dir, main page]
Skip to content

Commit b5263fa

Browse files
tacaswelltacaswell
authored
Merge pull request #25620 from meeseeksmachine/auto-backport-of-pr-25615-on-v3.7.x
Backport PR #25615 8000 on branch v3.7.x (TST: Avoid broken nbconvert)
2 parents 5ac2113 + 56ee061 commit b5263fa

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

‎environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ dependencies:
4848
- flake8-docstrings>=1.4.0
4949
- gtk4
5050
- ipykernel
51-
- nbconvert[execute]!=6.0.0,!=6.0.1
51+
- nbconvert[execute]!=6.0.0,!=6.0.1,!=7.3.0
5252
- nbformat!=5.0.0,!=5.0.1
5353
- pandas!=0.25.0
5454
- psutil

‎requirements/testing/extra.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
--prefer-binary
44
ipykernel
5-
nbconvert[execute]!=6.0.0,!=6.0.1
5+
nbconvert[execute]!=6.0.0,!=6.0.1,!=7.3.0
66
nbformat!=5.0.0,!=5.0.1
77
pandas!=0.25.0
88
pikepdf

0 commit comments

Comments
 (0)
0