commit: bbf522036c56491af480f90d18d3a2fab5463ea0 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> AuthorDate: Mon Jun 1 18:29:26 2020 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> CommitDate: Mon Jun 1 22:57:29 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbf52203
dev-util/buildbot: Version bump, clean old, update 9999 Add 2.8.0 release. Optimize the release and 9999 ebuilds to fix a dependency issue in the live ebuild. Clean out the old vulnerable versions. gentoo-bug: https://bugs.gentoo.org/show_bug.cgi?id=711702 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org> dev-util/buildbot/Manifest | 5 +- dev-util/buildbot/buildbot-0.9.12-r1.ebuild | 180 -------------------- dev-util/buildbot/buildbot-1.1.2.ebuild | 185 --------------------- ...buildbot-1.3.0.ebuild => buildbot-2.8.0.ebuild} | 72 ++++---- dev-util/buildbot/buildbot-9999.ebuild | 25 +-- .../buildbot/files/buildbot-2.8.0.fakedb.patch | 10 ++ dev-util/buildbot/files/pypugjs-2.8.0.patch | 83 +++++++++ 7 files changed, 137 insertions(+), 423 deletions(-) diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest index 9bdfbaf4fd3..0b13398de21 100644 --- a/dev-util/buildbot/Manifest +++ b/dev-util/buildbot/Manifest @@ -1,4 +1,3 @@ -DIST buildbot-0.9.12.tar.gz 3057832 BLAKE2B 8e1748739bacc3c884f353b2a1c798575e3ce5f451a1711ecf88a7c7e517da86d2e791748d31468a2bb07369022e96cb568518b7a8ce1d9e1cece0b6ab77eec8 SHA512 62459918267297b31b2a6416f72794c7a4ebdcb60de04ece1681f6b8be9debf161716cc70ad843fd468b23e02c521c0a0783a5a1e119d75648e107691d6b908d -DIST buildbot-1.1.2.tar.gz 3101168 BLAKE2B 35ec56440014015850a69324d475c4ca9555ad90da85b26a7a43eca74f08361137021aec72ddca37cbb24f21519ebf45948e66214291f356b4a1fbada7c0b3b8 SHA512 14c28d6fae18a10d89d41509635188d881ac76e7b61758481a9afbb22eb384d7ab5080383242e5850af13bfe46877985a91036270c3c4fbf01eafee5b7699815 -DIST buildbot-1.3.0.tar.gz 3119185 BLAKE2B d366b83baad7e865481535a2462ceb222aadce6c90a6229e82a72bf86518b8ebb0624d8ac8b64867783d58b6e9033b942a1ccd31fd6664a2b527eac9f11ab852 SHA512 e5ecf3eafe428a188c2410d270ee9bd5afc39122e62d35747288cf85347368ab4a94190b4ff6fe687269dc19cc7b91d33be8d3e3b637741e421a2cbd83572830 DIST buildbot-2.7.0.tar.gz 3175050 BLAKE2B 0a41eccaa4ca8df6396455049e8c09a1b2fe6cde3072da7fd3715f2769015944e8880f41dbe6750dd7b26bd863fb82f8e8d8c6540f9e1bf3ea4378f11adc973d SHA512 9946fe0b1591d51e5136d9458526918e872174afee79b5f1c333823ef1d2ddae66f017e9b57e26a2451da7ca7672720f32544c606ce5652d0825fae563779669 +DIST buildbot-2.8.0-fakedb.tar.xz 16204 BLAKE2B 741676e2c9117b1ab174ce49747bdfcd07766ad3e471e308398dff476f167fd231b7772c2f02002cbafb27e2ef535242d84d5aa84f4bc8942d4d216b2d5bf1f6 SHA512 c2b00d8621b3a1e521f6c17e902ae331b606dda3d319187895f26629dbdaf50caefc5d49fb150fb780e682ae431515c7ded4950d62448e8a73b8efba821c0fa1 +DIST buildbot-2.8.0.tar.gz 3162882 BLAKE2B 19789f1fe9f572c978a1843a98cd01d752a614d89eb29f2de9db750808d1f96d7893b39d703f37cc0e81e022267c08603c86d59a5902d65194e236f7170d6b30 SHA512 18af8fe1bda6f7014f514bfd112ccf9837194c0e42cbdabaaa6c6202660670964421feff3e92e9dca4cf960f69a4bde9b3666287b54ef7e912284a0471dcc2b6 diff --git a/dev-util/buildbot/buildbot-0.9.12-r1.ebuild b/dev-util/buildbot/buildbot-0.9.12-r1.ebuild deleted file mode 100644 index c56a3675fcf..00000000000 --- a/dev-util/buildbot/buildbot-0.9.12-r1.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_6 ) - -EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"; - -[[ ${PV} == *9999 ]] && inherit git-r3 -inherit readme.gentoo-r1 user systemd distutils-r1 - -MY_PV="${PV/_p/p}" -MY_P="${PN}-${MY_PV}" - -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" - -LICENSE="GPL-2" -SLOT="0" -if [[ ${PV} == *9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~amd64" -fi - -IUSE="crypt examples irc test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/jinja-2.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}] - >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}] - dev-python/future[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] - >=dev-python/txaio-2.2.2[${PYTHON_USEDEP}] - dev-python/pyjwt[${PYTHON_USEDEP}] - >=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}] - ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] - crypt? ( - >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt] - >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] - dev-python/idna[${PYTHON_USEDEP}] - dev-python/service_identity[${PYTHON_USEDEP}] - ) - irc? ( - dev-python/txrequests[${PYTHON_USEDEP}] - ) -" -DEPEND="${RDEPEND} - >=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] - test? ( - >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - dev-python/moto[${PYTHON_USEDEP}] - dev-python/boto3[${PYTHON_USEDEP}] - dev-python/ramlfications[${PYTHON_USEDEP}] - dev-python/pyjade[${PYTHON_USEDEP}] - dev-python/txgithub[${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-worker-${PV}[${PYTHON_USEDEP}] - )" - -S=${WORKDIR}/${MY_P} -[[ ${PV} == *9999 ]] && S=${S}/master - -PATCHES=( - "${FILESDIR}/Remove-distro-version-test.patch" -) - -pkg_setup() { - enewuser buildbot - - 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." -} - -src_install() { - distutils-r1_src_install - - doman docs/buildbot.1 - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r docs/examples - fi - - newconfd "${FILESDIR}/buildmaster.confd" buildmaster - newinitd "${FILESDIR}/buildmaster.initd" buildmaster - systemd_dounit "${FILESDIR}/buildmaster.target" - systemd_newunit "${FILESDIR}/buildmaster_at.service" "[email protected]" - systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "[email protected]" - - readme.gentoo_create_doc -} - -python_test() { - distutils_install_for_testing - - esetup.py test || die "Tests failed under ${EPYTHON}" -} - -pkg_postinst() { - readme.gentoo_print_elog - - if [[ -n ${REPLACING_VERSIONS} ]]; then - ewarn - ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster" - ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file" - ewarn "is now the common base directory for all instances. If you are migrating from an older" - ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." - ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance." - ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" - ewarn " ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance" - ewarn " rc-update add buildmaster.myinstance default" - ewarn " /etc/init.d/buildmaster.myinstance start" - ewarn "Systems using systemd can do the following:" - ewarn " systemctl enable [email protected]" - ewarn " systemctl enable buildmaster.target" - ewarn " systemctl start buildmaster.target" - elog - elog "Upstream recommends the following when upgrading:" - elog "Each time you install a new version of Buildbot, you should run the" - elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters." - elog "This will add files and fix (or at least detect) incompatibilities between" - elog "your old config and the new code." - fi - elog - elog "In order to create a new instance of buildmaster, execute:" - elog " emerge --config =${CATEGORY}/${PF}" -} - -pkg_config() { - local buildmaster_path="/var/lib/buildmaster" - local log_path="/var/log/buildmaster" - - einfo "This will prepare a new buildmaster instance in ${buildmaster_path}." - einfo "Press Control-C to abort." - - einfo "Enter the name for the new instance: " - read instance_name - [[ -z "${instance_name}" ]] && die "Invalid instance name" - - local instance_path="${buildmaster_path}/${instance_name}" - local instance_log_path="${log_path}/${instance_name}" - - if [[ -e "${instance_path}" ]]; then - eerror "The instance with the specified name already exists:" - eerror "${instance_path}" - die "Instance already exists" - fi - - local buildbot="/usr/bin/buildbot" - if [[ ! -d "${buildmaster_path}" ]]; then - mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}" - fi - "${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed" - chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed" - mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \ - || die "Moving sample configuration failed" - ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \ - || die "Unable to create link to init file" - - if [[ ! -d "${instance_log_path}" ]]; then - mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" - fi - ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \ - || die "Unable to create link to log file" - - einfo "Successfully created a buildmaster instance at ${instance_path}." - einfo "To change the default settings edit the master.cfg file in this directory." -} diff --git a/dev-util/buildbot/buildbot-1.1.2.ebuild b/dev-util/buildbot/buildbot-1.1.2.ebuild deleted file mode 100644 index 38a9ae82e1e..00000000000 --- a/dev-util/buildbot/buildbot-1.1.2.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_6 ) - -EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"; - -[[ ${PV} == *9999 ]] && inherit git-r3 -inherit readme.gentoo-r1 user systemd distutils-r1 - -MY_PV="${PV/_p/.post}" -MY_P="${PN}-${MY_PV}" - -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" - -LICENSE="GPL-2" -SLOT="0" -if [[ ${PV} == *9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~amd64" -fi - -IUSE="crypt docker examples irc test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/jinja-2.1[${PYTHON_USEDEP}] - >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}] - >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}] - dev-python/future[${PYTHON_USEDEP}] - >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] - >=dev-python/txaio-2.2.2[${PYTHON_USEDEP}] - dev-python/pyjwt[${PYTHON_USEDEP}] - >=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}] - ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] - crypt? ( - >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt] - >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] - dev-python/idna[${PYTHON_USEDEP}] - dev-python/service_identity[${PYTHON_USEDEP}] - ) - irc? ( - dev-python/txrequests[${PYTHON_USEDEP}] - ) - docker? ( - >=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}] - ) -" -DEPEND="${RDEPEND} - >=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] - test? ( - >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] - >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] - dev-python/moto[${PYTHON_USEDEP}] - dev-python/boto3[${PYTHON_USEDEP}] - dev-python/pyjade[${PYTHON_USEDEP}] - dev-python/txgithub[${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-worker-${PV}[${PYTHON_USEDEP}] - >=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}] - )" - -S=${WORKDIR}/${MY_P} -[[ ${PV} == *9999 ]] && S=${S}/master - -if [[ ${PV} != *9999 ]]; then - PATCHES=( - "${FILESDIR}/Remove-distro-version-test.patch" - ) -fi - -pkg_setup() { - enewuser buildbot - - 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." -} - -src_install() { - distutils-r1_src_install - - doman docs/buildbot.1 - - if use examples; then - insinto /usr/share/doc/${PF} - doins -r docs/examples - fi - - newconfd "${FILESDIR}/buildmaster.confd" buildmaster - newinitd "${FILESDIR}/buildmaster.initd" buildmaster - systemd_dounit "${FILESDIR}/buildmaster.target" - systemd_newunit "${FILESDIR}/buildmaster_at.service" "[email protected]" - systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "[email protected]" - - readme.gentoo_create_doc -} - -python_test() { - distutils_install_for_testing - - esetup.py test || die "Tests failed under ${EPYTHON}" -} - -pkg_postinst() { - readme.gentoo_print_elog - - if [[ -n ${REPLACING_VERSIONS} ]]; then - ewarn - ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster" - ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file" - ewarn "is now the common base directory for all instances. If you are migrating from an older" - ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." - ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance." - ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" - ewarn " ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance" - ewarn " rc-update add buildmaster.myinstance default" - ewarn " /etc/init.d/buildmaster.myinstance start" - ewarn "Systems using systemd can do the following:" - ewarn " systemctl enable [email protected]" - ewarn " systemctl enable buildmaster.target" - ewarn " systemctl start buildmaster.target" - elog - elog "Upstream recommends the following when upgrading:" - elog "Each time you install a new version of Buildbot, you should run the" - elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters." - elog "This will add files and fix (or at least detect) incompatibilities between" - elog "your old config and the new code." - fi - elog - elog "In order to create a new instance of buildmaster, execute:" - elog " emerge --config =${CATEGORY}/${PF}" -} - -pkg_config() { - local buildmaster_path="/var/lib/buildmaster" - local log_path="/var/log/buildmaster" - - einfo "This will prepare a new buildmaster instance in ${buildmaster_path}." - einfo "Press Control-C to abort." - - einfo "Enter the name for the new instance: " - read instance_name - [[ -z "${instance_name}" ]] && die "Invalid instance name" - - local instance_path="${buildmaster_path}/${instance_name}" - local instance_log_path="${log_path}/${instance_name}" - - if [[ -e "${instance_path}" ]]; then - eerror "The instance with the specified name already exists:" - eerror "${instance_path}" - die "Instance already exists" - fi - - local buildbot="/usr/bin/buildbot" - if [[ ! -d "${buildmaster_path}" ]]; then - mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}" - fi - "${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed" - chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed" - mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \ - || die "Moving sample configuration failed" - ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \ - || die "Unable to create link to init file" - - if [[ ! -d "${instance_log_path}" ]]; then - mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" - fi - ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \ - || die "Unable to create link to log file" - - einfo "Successfully created a buildmaster instance at ${instance_path}." - einfo "To change the default settings edit the master.cfg file in this directory." -} diff --git a/dev-util/buildbot/buildbot-1.3.0.ebuild b/dev-util/buildbot/buildbot-2.8.0.ebuild similarity index 81% rename from dev-util/buildbot/buildbot-1.3.0.ebuild rename to dev-util/buildbot/buildbot-2.8.0.ebuild index d59c41b23e9..1de7b0513a2 100644 --- a/dev-util/buildbot/buildbot-1.3.0.ebuild +++ b/dev-util/buildbot/buildbot-2.8.0.ebuild @@ -1,34 +1,32 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" PYTHON_REQ_USE="sqlite" -PYTHON_COMPAT=( python3_6 ) +PYTHON_COMPAT=( python3_{6,7,8} ) -EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"; +DISTUTILS_USE_SETUPTOOLS="rdepend" -[[ ${PV} == *9999 ]] && inherit git-r3 -inherit readme.gentoo-r1 user systemd distutils-r1 +inherit readme.gentoo-r1 systemd distutils-r1 MY_PV="${PV/_p/.post}" MY_P="${PN}-${MY_PV}" 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" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz + https://dev.gentoo.org/~dolsen/distfiles/buildbot-2.8.0-fakedb.tar.xz +" LICENSE="GPL-2" SLOT="0" -if [[ ${PV} == *9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~amd64 ~amd64-linux ~x86-linux" -fi +KEYWORDS="~amd64 ~amd64-linux ~x86-linux" IUSE="crypt doc 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}] >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] @@ -38,12 +36,13 @@ RDEPEND=" >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] >=dev-python/txaio-2.2.2[${PYTHON_USEDEP}] dev-python/pyjwt[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] >=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}] ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] crypt? ( >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt] >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] - dev-python/idna[${PYTHON_USEDEP}] + <dev-python/idna-2.9[${PYTHON_USEDEP}] dev-python/service_identity[${PYTHON_USEDEP}] ) irc? ( @@ -51,46 +50,51 @@ RDEPEND=" ) docker? ( >=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] ) " DEPEND="${RDEPEND} - >=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] doc? ( >=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}] + <dev-python/sphinx-2.1.0[${PYTHON_USEDEP}] dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}] dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}] dev-python/pyenchant[${PYTHON_USEDEP}] - >=dev-python/docutils-0.8[${PYTHON_USEDEP}] - <dev-python/docutils-0.13.0[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] dev-python/sphinx-jinja[${PYTHON_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] ) test? ( - >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] >=dev-python/mock-2.0.0[${PYTHON_USEDEP}] dev-python/moto[${PYTHON_USEDEP}] - dev-python/boto3[${PYTHON_USEDEP}] - dev-python/pyjade[${PYTHON_USEDEP}] - dev-python/txgithub[${PYTHON_USEDEP}] + >=dev-python/boto3-1.12.48[${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-${PV}[${PYTHON_USEDEP}] ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] - >=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}] + ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] + crypt? ( + >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt] + >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] + <dev-python/idna-2.9[${PYTHON_USEDEP}] + dev-python/service_identity[${PYTHON_USEDEP}] + ) )" S=${WORKDIR}/${MY_P} -[[ ${PV} == *9999 ]] && S=${S}/master -if [[ ${PV} != *9999 ]]; then - PATCHES=( - "${FILESDIR}/Remove-distro-version-test.patch" - ) -fi +PATCHES=( + "${FILESDIR}/pypugjs-2.8.0.patch" + "${FILESDIR}/buildbot-2.8.0.fakedb.patch" +) -pkg_setup() { - enewuser buildbot +distutils_enable_tests setup.py +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. @@ -115,7 +119,7 @@ src_install() { doman docs/buildbot.1 if use doc; then - dohtml -r docs/_build/html/ + HTML_DOCS=( docs/_build/html/ ) # TODO: install man pages fi @@ -133,12 +137,6 @@ src_install() { readme.gentoo_create_doc } -python_test() { - distutils_install_for_testing - - esetup.py test || die "Tests failed under ${EPYTHON}" -} - pkg_postinst() { readme.gentoo_print_elog @@ -194,7 +192,7 @@ pkg_config() { mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}" fi "${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed" - chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed" + chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed" mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \ || die "Moving sample configuration failed" ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \ @@ -202,6 +200,8 @@ pkg_config() { if [[ ! -d "${instance_log_path}" ]]; then mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" + chown --recursive buildbot:buildbot "${instance_log_path}" \ + || die "Setting permissions for instance failed" fi ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \ || die "Unable to create link to log file" diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild index 35a2e69c15e..25ce6693e4e 100644 --- a/dev-util/buildbot/buildbot-9999.ebuild +++ b/dev-util/buildbot/buildbot-9999.ebuild @@ -9,7 +9,7 @@ EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"; DISTUTILS_USE_SETUPTOOLS="rdepend" -[[ ${PV} == *9999 ]] && inherit git-r3 +inherit git-r3 inherit readme.gentoo-r1 systemd distutils-r1 MY_PV="${PV/_p/.post}" @@ -21,11 +21,7 @@ HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pyp LICENSE="GPL-2" SLOT="0" -if [[ ${PV} == *9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~amd64 ~amd64-linux ~x86-linux" -fi +KEYWORDS="" IUSE="crypt doc docker examples irc test" RESTRICT="!test? ( test )" @@ -79,9 +75,9 @@ DEPEND="${RDEPEND} dev-python/lz4[${PYTHON_USEDEP}] dev-python/treq[${PYTHON_USEDEP}] dev-python/setuptools_trial[${PYTHON_USEDEP}] - ~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}] - ~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}] + dev-util/buildbot-pkg[${PYTHON_USEDEP}] + dev-util/buildbot-worker[${PYTHON_USEDEP}] + dev-util/buildbot-www[${PYTHON_USEDEP}] crypt? ( >=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt] >=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}] @@ -89,17 +85,8 @@ DEPEND="${RDEPEND} dev-python/service_identity[${PYTHON_USEDEP}] ) )" -# >=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}] -S=${WORKDIR}/${MY_P} -[[ ${PV} == *9999 ]] && S=${S}/master - -if [[ ${PV} != *9999 ]]; then - PATCHES=( - "${FILESDIR}/Add-gentoo-to-the-VERSION_ID-check-exclusion.patch" - "${FILESDIR}/pypugjs.patch" - ) -fi +S=${S}/master distutils_enable_tests setup.py diff --git a/dev-util/buildbot/files/buildbot-2.8.0.fakedb.patch b/dev-util/buildbot/files/buildbot-2.8.0.fakedb.patch new file mode 100644 index 00000000000..2ce217b0d2e --- /dev/null +++ b/dev-util/buildbot/files/buildbot-2.8.0.fakedb.patch @@ -0,0 +1,10 @@ +--- a/setup.py 2020-06-01 15:14:03.169026527 -0700 ++++ b/setup.py 2020-06-01 15:17:38.619177059 -0700 +@@ -194,6 +194,7 @@ + "buildbot.test", + "buildbot.test.util", + "buildbot.test.fake", ++ "buildbot.test.fakedb", + "buildbot.test.fuzz", + "buildbot.test.integration", + "buildbot.test.integration.interop", diff --git a/dev-util/buildbot/files/pypugjs-2.8.0.patch b/dev-util/buildbot/files/pypugjs-2.8.0.patch new file mode 100644 index 00000000000..d34c6fac1af --- /dev/null +++ b/dev-util/buildbot/files/pypugjs-2.8.0.patch @@ -0,0 +1,83 @@ +From 26fefa8f8fa7b347e1c86723194de3a4094dc012 Mon Sep 17 00:00:00 2001 +From: Brian Dolbec <[email protected]> +Date: Sat, 25 Apr 2020 11:53:06 -0700 +Subject: [PATCH] Initial pyjade port to pypugjs + +--- + common/code_spelling_ignore_words.txt | 1 + + master/buildbot/test/unit/test_www_config.py | 8 ++++---- + master/buildbot/www/config.py | 10 +++++----- + master/docs/manual/configuration/www.rst | 10 ++++++---- + master/docs/spelling_wordlist.txt | 2 +- + master/setup.py | 4 ++-- + requirements-ci.txt | 2 +- + 7 files changed, 20 insertions(+), 17 deletions(-) + +diff --git a/buildbot/test/unit/test_www_config.py b/buildbot/test/unit/test_www_config.py +index 23a108e..a8c24ec 100644 +--- a/buildbot/test/unit/test_www_config.py ++++ b/buildbot/test/unit/test_www_config.py +@@ -107,10 +107,10 @@ class IndexResource(TestReactorMixin, www.WwwTestMixin, unittest.TestCase): + def test_parseCustomTemplateDir(self): + exp = {'views/builds.html': '<div>\n</div>'} + try: +- # we make the test work if pyjade is present or note +- # It is better than just skip if pyjade is not there +- import pyjade # pylint: disable=import-outside-toplevel +- [pyjade] ++ # we make the test work if pypugjs is present or note ++ # It is better than just skip if pypugjs is not there ++ import pypugjs # pylint: disable=import-outside-toplevel ++ [pypugjs] + exp.update({'plugin/views/plugin.html': + '<div class="myclass"><pre>this is customized</pre></div>'}) + except ImportError: +diff --git a/buildbot/www/config.py b/buildbot/www/config.py +index a021299..50bae4d 100644 +--- config.py 2020-02-27 13:34:10.000000000 -0800 ++++ config2.py 2020-05-11 17:26:44.587026761 -0700 +@@ -61,11 +61,11 @@ + res = {} + allowed_ext = [".html"] + try: +- import pyjade # pylint: disable=import-outside-toplevel ++ import pypugjs # pylint: disable=import-outside-toplevel + allowed_ext.append(".jade") + except ImportError: # pragma: no cover +- log.msg("pyjade not installed. Ignoring .jade files from {}".format(template_dir)) ++ log.msg("pypugjs not installed. Ignoring .jade files from {}".format(template_dir)) +- pyjade = None ++ pypugjs = None + for root, dirs, files in os.walk(template_dir): + if root == template_dir: + template_name = posixpath.join("views", "%s.html") +@@ -86,9 +86,9 @@ + elif ext == ".jade": + with open(fn) as f: + jade = f.read() +- parser = pyjade.parser.Parser(jade) ++ parser = pypugjs.parser.Parser(jade) + block = parser.parse() +- compiler = pyjade.ext.html.Compiler( ++ compiler = pypugjs.ext.html.Compiler( + block, pretty=False) + html = compiler.compile() + res[template_name % (basename,)] = html +diff --git a/setup.py b/master/setup.py +index 8fca506..1f32a74 100755 +--- a/setup.py ++++ b/setup.py +@@ -490,8 +490,8 @@ test_deps = [ + # http client libraries + 'treq', + 'txrequests', +- # pyjade required for custom templates tests +- 'pyjade', ++ # pypugjs required for custom templates tests ++ 'pypugjs', + # boto3 and moto required for running EC2 tests + 'boto3', + 'moto', +-- +libgit2 0.99.0 +
