[patch] diff -3.9 > 3.10.1

buildbot-3.10.1.patch (text/plain), 2.72 KB, created by Magnus Granberg on 2023-12-28 13:00:13 UTC

--- buildbot-3.9.0.ebuild	2023-12-05 05:40:46.000000000 +0100
+++ buildbot-3.10.1.ebuild	2023-12-28 13:31:05.000000000 +0100
@@ -17,37 +17,41 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
 
-IUSE="crypt docker examples irc test"
+IUSE="crypt docker examples test"
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}/buildbot-${PV}-importlib.resources.patch"
+)
+
 RDEPEND="
 	acct-user/buildbot
 	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/alembic-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+	>=dev-python/alembic-1.11.3[${PYTHON_USEDEP}]
+	>=dev-python/autobahn-23.6.2[${PYTHON_USEDEP}]
+	dev-python/croniter[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
 	dev-python/pyjwt[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
 	<dev-python/sqlalchemy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
-	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-23.10.0[${PYTHON_USEDEP}]
+	>=dev-python/txaio-23.1.1[${PYTHON_USEDEP}]
+	dev-python/txrequests[${PYTHON_USEDEP}]
+	dev-python/unidiff[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-6.1[${PYTHON_USEDEP}]
 	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-23.3.0[${PYTHON_USEDEP}]
 		dev-python/service-identity[${PYTHON_USEDEP}]
 		|| (
-			>=dev-python/twisted-18.7.0[${PYTHON_USEDEP},ssl(-)]
-			>=dev-python/twisted-18.7.0[${PYTHON_USEDEP},crypt(-)]
+			>=dev-python/twisted-23.10.0[${PYTHON_USEDEP},ssl(-)]
+			>=dev-python/twisted-23.10.0[${PYTHON_USEDEP},crypt(-)]
 		)
 		dev-python/idna[${PYTHON_USEDEP}]
 	)
-	irc? (
-		dev-python/txrequests[${PYTHON_USEDEP}]
-	)
 	docker? (
-		>=dev-python/docker-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/docker-7.0.0[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 	)
 "
@@ -65,7 +69,6 @@ BDEPEND="
 		dev-python/parameterized[${PYTHON_USEDEP}]
 		dev-python/pypugjs[${PYTHON_USEDEP}]
 		dev-python/treq[${PYTHON_USEDEP}]
-		dev-python/txrequests[${PYTHON_USEDEP}]
 	)"
 
 DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
@@ -76,6 +79,9 @@ The scripts can	run as a different user
 src_prepare() {
 	# disable all warnings as errors
 	sed -e "/warnings.filterwarnings('error')/d" -i buildbot/test/__init__.py || die
+	# https://github.com/buildbot/buildbot/issues/6776
+	# https://bugs.gentoo.org/904062
+	rm buildbot/test/integration/test_try_client.py || die
 
 	distutils-r1_src_prepare
 }