diff options
Diffstat (limited to 'ci-Pin-pythes-8.0.0.patch')
| -rw-r--r-- | ci-Pin-pythes-8.0.0.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/ci-Pin-pythes-8.0.0.patch b/ci-Pin-pythes-8.0.0.patch new file mode 100644 index 0000000..cdb8413 --- /dev/null +++ b/ci-Pin-pythes-8.0.0.patch @@ -0,0 +1,44 @@ +From 7f3b0ff968409a880596e04aece4e4c504fb9c64 Mon Sep 17 00:00:00 2001 +From: Brett Holman <brett.holman@canonical.com> +Date: Mon, 29 Jan 2024 12:03:36 -0700 +Subject: [PATCH] ci: Pin pytest<8.0.0. (#4816) + +The latest pytest release broke some tests in non-obvious ways. Pin +the version for now so that CI passes. + +(cherry picked from commit 7c96c9cd9318e816ce4564b58a2c98271363c447) +Signed-off-by: Ani Sinha <anisinha@redhat.com> +--- + integration-requirements.txt | 2 +- + test-requirements.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/integration-requirements.txt b/integration-requirements.txt +index 1f8b54a5..c0792d63 100644 +--- a/integration-requirements.txt ++++ b/integration-requirements.txt +@@ -7,7 +7,7 @@ pycloudlib>=5.10.0,<1!6 + # test/unittests/conftest.py to be loaded by our integration-tests tox env + # resulting in an unmet dependency issue: + # https://github.com/pytest-dev/pytest/issues/11104 +-pytest!=7.3.2 ++pytest!=7.3.2,<8.0.0 + + packaging + passlib +diff --git a/test-requirements.txt b/test-requirements.txt +index 46a98b4c..3d2480fd 100644 +--- a/test-requirements.txt ++++ b/test-requirements.txt +@@ -4,7 +4,7 @@ + # test/unittests/conftest.py to be loaded by our integration-tests tox env + # resulting in an unmet dependency issue: + # https://github.com/pytest-dev/pytest/issues/11104 +-pytest!=7.3.2 ++pytest!=7.3.2,<8.0.0 + + pytest-cov + pytest-mock +-- +2.39.3 + |