gentoo resync : 29.12.2022

3 files changed, 47 insertions, 5 deletions

diff --git a/dev-python/blinker/Manifest b/dev-python/blinker/Manifest
index 2b3ad722f948..57223dfb765f 100644
--- a/dev-python/blinker/Manifest
+++ b/dev-python/blinker/Manifest
@@ -1,3 +1,4 @@
+AUX blinker-1.4-pytest.patch 882 BLAKE2B 85cb6c2b7a3368f94b9c2df65b44bb070149a25b971050a50c9b310446878c1e4d8ff7acdb4f5cef4927af2ae219a83607ebaae204ef919b2ba41a4cd03c43f7 SHA512 95c786a217f97a4312620bd4c026fc2efe073e3ea9d7b601a848ba27a45c9e81e08cc356410e972d0d4de816e697ac591db62acfd2a51da2229f2039e6145383
 DIST blinker-1.4.tar.gz 111476 BLAKE2B a9ebe32bc01f7f08a5f180caa3d3830eaa10b7c0499c11ff4ceb71ed604f94dfbe4c783cc7409a57da28d6d69cc49d7861d05401802f86d054bdd2501f36cf60 SHA512 2f5f71b05c7cc27f5761ba698b05c78c8a491f5285c120e532d24be0c8256daa14e075f3f30e15fb18e7c3f16579af9378a155d058f170e3af9ffdb89e49f56e
-EBUILD blinker-1.4-r2.ebuild 662 BLAKE2B 7a6c381416eaef7a25b01ebdd4a583ed7d28c40d2934d4ca4c19dd2fcc0948d1ab01585209ea172aabe540525ef6308e85687b5b971972f5d1c05c28966f4553 SHA512 d7eb2ba5d5adb668b0bb5f933ff016e96216d59ea72cef7becbba5c0066963c006111ca9f77cd95d0255b349920043e491d65d5217482aeed04dea5fcbf08e93
+EBUILD blinker-1.4-r3.ebuild 837 BLAKE2B 7c6a6668fc8be813ff809877036b59c0c7ef77bfd44218b7dce18beb39807d878390ac73565b6038346ec02e9edd0694105e1ebb45151a6f51c8545d65ac51d6 SHA512 6a19a2a7b0c4b29d8dff93fdbfa65c9bc185c03694c6f00d6783331acaec6c13d65d140d152033215c6cf88b4013d25c7e1dd8f7085e3cf89ee4d4de8de97d52
 MISC metadata.xml 335 BLAKE2B d244e170c8fd902544dc485af737730e99c77bf4004f638054e20a2c4a40979c30bfbe0a4b6d8cd6aa3101f27b4eb2a2d7197d8541aa0944601f501557c44b8e SHA512 b43703a1475f0bf2b9b17c2c5e87a3e700a72974a6ac72ed037e39e01ab0ee406b6e522b63e38d84911acd75df4f7a4686f1c30ba8d5673f48b47434907fd502
diff --git a/dev-python/blinker/blinker-1.4-r2.ebuild b/dev-python/blinker/blinker-1.4-r3.ebuild
index d6b698db83f7..a7692210d62f 100644
--- a/dev-python/blinker/blinker-1.4-r2.ebuild
+++ b/dev-python/blinker/blinker-1.4-r3.ebuild
@@ -1,14 +1,19 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="Fast, simple object-to-object and broadcast signaling"
-HOMEPAGE="https://pythonhosted.org/blinker/ https://pypi.org/project/blinker/"
+HOMEPAGE="
+	https://pythonhosted.org/blinker/
+	https://github.com/pallets-eco/blinker/
+	https://pypi.org/project/blinker/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
@@ -16,7 +21,12 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
-distutils_enable_tests nose
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/pallets-eco/blinker/pull/60
+	"${FILESDIR}"/${P}-pytest.patch
+)
 
 python_install_all() {
 	use doc && HTML_DOCS=( docs/html/. )
diff --git a/dev-python/blinker/files/blinker-1.4-pytest.patch b/dev-python/blinker/files/blinker-1.4-pytest.patch
new file mode 100644
index 000000000000..e5c2b04998b5
--- /dev/null
+++ b/dev-python/blinker/files/blinker-1.4-pytest.patch
@@ -0,0 +1,31 @@
+From 8238e16c699ce7f99f5ff3f80d03d332d72015f8 Mon Sep 17 00:00:00 2001
+From: pgajdos <pgajdos@suse.cz>
+Date: Wed, 8 Jul 2020 15:22:19 +0200
+Subject: [PATCH] use pytest instead of deprecated nose
+
+---
+ tests/test_signals.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_signals.py b/tests/test_signals.py
+index 2d6a65a..e74db47 100644
+--- a/tests/test_signals.py
++++ b/tests/test_signals.py
+@@ -4,7 +4,7 @@
+ 
+ import blinker
+ 
+-from nose.tools import assert_raises
++import pytest
+ 
+ 
+ jython = sys.platform.startswith('java')
+@@ -227,7 +227,7 @@ def receiver(sender, **kw):
+         pass
+     sig = blinker.Signal()
+ 
+-    assert_raises(TypeError, sig.connect, receiver)
++    pytest.raises(TypeError, sig.connect, receiver)
+     assert not sig.receivers
+     assert not sig._by_receiver
+     assert sig._by_sender == {blinker.base.ANY_ID: set()}