Merge branch 'master' into pre-commit-ci-update-config

pytest-dev · Oct 5, 2024 · 6996d5a · 6996d5a
2 parents e6f077a + 4c6432b
commit 6996d5a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -19,19 +19,19 @@ jobs:
         python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', 'pypy-3.7', 'pypy-3.8', 'pypy-3.9']
         extra: ['', '-smtp']
         # The forced pytest versions correspond with the lower bounds in tox.ini
-        pytest-version: ['', '--force-dep pytest==4', '--force-dep pytest==6.2.4']
+        pytest-version: ['', '--force-dep pytest==4.6', '--force-dep pytest==6.2.4']
         include:
         - os: 'ubuntu-20.04'
           python-version: '3.6'
         exclude:
         - python-version: '3.10'
-          pytest-version: '--force-dep pytest==4'
+          pytest-version: '--force-dep pytest==4.6'
         - python-version: '3.11'
-          pytest-version: '--force-dep pytest==4'
+          pytest-version: '--force-dep pytest==4.6'
         - python-version: '3.12'
-          pytest-version: '--force-dep pytest==4'
+          pytest-version: '--force-dep pytest==4.6'
         - python-version: '3.13'
-          pytest-version: '--force-dep pytest==4'
+          pytest-version: '--force-dep pytest==4.6'
       fail-fast: false
 
     steps:

diff --git a/tox.ini b/tox.ini
@@ -22,8 +22,8 @@ deps =
     # works with your code. Don't forget to modify the corresponding entries in
     # the Github workflows configuration file if you do change these lower
     # bounds.
-    pytest >=4, <8; python_version<'3.10'
-    pytest >=6.2.4, <8; python_version>='3.10'
+    pytest >=4.6, <9; python_version<'3.10'
+    pytest >=6.2.4, <9; python_version>='3.10'
     pytest-cov
     requests
 extras =