gentoo auto-resync : 13:01:2024 - 13:10:51

4 files changed, 3 insertions, 103 deletions

diff --git a/dev-python/tavern/Manifest b/dev-python/tavern/Manifest
index 6519afa6f921..106fa3f0e9b1 100644
--- a/dev-python/tavern/Manifest
+++ b/dev-python/tavern/Manifest
@@ -1,6 +1,3 @@
-AUX tavern-2.6.0-py312.patch 1704 BLAKE2B 9973ce4194c392e705be5bab9aa4b4919a5ce36855b9a51d5988eaf78fdee3b27fbf891cfd01135ef7bdc50dee91b6e6cccb308ee5687db04548d7d7a0eca033 SHA512 a0efcb2187ad760d59c67b9af8c00f3a7d6b74bc94fc1eeae132345ef90c6ac1b6404b766e8d912ca2f0ffc395e0dfaf6f14f190f761149a221c51ae71b53bd4
-DIST tavern-2.6.0.gh.tar.gz 217509 BLAKE2B 99d9990757930a45a86a914fcf656b63266266869542cbd9b59850c7d648f54993ad5f409f12d09fbb12383c7586ecaeed323b04b478d62c7331cf514faa970a SHA512 1165dcc41244259d2ef7f69370dd35a40a9411b2a5c05e5dae45fc413d88478cd49aa540175a4a65dcf7dcd0eb2ee06b4f97059eb5d69ed5684893a8d5e8fcdc
 DIST tavern-2.7.1.gh.tar.gz 220388 BLAKE2B 3e689ff0c29ddf2e53e018f86c79ea7e4e89e586d5f28b79c93263a10c4e7738fbf4c66df81fd55bc13a812223e538726f3f9b9f8bdbb94e7f043e90c70af2ce SHA512 de2822ec746c2ccb27a401c07bc5618539e4ad309e56437d0c66669612f48658fc352e42a0b4db94f9c183a159bbdcbeabdf30bebeac03c5f6a9f51bc7014b76
-EBUILD tavern-2.6.0.ebuild 1344 BLAKE2B c5c12decf33e36ddb238ffd59a7b361da6f743371eea1e32ac65c7feddcd42ad140155c7ebd4c875784b9ef8be0b7f8b515c86aa289e238cd062803c56d8c7c9 SHA512 bca73fde71fc2bc39d42bf55b5c090e2cd05982d5ba5ac24f55ebead81ac4c35fda2172f016ffa2b8f39f8b8b2e2ae4c7b7f83b1b8a2354e02b370dae7f9cdcf
-EBUILD tavern-2.7.1.ebuild 1335 BLAKE2B 76732da912cc455548baef44f02e1d770c66f631051d4a4e28df7ab9618df8a5e8912b0e13bba0c90af3ff950307c0c3a0f2eb90993624afcddaf7114889f292 SHA512 81e79272d2d0edbf0bcd6b885ca2d5d510b86d5adadbdeff1022637b524855e519ce794e24d501dc6ad999d2ad65e8a7a21e372538669766ccb5339a1d18adb1
+EBUILD tavern-2.7.1.ebuild 1334 BLAKE2B 7a289d1045c8f077e167aea5c61fec771473b1062264311e8d5e1962cd2aa5c3cb68e906380a4e3870deb38d7147b9ff7fe41289cbfb7a5e4a2d54fe28ebc778 SHA512 f60ed2ae2877a0aa2ed3b4edc7d3c84cd9661ea65fed501c33b3269148e91e266de8eab16222bcf8980f90dfd9d3096114b2bd973ba45f60ad9d53f12cc1d19f
 MISC metadata.xml 722 BLAKE2B 0ed7dd19f49aae7940de52b0df249979458b3950422e1089886929499d7a92d16a3a6e101b52313569900af6aec4e26388ae6d0673d5b1acef1e1615ed87d34a SHA512 3c30524ee5129700db664b5dab8635463ee17d4a45295583d79755c1f5b1dbba9ac611fcec3e9584028bfe96cf913f4f4b9d8da67a0e8ff6cde1ebedbf57c15a
diff --git a/dev-python/tavern/files/tavern-2.6.0-py312.patch b/dev-python/tavern/files/tavern-2.6.0-py312.patch
deleted file mode 100644
index 679b0c9d2358..000000000000
--- a/dev-python/tavern/files/tavern-2.6.0-py312.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 8c09a6f31d84904dcf411e50102ac1ad159e4dd9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 19 Nov 2023 08:56:20 +0100
-Subject: [PATCH] Fix assertion in TestCheckParseValues::test_warns_bad_type
-
-Fix the assertion in TestCheckParseValues::test_warns_bad_type
-to use `.assert_called_with()` rather than non-existing `.called_with()`
-method.  The latter is wrongly interpreted as calling a mocked method
-in Python < 3.12, and therefore does not test anything at all.  Starting
-with Python 3.12, it results in an error:
-
-    AttributeError: 'called_with' is not a valid assertion. Use a spec for the mock if 'called_with' is meant to be an attribute.
-
-Fixing the call also revealed that the assertion was incorrect, so I've
-updated it to match the current call.
----
- tests/unit/test_helpers.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/unit/test_helpers.py b/tests/unit/test_helpers.py
-index 0d3da1c4..19fddc08 100644
---- a/tests/unit/test_helpers.py
-+++ b/tests/unit/test_helpers.py
-@@ -300,10 +300,10 @@ def test_warns_bad_type(self, item):
-         with patch("tavern._core.dict_util.logger.warning") as wmock:
-             _check_and_format_values("{fd}", {"fd": item})
- 
--        assert wmock.called_with(
--            "Formatting 'fd' will result in it being coerced to a string (it is a {})".format(
--                type(item)
--            )
-+        wmock.assert_called_with(
-+            "Formatting '%s' will result in it being coerced to a string (it is a %s)",
-+            "fd",
-+            type(item),
-         )
- 
-     @pytest.mark.parametrize("item", [1, "a", 1.3, format_keys("{s}", {"s": 2})])
diff --git a/dev-python/tavern/tavern-2.6.0.ebuild b/dev-python/tavern/tavern-2.6.0.ebuild
deleted file mode 100644
index 68031898040d..000000000000
--- a/dev-python/tavern/tavern-2.6.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2023 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[${PYTHON_USEDEP}]
-	dev-python/paho-mqtt[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-2.6.0[${PYTHON_USEDEP}]
-	dev-python/pykwalify[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/python-box[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-6.0.1[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/stevedore[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/colorlog[${PYTHON_USEDEP}]
-		dev-python/Faker[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${P}-py312.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 -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	epytest -p tavern
-}
diff --git a/dev-python/tavern/tavern-2.7.1.ebuild b/dev-python/tavern/tavern-2.7.1.ebuild
index 0662caebc5c5..5d28504b612d 100644
--- a/dev-python/tavern/tavern-2.7.1.ebuild
+++ b/dev-python/tavern/tavern-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	>=dev-python/jmespath-1[${PYTHON_USEDEP}]