Gentoo Archives: gentoo-commits

From: Arthur Zamarin <arthurzam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot/
Date: Fri, 28 Jan 2022 11:16:45
Message-Id: 1643368582.c3db8784bc664093b78956f7e516277c831b5762.arthurzam@gentoo
1 commit: c3db8784bc664093b78956f7e516277c831b5762
2 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 28 11:15:30 2022 +0000
4 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 28 11:16:22 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3db8784
7
8 dev-util/buildbot: update live version
9
10 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
11
12 dev-util/buildbot/buildbot-9999.ebuild | 105 ++++++++++++---------------------
13 1 file changed, 38 insertions(+), 67 deletions(-)
14
15 diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
16 index dcf36e3727e7..f6d31286ded0 100644
17 --- a/dev-util/buildbot/buildbot-9999.ebuild
18 +++ b/dev-util/buildbot/buildbot-9999.ebuild
19 @@ -1,50 +1,42 @@
20 -# Copyright 1999-2021 Gentoo Authors
21 +# Copyright 1999-2022 Gentoo Authors
22 # Distributed under the terms of the GNU General Public License v2
23
24 -EAPI="7"
25 -PYTHON_REQ_USE="sqlite"
26 -PYTHON_COMPAT=( python3_{7,8,9} )
27 +EAPI=8
28
29 +PYTHON_REQ_USE="sqlite"
30 +PYTHON_COMPAT=( python3_{8..10} )
31 EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
32 -
33 -DISTUTILS_USE_SETUPTOOLS="rdepend"
34 -
35 -inherit git-r3
36 -inherit readme.gentoo-r1 systemd distutils-r1
37 -
38 -MY_PV="${PV/_p/.post}"
39 -MY_P="${PN}-${MY_PV}"
40 +inherit readme.gentoo-r1 git-r3 systemd distutils-r1
41
42 DESCRIPTION="BuildBot build automation system"
43 -HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
44 -[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
45 +HOMEPAGE="https://buildbot.net/
46 + https://github.com/buildbot/buildbot
47 + https://pypi.org/project/buildbot/"
48 +S="${S}/master"
49
50 LICENSE="GPL-2"
51 SLOT="0"
52 -KEYWORDS=""
53 -
54 -IUSE="crypt doc docker examples irc test"
55 +IUSE="crypt docker examples irc test"
56 RESTRICT="!test? ( test )"
57
58 RDEPEND="
59 acct-user/buildbot
60 - >=dev-python/jinja-2.1[${PYTHON_USEDEP}]
61 >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
62 - >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
63 + >=dev-python/jinja-2.1[${PYTHON_USEDEP}]
64 + >=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
65 >=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
66 - <dev-python/sqlalchemy-1.4.0[${PYTHON_USEDEP}]
67 - >=dev-python/sqlalchemy-migrate-0.13[${PYTHON_USEDEP}]
68 + <dev-python/sqlalchemy-1.5.0[${PYTHON_USEDEP}]
69 + >=dev-python/alembic-1.6.0[${PYTHON_USEDEP}]
70 >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
71 >=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
72 + >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
73 dev-python/pyjwt[${PYTHON_USEDEP}]
74 dev-python/pyyaml[${PYTHON_USEDEP}]
75 - dev-python/unidiff[${PYTHON_USEDEP}]
76 - >=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
77 ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
78 crypt? (
79 >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
80 - dev-python/idna[${PYTHON_USEDEP}]
81 dev-python/service_identity[${PYTHON_USEDEP}]
82 + dev-python/idna[${PYTHON_USEDEP}]
83 )
84 irc? (
85 dev-python/txrequests[${PYTHON_USEDEP}]
86 @@ -54,54 +46,38 @@ RDEPEND="
87 dev-python/requests[${PYTHON_USEDEP}]
88 )
89 "
90 -DEPEND="${RDEPEND}
91 - doc? (
92 - >=dev-python/sphinx-3.2.0[${PYTHON_USEDEP}]
93 - dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
94 - dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
95 - dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
96 - dev-python/pyenchant[${PYTHON_USEDEP}]
97 - dev-python/docutils[${PYTHON_USEDEP}]
98 - dev-python/sphinx-jinja[${PYTHON_USEDEP}]
99 - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
100 - )
101 +BDEPEND="
102 test? (
103 - dev-python/ldap3[${PYTHON_USEDEP}]
104 - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
105 - dev-python/moto[${PYTHON_USEDEP}]
106 + ${RDEPEND}
107 + dev-python/treq[${PYTHON_USEDEP}]
108 + dev-python/txrequests[${PYTHON_USEDEP}]
109 + dev-python/pypugjs[${PYTHON_USEDEP}]
110 >=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
111 + dev-python/moto[${PYTHON_USEDEP}]
112 + >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
113 dev-python/parameterized[${PYTHON_USEDEP}]
114 - dev-python/pypugjs[${PYTHON_USEDEP}]
115 - dev-python/txrequests[${PYTHON_USEDEP}]
116 dev-python/lz4[${PYTHON_USEDEP}]
117 - dev-python/treq[${PYTHON_USEDEP}]
118 - dev-python/setuptools_trial[${PYTHON_USEDEP}]
119 - dev-util/buildbot-pkg[${PYTHON_USEDEP}]
120 - dev-util/buildbot-worker[${PYTHON_USEDEP}]
121 - dev-util/buildbot-www[${PYTHON_USEDEP}]
122 + dev-python/ldap3[${PYTHON_USEDEP}]
123 + ~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
124 + ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
125 + ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
126 )"
127
128 -S=${S}/master
129 +DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
130 +to support starting buildbot through Gentoo's init system. To use this,
131 +execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
132 +The scripts can run as a different user if desired."
133
134 -distutils_enable_tests setup.py
135 +src_prepare() {
136 + # disable all warnings as errors
137 + sed -e "/warnings.filterwarnings('error')/d" -i buildbot/test/__init__.py || die
138
139 -pkg_setup() {
140 - DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
141 - to support starting buildbot through Gentoo's init system. To use this,
142 - execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
143 - The scripts can run as a different user if desired."
144 + distutils-r1_src_prepare
145 }
146
147 -src_compile() {
148 - distutils-r1_src_compile
149 -
150 - if use doc; then
151 - einfo "Generation of documentation"
152 - pushd docs > /dev/null || die
153 - #'man' target is currently broken
154 - emake html
155 - popd > /dev/null || die
156 - fi
157 +python_test() {
158 + distutils_install_for_testing
159 + "${EPYTHON}" -m twisted.trial buildbot || die "Tests failed with ${EPYTHON}"
160 }
161
162 src_install() {
163 @@ -109,11 +85,6 @@ src_install() {
164
165 doman docs/buildbot.1
166
167 - if use doc; then
168 - HTML_DOCS=( docs/_build/html/ )
169 - # TODO: install man pages
170 - fi
171 -
172 if use examples; then
173 insinto /usr/share/doc/${PF}
174 doins -r docs/examples