gentoo auto-resync : 24:02:2024 - 17:40:43

4 files changed, 2 insertions, 88 deletions

diff --git a/dev-python/betamax/Manifest b/dev-python/betamax/Manifest
index 0f26b7dfaede..d95071b2df5e 100644
--- a/dev-python/betamax/Manifest
+++ b/dev-python/betamax/Manifest
@@ -1,6 +1,3 @@
-AUX betamax-0.8.1-pytest.patch 1535 BLAKE2B b2a4d97fe2d1fad680e4037613bb3bcbe815902f79e975a768123a7017f53018cae0e18640a10d7fdf3afe59a33ea7ca02c9508f2341955ab9866c3f44411beb SHA512 258bd6729286dc9374829308c23cca73ea640c4597ca8747ebb8281bcf7723bba3dfee5b55cadff0459e8dc4511d85228d37911e981859dd0af55a3753ae9e22
-DIST betamax-0.8.1.tar.gz 77526 BLAKE2B 2ce88326c5ef80082908912c4b14f149793c4457c47446ebcabaaffaa6b0ee64528096acc6bdd868fce0fad3d10ad66697cad5dc422c15b324e1cc9ae20eafa6 SHA512 89bfb56cf4004a70ec8c1f2342cfa0e02f850b8ed80b67f8b2b02c1a2093e8ac1cf1b9980354551e9d3a21fadde0d77d717f1559487024941973cd80bd451734
 DIST betamax-0.9.0.tar.gz 79957 BLAKE2B fed287985207679587a0d2a2f38748fca87b7ec9516135c3e50bcfc5bd8035136b4edcac1e3af143cf2f32caa79b5c76e9a9f450d9488f06673aa4d672b09956 SHA512 a6b8f4d719dbfdc26b39f4cb16e33db1da85e01bceb871640d2778e7d830ef2d3bcd655aba6382136cb5cd66d8db1fa6ab04c942e5e185702337cd3dc8c1fa15
-EBUILD betamax-0.8.1-r2.ebuild 1337 BLAKE2B b319485b4cb31ea46c8034ec829810b18e97b8ad5eff6c29840b2a7faf69c5cca638c7b797e8bb63703eae554e2810e9085602d7eaa2692221ae6319e0be3417 SHA512 bcf1c2362f7698f0af448c6585dccfe99b7c9c2afa0cc35a1e3850f4c61228f43d3c306e8e768cae8f91ab83d543b4303b4fe87bbcead01d7111dbfc2d6e37f8
-EBUILD betamax-0.9.0.ebuild 1193 BLAKE2B df1dc98675988623141ef883714fd45fd2bb5f996a30763287a7cbb0c52bb2bb3e035b6ee533dae7bcbdf52b8694a5ce87e9433380a0f1d0ce107c14b2b52be1 SHA512 216e8c8c6f8d0baac29af86763e5319a8a44b451071bc379a3cfc648e3cfd5ffb7ca71c991d5295f1826123ff79a9bf2d64733e7198e8730c1a88c2f2bc9da41
+EBUILD betamax-0.9.0.ebuild 1185 BLAKE2B 68066c1eea358f00be8c900136dd37c240fd2ad43e9aa4f425f0ebe96db1012954e0459c7e2ff447d80670c2f25e429676d468afedeb5ef0d700e3761a7ec935 SHA512 54f55721cdff5001333a81af58a052e47f7d76b87860a1b9cd614947b7899b5bb90abd08fad6ae19491fcc09abf04c1c7f3348ec28fa9f4539af268932d9403f
 MISC metadata.xml 370 BLAKE2B 4f0af16a821f80679eafa4af335168fa7671db128f9e1902a0be9944bba630d8f4f9fa8f2638a10884a81dcf55b1357a9b0574a8f0df322e89e1f801fd71ffb7 SHA512 1b04127a85af3ba3d29833475fcbd5f013c62ab3e226d3df98091457f7039b893a2c5324e20c735d65e00f036641f7658665938e1d1434925656f07cc3b1aaff
diff --git a/dev-python/betamax/betamax-0.8.1-r2.ebuild b/dev-python/betamax/betamax-0.8.1-r2.ebuild
deleted file mode 100644
index 9aae04ce98e9..000000000000
--- a/dev-python/betamax/betamax-0.8.1-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="python-requests HTTP exchanges recorder"
-HOMEPAGE="
-	https://github.com/betamaxpy/betamax/
-	https://pypi.org/project/betamax/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-# urllib3-2 blocked by https://github.com/betamaxpy/betamax/issues/200
-RDEPEND="
-	dev-python/requests[${PYTHON_USEDEP}]
-	<dev-python/urllib3-2[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}/${P}-pytest.patch"
-)
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/integration/test_hooks.py
-	tests/integration/test_placeholders.py
-	tests/integration/test_record_modes.py::TestRecordOnce::test_records_new_interaction
-	tests/integration/test_record_modes.py::TestRecordOnce::test_replays_response_from_cassette
-	tests/integration/test_record_modes.py::TestRecordNewEpisodes
-	tests/integration/test_record_modes.py::TestRecordNewEpisodesCreatesCassettes
-	tests/integration/test_record_modes.py::TestRecordAll
-	tests/integration/test_unicode.py
-	tests/regression/test_gzip_compression.py
-	tests/regression/test_requests_2_11_body_matcher.py
-)
diff --git a/dev-python/betamax/betamax-0.9.0.ebuild b/dev-python/betamax/betamax-0.9.0.ebuild
index c37e339ebeda..b669857f9f9f 100644
--- a/dev-python/betamax/betamax-0.9.0.ebuild
+++ b/dev-python/betamax/betamax-0.9.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/betamax/files/betamax-0.8.1-pytest.patch b/dev-python/betamax/files/betamax-0.8.1-pytest.patch
deleted file mode 100644
index e3bfe39c81ca..000000000000
--- a/dev-python/betamax/files/betamax-0.8.1-pytest.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 165cc321f2b9839418269e9493b03eb2e43f7ddf Mon Sep 17 00:00:00 2001
-From: Jiri Kuncar <jiri.kuncar@gmail.com>
-Date: Mon, 9 Sep 2019 12:23:18 +0200
-Subject: [PATCH] tests: fix direct calls to PyTest fixtures
-
-https://docs.pytest.org/en/latest/deprecations.html#calling-fixtures-directly
----
- tests/unit/test_fixtures.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/unit/test_fixtures.py b/tests/unit/test_fixtures.py
-index 387d9ce..41f33eb 100644
---- a/tests/unit/test_fixtures.py
-+++ b/tests/unit/test_fixtures.py
-@@ -27,9 +27,9 @@ def test_adds_stop_as_a_finalizer(self):
-         # Mock a pytest request object
-         request = mock.MagicMock()
-         request.cls = request.module = None
--        request.function.__name__ = 'test'
-+        request.node.name = request.function.__name__ = 'test'
- 
--        pytest_fixture.betamax_recorder(request)
-+        pytest_fixture._betamax_recorder(request)
-         assert request.addfinalizer.called is True
-         request.addfinalizer.assert_called_once_with(self.mocked_betamax.stop)
- 
-@@ -37,9 +37,9 @@ def test_auto_starts_the_recorder(self):
-         # Mock a pytest request object
-         request = mock.MagicMock()
-         request.cls = request.module = None
--        request.function.__name__ = 'test'
-+        request.node.name = request.function.__name__ = 'test'
- 
--        pytest_fixture.betamax_recorder(request)
-+        pytest_fixture._betamax_recorder(request)
-         self.mocked_betamax.start.assert_called_once_with()
- 
-