From 56fefda50dfdc1736adadb201ec5a6c4e70797bc Mon Sep 17 00:00:00 2001 From: Alex Waygood Date: Fri, 23 Jun 2023 13:00:48 +0100 Subject: [PATCH 1/2] Unbreak CI pytest 7.4.0 was just released, and our CI is red as a result. Looks like we're using a private API that we shouldn't be. For now let's just pin to pytest <7.4.0 --- test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-requirements.txt b/test-requirements.txt index 7c4b3b869de5..f5beeb8bbfce 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,7 +9,7 @@ pre-commit pre-commit-hooks==4.4.0 psutil>=4.0 # pytest 6.2.3 does not support Python 3.10 -pytest>=6.2.4 +pytest>=6.2.4,<7.4.0 pytest-xdist>=1.34.0 pytest-cov>=2.10.0 ruff==0.0.272 # must match version in .pre-commit-config.yaml From b3e47d578f464f9ae1f9b400966e6321c2b34292 Mon Sep 17 00:00:00 2001 From: Alex Waygood Date: Fri, 23 Jun 2023 13:07:21 +0100 Subject: [PATCH 2/2] Add TODO --- test-requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/test-requirements.txt b/test-requirements.txt index f5beeb8bbfce..f7d37058e544 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,6 +9,7 @@ pre-commit pre-commit-hooks==4.4.0 psutil>=4.0 # pytest 6.2.3 does not support Python 3.10 +# TODO: fix use of removed private APIs so we can use the latest pytest pytest>=6.2.4,<7.4.0 pytest-xdist>=1.34.0 pytest-cov>=2.10.0