commit: 52fe9d5cc59af1769e8db064d343a26a5fa862f5 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> AuthorDate: Tue Mar 13 20:31:14 2018 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> CommitDate: Tue Mar 13 23:56:34 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52fe9d5c
dev-util/buildbot: Version bump, update 9999 ebuild Package-Manager: Portage-2.3.13, Repoman-2.3.3 dev-util/buildbot/Manifest | 2 ++ ...{buildbot-9999.ebuild => buildbot-1.1.0.ebuild} | 20 ++++++++++++++---- dev-util/buildbot/buildbot-9999.ebuild | 8 ++++++-- .../files/disable-test_userpass_wait.patch | 24 ++++++++++++++++++++++ 4 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest index d2609b51e79..c02fff4cbb2 100644 --- a/dev-util/buildbot/Manifest +++ b/dev-util/buildbot/Manifest @@ -4,3 +4,5 @@ DIST buildbot-0.9.11.tar.gz 3096455 BLAKE2B 2582fd27e89fc684911926c272630bfdb3fb DIST buildbot-0.9.12.tar.gz 3057832 BLAKE2B 8e1748739bacc3c884f353b2a1c798575e3ce5f451a1711ecf88a7c7e517da86d2e791748d31468a2bb07369022e96cb568518b7a8ce1d9e1cece0b6ab77eec8 SHA512 62459918267297b31b2a6416f72794c7a4ebdcb60de04ece1681f6b8be9debf161716cc70ad843fd468b23e02c521c0a0783a5a1e119d75648e107691d6b908d DIST buildbot-0.9.13.tar.gz 3061713 BLAKE2B fac74d610bf0ff1cfeea1c59c46e95339d6b080725f6b01258921175b8036daeef23dfd3bf2a71fe838d43b9d7777e3a3141ff9cec0e1c7e609f21c53f51b91d SHA512 b1cf176d01e04bc219be8ffa787a857aec7bcfb930c3e9cabe0410fca60d826c35e74d277cd5764fcd3c6183ea5f19bae195c09ad401cdd948bda500789f2ade DIST buildbot-0.9.15.post1.tar.gz 3088947 BLAKE2B c9a0265d3df2a9ac01872fc7106b5b787334bd899a43fcdb6ad06aab5e0e8f1ddb4374bf5211f251f26985c3b11a0b981bdd23fb668ac1717af36443831648e6 SHA512 c5c72132fd8446fbb14467851063d192dbb817506163eacc3022d563698453c66706a895613ca1c17502dd25957b31f6409996497d2e7646ab2fdbb3fb55c31d +DIST buildbot-1.1.0.docs.tar.xz 23932 BLAKE2B 81da8b86bb269efd2cd3f9146f3d9b41d64b28fdd0c878708c323d040a7e773cd277a18c82b1ef3cb07759ba8aedbc604e1de84f6477205b1708c28b6e86831e SHA512 511d244ffd205989047b4514b164e194b30fe4e0513d3bda776fb4d7a1a5bf42d8b7f00540b88e427838ab43f45686a83e556687ab75ce55eae6b834426a8ef7 +DIST buildbot-1.1.0.tar.gz 3098781 BLAKE2B 5a4ba8b641765fd58c3b5e788fc20aa1fb6195655ce2d82929f0f62ff48d20672f21efe0c413387e583d095c3ffcee1055a287016fe87ec1f3eb6b0ccdefdccb SHA512 f850ba2cd93d54a8abc97503719f93f69dfdc3d03b519e2d05c02bdc11893529eb51d74b6584555689281aedb71c3aa6c23141cf5fbc68ae97e09f1c89b2c94c diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-1.1.0.ebuild similarity index 95% copy from dev-util/buildbot/buildbot-9999.ebuild copy to dev-util/buildbot/buildbot-1.1.0.ebuild index 4d20f12a6a2..8c8f64302bd 100644 --- a/dev-util/buildbot/buildbot-9999.ebuild +++ b/dev-util/buildbot/buildbot-1.1.0.ebuild @@ -15,7 +15,10 @@ MY_P="${PN}-${MY_PV}" DESCRIPTION="BuildBot build automation system" HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.python.org/pypi/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-1.1.0.docs.tar.xz +" LICENSE="GPL-2" SLOT="0" @@ -62,14 +65,12 @@ DEPEND="${RDEPEND} >=dev-python/docutils-0.8[${PYTHON_USEDEP}] <dev-python/docutils-0.13.0[${PYTHON_USEDEP}] dev-python/sphinx-jinja[${PYTHON_USEDEP}] - dev-python/ramlfications[${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}] @@ -83,6 +84,17 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} [[ ${PV} == *9999 ]] && S=${S}/master +PATCHES=( + "${FILESDIR}/Remove-distro-version-test.patch" + "${FILESDIR}/disable-test_userpass_wait.patch" +) + +src_unpack() { + unpack ${MY_P}.tar.gz + cd ${MY_P} + unpack buildbot-1.1.0.docs.tar.xz +} + pkg_setup() { enewuser buildbot @@ -130,7 +142,7 @@ src_install() { python_test() { distutils_install_for_testing - + export DISABLE_TEST=true esetup.py test || die "Tests failed under ${EPYTHON}" } diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild index 4d20f12a6a2..41609b45360 100644 --- a/dev-util/buildbot/buildbot-9999.ebuild +++ b/dev-util/buildbot/buildbot-9999.ebuild @@ -62,14 +62,12 @@ DEPEND="${RDEPEND} >=dev-python/docutils-0.8[${PYTHON_USEDEP}] <dev-python/docutils-0.13.0[${PYTHON_USEDEP}] dev-python/sphinx-jinja[${PYTHON_USEDEP}] - dev-python/ramlfications[${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}] @@ -83,6 +81,12 @@ DEPEND="${RDEPEND} 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 diff --git a/dev-util/buildbot/files/disable-test_userpass_wait.patch b/dev-util/buildbot/files/disable-test_userpass_wait.patch new file mode 100644 index 00000000000..e7b9d0a59e3 --- /dev/null +++ b/dev-util/buildbot/files/disable-test_userpass_wait.patch @@ -0,0 +1,24 @@ +From e24640e1043fe8914a2b86842645604a3d9e9698 Mon Sep 17 00:00:00 2001 +From: Brian Dolbec <brian.dol...@sony.com> +Date: Tue, 13 Mar 2018 19:59:13 +0000 +Subject: [PATCH] disable test-userpass-wait + +--- + master/buildbot/test/integration/test_try_client.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/buildbot/test/integration/test_try_client.py b/buildbot/test/integration/test_try_client.py +index 9bdc7a63a..48fcb1573 100644 +--- a/buildbot/test/integration/test_try_client.py ++++ b/buildbot/test/integration/test_try_client.py +@@ -142,6 +142,8 @@ class Schedulers(RunMasterBase, www.RequiresWwwMixin): + + @defer.inlineCallbacks + def test_userpass_wait(self): ++ if os.environ.get("DISABLE_TEST", False): ++ return + yield self.startMaster( + trysched.Try_Userpass('try', ['a'], 0, [('u', b'p')])) + yield self.runClient({ +-- +2.13.6