[gentoo-commits] repo/gentoo:master commit in: dev-python/tavern/files/, dev-python/tavern/

[gentoo-commits] repo/gentoo:master commit in: dev-python/tavern/files/, dev-python/tavern/

[Michał Górny]

commit:     f5f8d972823e6dbbc3062e8f9a744035951d7b87
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 08:08:29 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 08:08:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5f8d972

dev-python/tavern: Enable py3.12

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/tavern/files/tavern-2.6.0-py312.patch | 38 ++++++++++++++++++++++++
 dev-python/tavern/tavern-2.6.0.ebuild            |  7 ++++-
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/dev-python/tavern/files/tavern-2.6.0-py312.patch b/dev-python/tavern/files/tavern-2.6.0-py312.patch
new file mode 100644
index 000000000000..679b0c9d2358
--- /dev/null
+++ b/dev-python/tavern/files/tavern-2.6.0-py312.patch
@@ -0,0 +1,38 @@
+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
index a8c32af99f98..0f7c20bb2375 100644
--- a/dev-python/tavern/tavern-2.6.0.ebuild
+++ b/dev-python/tavern/tavern-2.6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1
 
@@ -44,11 +44,16 @@ BDEPEND="
 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
 }

[gentoo-commits] repo/gentoo:master commit in: dev-python/tavern/files/, dev-python/tavern/

[Michał Górny]

commit:     f4742bcf86be2a2a44a192f22730d3a8430e3649
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 13 09:51:42 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 10:04:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4742bcf

dev-python/tavern: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/tavern/Manifest                       |  1 -
 dev-python/tavern/files/tavern-2.6.0-py312.patch | 38 ---------------
 dev-python/tavern/tavern-2.6.0.ebuild            | 59 ------------------------
 3 files changed, 98 deletions(-)

diff --git a/dev-python/tavern/Manifest b/dev-python/tavern/Manifest
index 2ceb8d3aeb1b..55e2a543bd9f 100644
--- a/dev-python/tavern/Manifest
+++ b/dev-python/tavern/Manifest
@@ -1,2 +1 @@
-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

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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-python/tavern/files/, dev-python/tavern/

[Michał Górny]

commit:     9d50af73c819aaf6efc84a954dc8cb42a70bed8c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 12:23:51 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 12:26:51 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d50af73

dev-python/tavern: Fix test failures with pytest-8

Closes: https://bugs.gentoo.org/928007
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../tavern/files/tavern-2.10.1-pytest-8.patch      | 36 ++++++++++++++++++++++
 dev-python/tavern/tavern-2.10.1.ebuild             |  5 +++
 2 files changed, 41 insertions(+)

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