From caa00d6d73d0867cfad4a7224ca7d59f468b70b5 Mon Sep 17 00:00:00 2001 From: David Zaslavsky Date: Sat, 5 Oct 2024 14:59:44 -0700 Subject: [PATCH 1/2] Bump required pytest version to 4.6 We have started getting an error with pytest>=4,<4.6 when setuptools>=71 (or typeguard>=4.2) is also installed, due to a conflict with older pytest and setuptools' vendored version of typeguard. Out of various ways to resolve this conflict, this is the only one that doesn't involve putting an upper bound on the version of some package. It should still be technically possible to use older versions of pytest along with setuptools<71, if someone really needs to do that, but there isn't any way to express that dependency constraint, and I'm not going to go to any trouble to support long-obsolete versions of packages. --- .github/workflows/tests.yml | 10 +++++----- tox.ini | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b0c217e..946e189 100644 --- 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 index 1273c88..ad51132 100644 --- a/tox.ini +++ b/tox.ini @@ -22,7 +22,7 @@ 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 >=4.6, <8; python_version<'3.10' pytest >=6.2.4, <8; python_version>='3.10' pytest-cov requests From ea88d5077966e03f0ca80c5a11f759df5b56beb0 Mon Sep 17 00:00:00 2001 From: David Zaslavsky Date: Sat, 5 Oct 2024 15:14:50 -0700 Subject: [PATCH 2/2] Increase max allowed pytest version to 9 pytest 8 has been out for a while; it's long past time we officially added support for it. This will allow people to use this plugin along with pytest 8. --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index ad51132..7b22335 100644 --- 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.6, <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 =