From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 24105158089 for ; Fri, 28 Jan 2022 11:16:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 004322BC097; Fri, 28 Jan 2022 11:16:39 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C67F22BC093 for ; Fri, 28 Jan 2022 11:16:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DF570342DA7 for ; Fri, 28 Jan 2022 11:16:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0E01D2B3 for ; Fri, 28 Jan 2022 11:16:36 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1643368582.c3db8784bc664093b78956f7e516277c831b5762.arthurzam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/buildbot/buildbot-9999.ebuild X-VCS-Directories: dev-util/buildbot/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: c3db8784bc664093b78956f7e516277c831b5762 X-VCS-Branch: master Date: Fri, 28 Jan 2022 11:16:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: eadb1c69-5bef-416d-a3bc-5ce168c513ed X-Archives-Hash: 789e7dddd7b2fa460c1cc3eaf207ccf0 commit: c3db8784bc664093b78956f7e516277c831b5762 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Jan 28 11:15:30 2022 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Fri Jan 28 11:16:22 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3db8784 dev-util/buildbot: update live version Signed-off-by: Arthur Zamarin gentoo.org> dev-util/buildbot/buildbot-9999.ebuild | 105 ++++++++++++--------------------- 1 file changed, 38 insertions(+), 67 deletions(-) diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild index dcf36e3727e7..f6d31286ded0 100644 --- a/dev-util/buildbot/buildbot-9999.ebuild +++ b/dev-util/buildbot/buildbot-9999.ebuild @@ -1,50 +1,42 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_{7,8,9} ) +EAPI=8 +PYTHON_REQ_USE="sqlite" +PYTHON_COMPAT=( python3_{8..10} ) EGIT_REPO_URI="https://github.com/buildbot/${PN}.git" - -DISTUTILS_USE_SETUPTOOLS="rdepend" - -inherit git-r3 -inherit readme.gentoo-r1 systemd distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" +inherit readme.gentoo-r1 git-r3 systemd distutils-r1 DESCRIPTION="BuildBot build automation system" -HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/" -[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" +HOMEPAGE="https://buildbot.net/ + https://github.com/buildbot/buildbot + https://pypi.org/project/buildbot/" +S="${S}/master" LICENSE="GPL-2" SLOT="0" -KEYWORDS="" - -IUSE="crypt doc docker examples irc test" +IUSE="crypt docker examples irc test" RESTRICT="!test? ( test )" RDEPEND=" acct-user/buildbot - >=dev-python/jinja-2.1[${PYTHON_USEDEP}] >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?] - >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] + >=dev-python/jinja-2.1[${PYTHON_USEDEP}] + >=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}] >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}] - =dev-python/sqlalchemy-migrate-0.13[${PYTHON_USEDEP}] + =dev-python/alembic-1.6.0[${PYTHON_USEDEP}] >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] >=dev-python/txaio-2.2.2[${PYTHON_USEDEP}] + >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] dev-python/pyjwt[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/unidiff[${PYTHON_USEDEP}] - >=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}] ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] crypt? ( >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] - dev-python/idna[${PYTHON_USEDEP}] dev-python/service_identity[${PYTHON_USEDEP}] + dev-python/idna[${PYTHON_USEDEP}] ) irc? ( dev-python/txrequests[${PYTHON_USEDEP}] @@ -54,54 +46,38 @@ RDEPEND=" dev-python/requests[${PYTHON_USEDEP}] ) " -DEPEND="${RDEPEND} - doc? ( - >=dev-python/sphinx-3.2.0[${PYTHON_USEDEP}] - dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}] - dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}] - dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}] - dev-python/pyenchant[${PYTHON_USEDEP}] - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/sphinx-jinja[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - ) +BDEPEND=" test? ( - dev-python/ldap3[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - dev-python/moto[${PYTHON_USEDEP}] + ${RDEPEND} + dev-python/treq[${PYTHON_USEDEP}] + dev-python/txrequests[${PYTHON_USEDEP}] + dev-python/pypugjs[${PYTHON_USEDEP}] >=dev-python/boto3-1.12.48[${PYTHON_USEDEP}] + dev-python/moto[${PYTHON_USEDEP}] + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] dev-python/parameterized[${PYTHON_USEDEP}] - dev-python/pypugjs[${PYTHON_USEDEP}] - dev-python/txrequests[${PYTHON_USEDEP}] dev-python/lz4[${PYTHON_USEDEP}] - dev-python/treq[${PYTHON_USEDEP}] - dev-python/setuptools_trial[${PYTHON_USEDEP}] - dev-util/buildbot-pkg[${PYTHON_USEDEP}] - dev-util/buildbot-worker[${PYTHON_USEDEP}] - dev-util/buildbot-www[${PYTHON_USEDEP}] + dev-python/ldap3[${PYTHON_USEDEP}] + ~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}] + ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] + ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] )" -S=${S}/master +DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added +to support starting buildbot through Gentoo's init system. To use this, +execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance. +The scripts can run as a different user if desired." -distutils_enable_tests setup.py +src_prepare() { + # disable all warnings as errors + sed -e "/warnings.filterwarnings('error')/d" -i buildbot/test/__init__.py || die -pkg_setup() { - DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added - to support starting buildbot through Gentoo's init system. To use this, - execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance. - The scripts can run as a different user if desired." + distutils-r1_src_prepare } -src_compile() { - distutils-r1_src_compile - - if use doc; then - einfo "Generation of documentation" - pushd docs > /dev/null || die - #'man' target is currently broken - emake html - popd > /dev/null || die - fi +python_test() { + distutils_install_for_testing + "${EPYTHON}" -m twisted.trial buildbot || die "Tests failed with ${EPYTHON}" } src_install() { @@ -109,11 +85,6 @@ src_install() { doman docs/buildbot.1 - if use doc; then - HTML_DOCS=( docs/_build/html/ ) - # TODO: install man pages - fi - if use examples; then insinto /usr/share/doc/${PF} doins -r docs/examples