diff --git a/dev-python/tavern/Manifest b/dev-python/tavern/Manifest index ae307dbd49df..41764972aead 100644 --- a/dev-python/tavern/Manifest +++ b/dev-python/tavern/Manifest @@ -1,2 +1 @@ -DIST tavern-2.10.3.gh.tar.gz 240386 BLAKE2B eb01cdabb171de101784c4fecf99c59fad892e9819e4b047e9d6f30a27b742ac49eb1840a66225466f2de09f8e0883941de92a4051898fe479e35ee06151a0d4 SHA512 e27da0da1d9eb8302ba34191bb9e157a28335c90012569218709f65b761c2f01d47c2e60a4a72df320cb7a2575ee3e890c3dc37027fb91fc90d97305d2afe277 DIST tavern-2.11.0.gh.tar.gz 233387 BLAKE2B b1b26e7d9fc4069c7056072ab01c9937245304982f78df236e9bcaa795feec6a1db7192532dba6d17d362af874bffce601bb9652b5f1ecda99c59387f717bb15 SHA512 456fa6ebfc6f47ff9a473e3f416aff9f88b1f9b25c898786d15472072859e1659c089a9c668e6ddc4ecfc0cc8c233417d4768e0f7228800995509a5a34294faf 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 deleted file mode 100644 index 6820164b50e1..000000000000 --- a/dev-python/tavern/files/tavern-2.10.1-pytest-8.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3aa8cc92e474e91c2a4014b4b4ec2f1e4b2e620a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -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.3.ebuild b/dev-python/tavern/tavern-2.10.3.ebuild deleted file mode 100644 index d1864eb7d4d0..000000000000 --- a/dev-python/tavern/tavern-2.10.3.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=flit -PYTHON_COMPAT=( python3_{10..12} ) - -inherit distutils-r1 - -DESCRIPTION="A tool, library, and Pytest plugin for testing RESTful APIs" -HOMEPAGE=" - https://github.com/taverntesting/tavern/ - https://pypi.org/project/tavern/ -" -SRC_URI=" - https://github.com/taverntesting/tavern/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64" - -RDEPEND=" - >=dev-python/jmespath-1[${PYTHON_USEDEP}] - >=dev-python/jsonschema-4[${PYTHON_USEDEP}] - =dev-python/paho-mqtt-1.3.1[${PYTHON_USEDEP}] - >=dev-python/pyjwt-2.5.0[${PYTHON_USEDEP}] - >=dev-python/pykwalify-1.8.0[${PYTHON_USEDEP}] - >=dev-python/pytest-7[${PYTHON_USEDEP}] - >=dev-python/python-box-6[${PYTHON_USEDEP}] - >=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}] - >=dev-python/requests-2.22.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-4[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/colorlog[${PYTHON_USEDEP}] - dev-python/Faker[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -src_prepare() { - local PATCHES=( - # https://github.com/taverntesting/tavern/pull/922 - "${FILESDIR}/${PN}-2.10.1-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 -} - -python_test() { - local EPYTEST_DESELECT=( - # requires grpc - tests/unit/test_extensions.py::TestGrpcCodes - ) - local EPYTEST_IGNORE=( - # require grpc* - tavern/_plugins/grpc - tests/unit/tavern_grpc - ) - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -p tavern -}