diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-03-28 13:13:18 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-03-28 13:13:18 +0000 |
| commit | ac4d0ec6279a51ce08af9e3293666bc339be6b6f (patch) | |
| tree | 6508e4e43895ec49dc0bad3bb41195db40137bf2 /dev-python/tavern | |
| parent | 63a01a3024a6fa402d123768cd38f1cabe13adf6 (diff) | |
gentoo auto-resync : 28:03:2024 - 13:13:17
Diffstat (limited to 'dev-python/tavern')
| -rw-r--r-- | dev-python/tavern/Manifest | 3 | ||||
| -rw-r--r-- | dev-python/tavern/files/tavern-2.10.1-pytest-8.patch | 36 | ||||
| -rw-r--r-- | dev-python/tavern/tavern-2.10.1.ebuild | 5 |
3 files changed, 43 insertions, 1 deletions
diff --git a/dev-python/tavern/Manifest b/dev-python/tavern/Manifest index b02ff6197be5..e79dd6dc3c00 100644 --- a/dev-python/tavern/Manifest +++ b/dev-python/tavern/Manifest @@ -1,5 +1,6 @@ +AUX tavern-2.10.1-pytest-8.patch 1218 BLAKE2B 0f4e488667320fde42f487fe565a5665fad663e80c06c9065cf5377182e3ff7437b1e8e9d31e0d91bdec270958998d601d286ed5cf36bf6826ff55b0301d2b57 SHA512 9a6a4d1b00e69d31cb81767b3ac42fe0ca508b8e134a67497d7a09e700ad95fd5d6b053c39ae0184b148e735655a26272aae33ceab2f228474b62d76175158cb DIST tavern-2.10.1.gh.tar.gz 239917 BLAKE2B 836f4940ba7b9a17455e757a7bdec578effc6753162d0ff0b05c46d293cad840924f3e8d66aac08553478d63eb0edb61ad39f53e4e36d9a7681bae303e71a614 SHA512 a09e55e2fa71d2601833137e51fc94cb8bd65086fc21e6c26055406a6be3dce44b57f89d91d7a766aa88c0b5b4214f28eeda69812f1f623ed60f45f57dcf2ded DIST tavern-2.9.3.gh.tar.gz 248368 BLAKE2B feccd1c8e50db6def318553186f0dbfc9643c3942e060bb1950305c4e93fac15550b06d7ba5c2c6008175ef5a701f211408da3607ffcf3429d5542c97029cc7b SHA512 525a0b3f2c63fe4a9991ace7e27287898cbcd423e915e9ff4585eb85e0e42f06e499f653b2615b3f98998206b48c6c8f42468fae174ca4d7e7a38bf171b6feda -EBUILD tavern-2.10.1.ebuild 1523 BLAKE2B 80bf33e5aca508d51c0fa7cd8288bdc85d1766bbad42752b9b80e34faccb87e4f683940114ca34704dd854809d56f25c988c9ff68b5f127fcc736f3266002668 SHA512 cd9a018d27fbd42f3ece8a63d8f7d97deacda88d5c938406397b23d15708b88a9332cc2aff5b2ab26b3646ebeb91c2771ab904115aac82ffc00f301b6cb5f381 +EBUILD tavern-2.10.1.ebuild 1633 BLAKE2B 610e8b5c4462a83e929e700d5d05743c7b76de3f8f2d1bd5643dea2432f82668bb21ea28b3654332e640a1363e2f73d12a964fe1af316cf46eb7c3db772bcbad SHA512 b9b10bf54ec06003f7b4998b1621cea35b928ee06642ea00131c7ced00eb88c6926ea53423f6fd29279452f13c86b4306699b4eb611a6cbb2c02ee5ad65ab7b7 EBUILD tavern-2.9.3.ebuild 1522 BLAKE2B 35435e33ab4b99389e05bb9676810021d553d8cd5743bfd6971ed944e4217c36aebcb701a706370fa296b2e3f06a506cd8e1101a25d48072c25711f81308785d SHA512 805f21a2fd46a59d2730f5267c35f26a0eb7108054946754b864607364da8743b85da339b1d0ccc8cd3cd54b4c5514a1387b9dfae4c089752f3edc45d7fbd3bd MISC metadata.xml 567 BLAKE2B ea43aa37a078962133a772cb2d283a20b521d17dc7d501fd2d7bad8228e47049e0a9924542b7434d9624d28a9bbc5e43df872462740187d0f4e22f94a5d56469 SHA512 10de2ac011f427eee5eaa897e23198495bd1fa093addf2015830383344f375c9faf660bb7e9e4385995e7ded02f7d954d5d34ca67c88dd00ae517415b8470c92 diff --git a/dev-python/tavern/files/tavern-2.10.1-pytest-8.patch b/dev-python/tavern/files/tavern-2.10.1-pytest-8.patch new file mode 100644 index 000000000000..6820164b50e1 --- /dev/null +++ b/dev-python/tavern/files/tavern-2.10.1-pytest-8.patch @@ -0,0 +1,36 @@ +From 3aa8cc92e474e91c2a4014b4b4ec2f1e4b2e620a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Thu, 28 Mar 2024 13:20:00 +0100 +Subject: [PATCH] Replace deprecated `pytest.warns(None)` + +Replace the deprecated `pytest.warns(None)` use with the `error` warning +filter, as recommended +in https://github.com/pytest-dev/pytest/issues/9404#issue-1076710891. +With this change, the tests pass with pytest-8.1.1. +--- + tests/unit/test_call_run.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/unit/test_call_run.py b/tests/unit/test_call_run.py +index 30972c1a..88a72714 100644 +--- a/tests/unit/test_call_run.py ++++ b/tests/unit/test_call_run.py +@@ -1,3 +1,4 @@ ++import warnings + from unittest.mock import patch + + import pytest +@@ -35,11 +36,10 @@ def test_run_with_cfg(self): + ) + def test_doesnt_warn_about_expected_kwargs(self, expected_kwarg): + kw = {expected_kwarg: 123} +- with pytest.warns(None) as warn_rec: ++ with warnings.catch_warnings(): ++ warnings.simplefilter("error") + run("", **kw) + +- assert not len(warn_rec) +- + + class TestParseGlobalCfg: + def test_path_correct(self): diff --git a/dev-python/tavern/tavern-2.10.1.ebuild b/dev-python/tavern/tavern-2.10.1.ebuild index 74fcee9d1337..ee97b4e46bab 100644 --- a/dev-python/tavern/tavern-2.10.1.ebuild +++ b/dev-python/tavern/tavern-2.10.1.ebuild @@ -44,6 +44,11 @@ BDEPEND=" distutils_enable_tests pytest src_prepare() { + local PATCHES=( + # https://github.com/taverntesting/tavern/pull/922 + "${FILESDIR}/${P}-pytest-8.patch" + ) + # strip unnecessary pins, upstream doesn't update them a lot sed -i -E -e 's:,?<=?[0-9.]+::' pyproject.toml || die distutils-r1_src_prepare |