| 1 |
commit: ca2041cb54d4fd8c2af7461043cbc13f37fcfb65 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 8 17:34:17 2020 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 12 18:15:03 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca2041cb |
| 7 |
|
| 8 |
dev-util/buildbot: Version bump, adds python 3.7,3.8 |
| 9 |
|
| 10 |
metadata.xml: take maintainership |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 13 |
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-util/buildbot/Manifest | 1 + |
| 16 |
...{buildbot-9999.ebuild => buildbot-2.7.0.ebuild} | 47 ++++++------ |
| 17 |
dev-util/buildbot/buildbot-9999.ebuild | 47 ++++++------ |
| 18 |
...-gentoo-to-the-VERSION_ID-check-exclusion.patch | 26 +++++++ |
| 19 |
dev-util/buildbot/files/pypugjs.patch | 84 ++++++++++++++++++++++ |
| 20 |
dev-util/buildbot/metadata.xml | 5 +- |
| 21 |
6 files changed, 167 insertions(+), 43 deletions(-) |
| 22 |
|
| 23 |
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest |
| 24 |
index 945e3fa1b8a..9bdfbaf4fd3 100644 |
| 25 |
--- a/dev-util/buildbot/Manifest |
| 26 |
+++ b/dev-util/buildbot/Manifest |
| 27 |
@@ -1,3 +1,4 @@ |
| 28 |
DIST buildbot-0.9.12.tar.gz 3057832 BLAKE2B 8e1748739bacc3c884f353b2a1c798575e3ce5f451a1711ecf88a7c7e517da86d2e791748d31468a2bb07369022e96cb568518b7a8ce1d9e1cece0b6ab77eec8 SHA512 62459918267297b31b2a6416f72794c7a4ebdcb60de04ece1681f6b8be9debf161716cc70ad843fd468b23e02c521c0a0783a5a1e119d75648e107691d6b908d |
| 29 |
DIST buildbot-1.1.2.tar.gz 3101168 BLAKE2B 35ec56440014015850a69324d475c4ca9555ad90da85b26a7a43eca74f08361137021aec72ddca37cbb24f21519ebf45948e66214291f356b4a1fbada7c0b3b8 SHA512 14c28d6fae18a10d89d41509635188d881ac76e7b61758481a9afbb22eb384d7ab5080383242e5850af13bfe46877985a91036270c3c4fbf01eafee5b7699815 |
| 30 |
DIST buildbot-1.3.0.tar.gz 3119185 BLAKE2B d366b83baad7e865481535a2462ceb222aadce6c90a6229e82a72bf86518b8ebb0624d8ac8b64867783d58b6e9033b942a1ccd31fd6664a2b527eac9f11ab852 SHA512 e5ecf3eafe428a188c2410d270ee9bd5afc39122e62d35747288cf85347368ab4a94190b4ff6fe687269dc19cc7b91d33be8d3e3b637741e421a2cbd83572830 |
| 31 |
+DIST buildbot-2.7.0.tar.gz 3175050 BLAKE2B 0a41eccaa4ca8df6396455049e8c09a1b2fe6cde3072da7fd3715f2769015944e8880f41dbe6750dd7b26bd863fb82f8e8d8c6540f9e1bf3ea4378f11adc973d SHA512 9946fe0b1591d51e5136d9458526918e872174afee79b5f1c333823ef1d2ddae66f017e9b57e26a2451da7ca7672720f32544c606ce5652d0825fae563779669 |
| 32 |
|
| 33 |
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-2.7.0.ebuild |
| 34 |
similarity index 87% |
| 35 |
copy from dev-util/buildbot/buildbot-9999.ebuild |
| 36 |
copy to dev-util/buildbot/buildbot-2.7.0.ebuild |
| 37 |
index d59c41b23e9..38c6ccf3ffd 100644 |
| 38 |
--- a/dev-util/buildbot/buildbot-9999.ebuild |
| 39 |
+++ b/dev-util/buildbot/buildbot-2.7.0.ebuild |
| 40 |
@@ -1,14 +1,16 @@ |
| 41 |
# Copyright 1999-2020 Gentoo Authors |
| 42 |
# Distributed under the terms of the GNU General Public License v2 |
| 43 |
|
| 44 |
-EAPI="6" |
| 45 |
+EAPI="7" |
| 46 |
PYTHON_REQ_USE="sqlite" |
| 47 |
-PYTHON_COMPAT=( python3_6 ) |
| 48 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
| 49 |
|
| 50 |
EGIT_REPO_URI="https://github.com/buildbot/${PN}.git" |
| 51 |
|
| 52 |
+DISTUTILS_USE_SETUPTOOLS="rdepend" |
| 53 |
+ |
| 54 |
[[ ${PV} == *9999 ]] && inherit git-r3 |
| 55 |
-inherit readme.gentoo-r1 user systemd distutils-r1 |
| 56 |
+inherit readme.gentoo-r1 systemd distutils-r1 |
| 57 |
|
| 58 |
MY_PV="${PV/_p/.post}" |
| 59 |
MY_P="${PN}-${MY_PV}" |
| 60 |
@@ -29,6 +31,7 @@ IUSE="crypt doc docker examples irc test" |
| 61 |
RESTRICT="!test? ( test )" |
| 62 |
|
| 63 |
RDEPEND=" |
| 64 |
+ acct-user/buildbot |
| 65 |
>=dev-python/jinja-2.1[${PYTHON_USEDEP}] |
| 66 |
>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}] |
| 67 |
>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] |
| 68 |
@@ -38,12 +41,13 @@ RDEPEND=" |
| 69 |
>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] |
| 70 |
>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}] |
| 71 |
dev-python/pyjwt[${PYTHON_USEDEP}] |
| 72 |
+ dev-python/pyyaml[${PYTHON_USEDEP}] |
| 73 |
>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}] |
| 74 |
~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] |
| 75 |
crypt? ( |
| 76 |
>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt] |
| 77 |
>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] |
| 78 |
- dev-python/idna[${PYTHON_USEDEP}] |
| 79 |
+ <dev-python/idna-2.9[${PYTHON_USEDEP}] |
| 80 |
dev-python/service_identity[${PYTHON_USEDEP}] |
| 81 |
) |
| 82 |
irc? ( |
| 83 |
@@ -51,46 +55,53 @@ RDEPEND=" |
| 84 |
) |
| 85 |
docker? ( |
| 86 |
>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}] |
| 87 |
+ dev-python/requests[${PYTHON_USEDEP}] |
| 88 |
) |
| 89 |
" |
| 90 |
DEPEND="${RDEPEND} |
| 91 |
- >=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] |
| 92 |
doc? ( |
| 93 |
>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}] |
| 94 |
dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}] |
| 95 |
dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}] |
| 96 |
dev-python/pyenchant[${PYTHON_USEDEP}] |
| 97 |
- >=dev-python/docutils-0.8[${PYTHON_USEDEP}] |
| 98 |
- <dev-python/docutils-0.13.0[${PYTHON_USEDEP}] |
| 99 |
+ dev-python/docutils[${PYTHON_USEDEP}] |
| 100 |
dev-python/sphinx-jinja[${PYTHON_USEDEP}] |
| 101 |
) |
| 102 |
test? ( |
| 103 |
- >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] |
| 104 |
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}] |
| 105 |
dev-python/moto[${PYTHON_USEDEP}] |
| 106 |
- dev-python/boto3[${PYTHON_USEDEP}] |
| 107 |
- dev-python/pyjade[${PYTHON_USEDEP}] |
| 108 |
- dev-python/txgithub[${PYTHON_USEDEP}] |
| 109 |
+ >=dev-python/boto3-1.12.48[${PYTHON_USEDEP}] |
| 110 |
+ dev-python/parameterized[${PYTHON_USEDEP}] |
| 111 |
+ dev-python/pypugjs[${PYTHON_USEDEP}] |
| 112 |
dev-python/txrequests[${PYTHON_USEDEP}] |
| 113 |
dev-python/lz4[${PYTHON_USEDEP}] |
| 114 |
dev-python/treq[${PYTHON_USEDEP}] |
| 115 |
dev-python/setuptools_trial[${PYTHON_USEDEP}] |
| 116 |
+ ~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}] |
| 117 |
~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] |
| 118 |
- >=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}] |
| 119 |
+ ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] |
| 120 |
+ crypt? ( |
| 121 |
+ >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt] |
| 122 |
+ >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] |
| 123 |
+ <dev-python/idna-2.9[${PYTHON_USEDEP}] |
| 124 |
+ dev-python/service_identity[${PYTHON_USEDEP}] |
| 125 |
+ ) |
| 126 |
)" |
| 127 |
+# >=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}] |
| 128 |
|
| 129 |
S=${WORKDIR}/${MY_P} |
| 130 |
[[ ${PV} == *9999 ]] && S=${S}/master |
| 131 |
|
| 132 |
if [[ ${PV} != *9999 ]]; then |
| 133 |
PATCHES=( |
| 134 |
- "${FILESDIR}/Remove-distro-version-test.patch" |
| 135 |
+ "${FILESDIR}/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch" |
| 136 |
+ "${FILESDIR}/pypugjs.patch" |
| 137 |
) |
| 138 |
fi |
| 139 |
|
| 140 |
-pkg_setup() { |
| 141 |
- enewuser buildbot |
| 142 |
+distutils_enable_tests setup.py |
| 143 |
|
| 144 |
+pkg_setup() { |
| 145 |
DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added |
| 146 |
to support starting buildbot through Gentoo's init system. To use this, |
| 147 |
execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance. |
| 148 |
@@ -133,12 +144,6 @@ src_install() { |
| 149 |
readme.gentoo_create_doc |
| 150 |
} |
| 151 |
|
| 152 |
-python_test() { |
| 153 |
- distutils_install_for_testing |
| 154 |
- |
| 155 |
- esetup.py test || die "Tests failed under ${EPYTHON}" |
| 156 |
-} |
| 157 |
- |
| 158 |
pkg_postinst() { |
| 159 |
readme.gentoo_print_elog |
| 160 |
|
| 161 |
|
| 162 |
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild |
| 163 |
index d59c41b23e9..38c6ccf3ffd 100644 |
| 164 |
--- a/dev-util/buildbot/buildbot-9999.ebuild |
| 165 |
+++ b/dev-util/buildbot/buildbot-9999.ebuild |
| 166 |
@@ -1,14 +1,16 @@ |
| 167 |
# Copyright 1999-2020 Gentoo Authors |
| 168 |
# Distributed under the terms of the GNU General Public License v2 |
| 169 |
|
| 170 |
-EAPI="6" |
| 171 |
+EAPI="7" |
| 172 |
PYTHON_REQ_USE="sqlite" |
| 173 |
-PYTHON_COMPAT=( python3_6 ) |
| 174 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
| 175 |
|
| 176 |
EGIT_REPO_URI="https://github.com/buildbot/${PN}.git" |
| 177 |
|
| 178 |
+DISTUTILS_USE_SETUPTOOLS="rdepend" |
| 179 |
+ |
| 180 |
[[ ${PV} == *9999 ]] && inherit git-r3 |
| 181 |
-inherit readme.gentoo-r1 user systemd distutils-r1 |
| 182 |
+inherit readme.gentoo-r1 systemd distutils-r1 |
| 183 |
|
| 184 |
MY_PV="${PV/_p/.post}" |
| 185 |
MY_P="${PN}-${MY_PV}" |
| 186 |
@@ -29,6 +31,7 @@ IUSE="crypt doc docker examples irc test" |
| 187 |
RESTRICT="!test? ( test )" |
| 188 |
|
| 189 |
RDEPEND=" |
| 190 |
+ acct-user/buildbot |
| 191 |
>=dev-python/jinja-2.1[${PYTHON_USEDEP}] |
| 192 |
>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}] |
| 193 |
>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] |
| 194 |
@@ -38,12 +41,13 @@ RDEPEND=" |
| 195 |
>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] |
| 196 |
>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}] |
| 197 |
dev-python/pyjwt[${PYTHON_USEDEP}] |
| 198 |
+ dev-python/pyyaml[${PYTHON_USEDEP}] |
| 199 |
>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}] |
| 200 |
~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] |
| 201 |
crypt? ( |
| 202 |
>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt] |
| 203 |
>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] |
| 204 |
- dev-python/idna[${PYTHON_USEDEP}] |
| 205 |
+ <dev-python/idna-2.9[${PYTHON_USEDEP}] |
| 206 |
dev-python/service_identity[${PYTHON_USEDEP}] |
| 207 |
) |
| 208 |
irc? ( |
| 209 |
@@ -51,46 +55,53 @@ RDEPEND=" |
| 210 |
) |
| 211 |
docker? ( |
| 212 |
>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}] |
| 213 |
+ dev-python/requests[${PYTHON_USEDEP}] |
| 214 |
) |
| 215 |
" |
| 216 |
DEPEND="${RDEPEND} |
| 217 |
- >=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] |
| 218 |
doc? ( |
| 219 |
>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}] |
| 220 |
dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}] |
| 221 |
dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}] |
| 222 |
dev-python/pyenchant[${PYTHON_USEDEP}] |
| 223 |
- >=dev-python/docutils-0.8[${PYTHON_USEDEP}] |
| 224 |
- <dev-python/docutils-0.13.0[${PYTHON_USEDEP}] |
| 225 |
+ dev-python/docutils[${PYTHON_USEDEP}] |
| 226 |
dev-python/sphinx-jinja[${PYTHON_USEDEP}] |
| 227 |
) |
| 228 |
test? ( |
| 229 |
- >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] |
| 230 |
>=dev-python/mock-2.0.0[${PYTHON_USEDEP}] |
| 231 |
dev-python/moto[${PYTHON_USEDEP}] |
| 232 |
- dev-python/boto3[${PYTHON_USEDEP}] |
| 233 |
- dev-python/pyjade[${PYTHON_USEDEP}] |
| 234 |
- dev-python/txgithub[${PYTHON_USEDEP}] |
| 235 |
+ >=dev-python/boto3-1.12.48[${PYTHON_USEDEP}] |
| 236 |
+ dev-python/parameterized[${PYTHON_USEDEP}] |
| 237 |
+ dev-python/pypugjs[${PYTHON_USEDEP}] |
| 238 |
dev-python/txrequests[${PYTHON_USEDEP}] |
| 239 |
dev-python/lz4[${PYTHON_USEDEP}] |
| 240 |
dev-python/treq[${PYTHON_USEDEP}] |
| 241 |
dev-python/setuptools_trial[${PYTHON_USEDEP}] |
| 242 |
+ ~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}] |
| 243 |
~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] |
| 244 |
- >=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}] |
| 245 |
+ ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] |
| 246 |
+ crypt? ( |
| 247 |
+ >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt] |
| 248 |
+ >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] |
| 249 |
+ <dev-python/idna-2.9[${PYTHON_USEDEP}] |
| 250 |
+ dev-python/service_identity[${PYTHON_USEDEP}] |
| 251 |
+ ) |
| 252 |
)" |
| 253 |
+# >=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}] |
| 254 |
|
| 255 |
S=${WORKDIR}/${MY_P} |
| 256 |
[[ ${PV} == *9999 ]] && S=${S}/master |
| 257 |
|
| 258 |
if [[ ${PV} != *9999 ]]; then |
| 259 |
PATCHES=( |
| 260 |
- "${FILESDIR}/Remove-distro-version-test.patch" |
| 261 |
+ "${FILESDIR}/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch" |
| 262 |
+ "${FILESDIR}/pypugjs.patch" |
| 263 |
) |
| 264 |
fi |
| 265 |
|
| 266 |
-pkg_setup() { |
| 267 |
- enewuser buildbot |
| 268 |
+distutils_enable_tests setup.py |
| 269 |
|
| 270 |
+pkg_setup() { |
| 271 |
DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added |
| 272 |
to support starting buildbot through Gentoo's init system. To use this, |
| 273 |
execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance. |
| 274 |
@@ -133,12 +144,6 @@ src_install() { |
| 275 |
readme.gentoo_create_doc |
| 276 |
} |
| 277 |
|
| 278 |
-python_test() { |
| 279 |
- distutils_install_for_testing |
| 280 |
- |
| 281 |
- esetup.py test || die "Tests failed under ${EPYTHON}" |
| 282 |
-} |
| 283 |
- |
| 284 |
pkg_postinst() { |
| 285 |
readme.gentoo_print_elog |
| 286 |
|
| 287 |
|
| 288 |
diff --git a/dev-util/buildbot/files/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch b/dev-util/buildbot/files/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch |
| 289 |
new file mode 100644 |
| 290 |
index 00000000000..16fc0a133e1 |
| 291 |
--- /dev/null |
| 292 |
+++ b/dev-util/buildbot/files/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch |
| 293 |
@@ -0,0 +1,26 @@ |
| 294 |
+From f8d6fe39570a698d80d821a440219f5cd79d8314 Mon Sep 17 00:00:00 2001 |
| 295 |
+From: Brian Dolbec <dolsen@g.o> |
| 296 |
+Date: Tue, 5 Mar 2019 11:21:14 -0800 |
| 297 |
+Subject: [PATCH] test_buildbot_net_usage.py: Add "gentoo" to the VERSION_ID check exclusion |
| 298 |
+ |
| 299 |
+Make the exclusions test into a list (slight speed improvement, easier to extend) and add "gentoo". |
| 300 |
+ |
| 301 |
+Signed-off-by: Brian Dolbec <dolsen@g.o> |
| 302 |
+--- |
| 303 |
+ buildbot/test/unit/test_buildbot_net_usage_data.py | 2 +- |
| 304 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 305 |
+ |
| 306 |
+diff --git a/buildbot/test/unit/test_buildbot_net_usage_data.py b/buildbot/test/unit/test_buildbot_net_usage_data.py |
| 307 |
+index c347956..e422c55 100644 |
| 308 |
+--- a/buildbot/test/unit/test_buildbot_net_usage_data.py |
| 309 |
++++ b/buildbot/test/unit/test_buildbot_net_usage_data.py |
| 310 |
+@@ -150,5 +150,5 @@ class Tests(unittest.TestCase): |
| 311 |
+ self.assertEqual(len(distro), 2) |
| 312 |
+ self.assertNotIn("unknown", distro[0]) |
| 313 |
+ # Rolling distributions like Arch Linux (arch) does not have VERSION_ID |
| 314 |
+- if distro[0] != "arch": |
| 315 |
++ if distro[0] not in ["arch", "gentoo"]: |
| 316 |
+ self.assertNotIn("unknown", distro[1]) |
| 317 |
+-- |
| 318 |
+libgit2 0.99.0 |
| 319 |
+ |
| 320 |
|
| 321 |
diff --git a/dev-util/buildbot/files/pypugjs.patch b/dev-util/buildbot/files/pypugjs.patch |
| 322 |
new file mode 100644 |
| 323 |
index 00000000000..3ac99502b5d |
| 324 |
--- /dev/null |
| 325 |
+++ b/dev-util/buildbot/files/pypugjs.patch |
| 326 |
@@ -0,0 +1,84 @@ |
| 327 |
+From 26fefa8f8fa7b347e1c86723194de3a4094dc012 Mon Sep 17 00:00:00 2001 |
| 328 |
+From: Brian Dolbec <dolsen@g.o> |
| 329 |
+Date: Sat, 25 Apr 2020 11:53:06 -0700 |
| 330 |
+Subject: [PATCH] Initial pyjade port to pypugjs |
| 331 |
+ |
| 332 |
+--- |
| 333 |
+ common/code_spelling_ignore_words.txt | 1 + |
| 334 |
+ master/buildbot/test/unit/test_www_config.py | 8 ++++---- |
| 335 |
+ master/buildbot/www/config.py | 10 +++++----- |
| 336 |
+ master/docs/manual/configuration/www.rst | 10 ++++++---- |
| 337 |
+ master/docs/spelling_wordlist.txt | 2 +- |
| 338 |
+ master/setup.py | 4 ++-- |
| 339 |
+ requirements-ci.txt | 2 +- |
| 340 |
+ 7 files changed, 20 insertions(+), 17 deletions(-) |
| 341 |
+ |
| 342 |
+diff --git a/buildbot/test/unit/test_www_config.py b/buildbot/test/unit/test_www_config.py |
| 343 |
+index 23a108e..a8c24ec 100644 |
| 344 |
+--- a/buildbot/test/unit/test_www_config.py |
| 345 |
++++ b/buildbot/test/unit/test_www_config.py |
| 346 |
+@@ -107,10 +107,10 @@ class IndexResource(TestReactorMixin, www.WwwTestMixin, unittest.TestCase): |
| 347 |
+ def test_parseCustomTemplateDir(self): |
| 348 |
+ exp = {'views/builds.html': '<div>\n</div>'} |
| 349 |
+ try: |
| 350 |
+- # we make the test work if pyjade is present or note |
| 351 |
+- # It is better than just skip if pyjade is not there |
| 352 |
+- import pyjade # pylint: disable=import-outside-toplevel |
| 353 |
+- [pyjade] |
| 354 |
++ # we make the test work if pypugjs is present or note |
| 355 |
++ # It is better than just skip if pypugjs is not there |
| 356 |
++ import pypugjs # pylint: disable=import-outside-toplevel |
| 357 |
++ [pypugjs] |
| 358 |
+ exp.update({'plugin/views/plugin.html': |
| 359 |
+ '<div class="myclass"><pre>this is customized</pre></div>'}) |
| 360 |
+ except ImportError: |
| 361 |
+diff --git a/buildbot/www/config.py b/buildbot/www/config.py |
| 362 |
+index a021299..50bae4d 100644 |
| 363 |
+--- config.py 2020-02-27 13:34:10.000000000 -0800 |
| 364 |
++++ config2.py 2020-05-11 17:26:44.587026761 -0700 |
| 365 |
+@@ -61,12 +61,12 @@ |
| 366 |
+ res = {} |
| 367 |
+ allowed_ext = [".html"] |
| 368 |
+ try: |
| 369 |
+- import pyjade # pylint: disable=import-outside-toplevel |
| 370 |
++ import pypugjs # pylint: disable=import-outside-toplevel |
| 371 |
+ allowed_ext.append(".jade") |
| 372 |
+ except ImportError: # pragma: no cover |
| 373 |
+- log.msg("pyjade not installed. Ignoring .jade files from %s" % |
| 374 |
++ log.msg("pypugjs not installed. Ignoring .jade files from %s" % |
| 375 |
+ (template_dir,)) |
| 376 |
+- pyjade = None |
| 377 |
++ pypugjs = None |
| 378 |
+ for root, dirs, files in os.walk(template_dir): |
| 379 |
+ if root == template_dir: |
| 380 |
+ template_name = posixpath.join("views", "%s.html") |
| 381 |
+@@ -86,9 +86,9 @@ |
| 382 |
+ elif ext == ".jade": |
| 383 |
+ with open(fn) as f: |
| 384 |
+ jade = f.read() |
| 385 |
+- parser = pyjade.parser.Parser(jade) |
| 386 |
++ parser = pypugjs.parser.Parser(jade) |
| 387 |
+ block = parser.parse() |
| 388 |
+- compiler = pyjade.ext.html.Compiler( |
| 389 |
++ compiler = pypugjs.ext.html.Compiler( |
| 390 |
+ block, pretty=False) |
| 391 |
+ html = compiler.compile() |
| 392 |
+ res[template_name % (basename,)] = html |
| 393 |
+diff --git a/setup.py b/master/setup.py |
| 394 |
+index 8fca506..1f32a74 100755 |
| 395 |
+--- a/setup.py |
| 396 |
++++ b/setup.py |
| 397 |
+@@ -490,8 +490,8 @@ test_deps = [ |
| 398 |
+ # http client libraries |
| 399 |
+ 'treq', |
| 400 |
+ 'txrequests', |
| 401 |
+- # pyjade required for custom templates tests |
| 402 |
+- 'pyjade', |
| 403 |
++ # pypugjs required for custom templates tests |
| 404 |
++ 'pypugjs', |
| 405 |
+ # boto3 and moto required for running EC2 tests |
| 406 |
+ 'boto3', |
| 407 |
+ 'moto', |
| 408 |
+-- |
| 409 |
+libgit2 0.99.0 |
| 410 |
+ |
| 411 |
|
| 412 |
diff --git a/dev-util/buildbot/metadata.xml b/dev-util/buildbot/metadata.xml |
| 413 |
index 16f4ac623ef..45ebb49fa83 100644 |
| 414 |
--- a/dev-util/buildbot/metadata.xml |
| 415 |
+++ b/dev-util/buildbot/metadata.xml |
| 416 |
@@ -1,7 +1,10 @@ |
| 417 |
<?xml version="1.0" encoding="UTF-8"?> |
| 418 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 419 |
<pkgmetadata> |
| 420 |
- <!-- maintainer-needed --> |
| 421 |
+ <maintainer type="person"> |
| 422 |
+ <email>dolsen@g.o</email> |
| 423 |
+ <name>Brian Dolbec</name> |
| 424 |
+ </maintainer> |
| 425 |
<longdescription lang="en"> |
| 426 |
BuildBot is a system to automate the compile/test cycle required |
| 427 |
by most software projects to validate code changes. |
Archives