8000 Merge pull request #27859 from meeseeksmachine/auto-backport-of-pr-27… · matplotlib/matplotlib@839d08a · GitHub
[go: up one dir, main page]

Skip to content

Commit 839d08a

Browse files
authored
Merge pull request #27859 from meeseeksmachine/auto-backport-of-pr-27858-on-v3.8.x
Backport PR #27858 on branch v3.8.x (pin pytest)
2 parents e8d9bbd + bc3f0b7 commit 839d08a

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
@@ -55,7 +55,7 @@ dependencies:
5555
- psutil
5656
- pre-commit
5757
- pydocstyle>=5.1.0
58-
- pytest!=4.6.0,!=5.4.0
58+
- pytest!=4.6.0,!=5.4.0,!=8.1.0
5959
- pytest-cov
6060
- pytest-rerunfailures
6161
- pytest-timeout

requirements/testing/all.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ black<24
44
certifi
55
coverage!=6.3
66
psutil
7-
pytest!=4.6.0,!=5.4.0
7+
pytest!=4.6.0,!=5.4.0,!=8.1.0
88
pytest-cov
99
pytest-rerunfailures
1010
pytest-timeout

0 commit comments

Comments
 (0)
0