Merge branch '5.x' into fixes_issue_21960

spyder-ide · Apr 5, 2024 · 916f28e · 916f28e
2 parents 5e61632 + 0c31a72
commit 916f28e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/binder/environment.yml b/binder/environment.yml
@@ -58,7 +58,7 @@ dependencies:
 - matplotlib
 - pandas
 - pillow
-- pytest <7.0
+- pytest <8.0
 - pytest-cov
 - pytest-lazy-fixture
 - pytest-mock

diff --git a/requirements/tests.yml b/requirements/tests.yml
@@ -11,7 +11,7 @@ dependencies:
   - matplotlib
   - pandas
   - pillow
-  - pytest <7.0
+  - pytest <8.0
   - pytest-cov
   - pytest-lazy-fixture
   - pytest-mock

diff --git a/setup.py b/setup.py
@@ -267,7 +267,7 @@ def run(self):
         'matplotlib',
         'pandas',
         'pillow',
-        'pytest<7.0',
+        'pytest<8.0',
         'pytest-cov',
         'pytest-lazy-fixture',
         'pytest-mock',