Date: Monday, March 11, 2019 @ 07:36:46 Author: yan12125 Revision: 439693
upgpkg: buildbot 2.1.0-1 Added: buildbot/trunk/install-test-files.patch Modified: buildbot/trunk/PKGBUILD --------------------------+ PKGBUILD | 25 +++++++++++++++---------- install-test-files.patch | 13 +++++++++++++ 2 files changed, 28 insertions(+), 10 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-03-11 07:35:51 UTC (rev 439692) +++ PKGBUILD 2019-03-11 07:36:46 UTC (rev 439693) @@ -5,9 +5,7 @@ pkgname=buildbot pkgdesc='The Continuous Integration Framework' -pkgver=2.0.1 -# `git rev-parse v$pkgver` -_tag_rev=4c358c260bd9a339ce167a28b8dd6d19cd7a413f +pkgver=2.1.0 pkgrel=1 arch=(any) url='https://buildbot.net' @@ -15,9 +13,8 @@ depends=(python-twisted python-jinja python-zope-interface python-future python-sqlalchemy-migrate python-dateutil python-txaio python-autobahn python-pyjwt python-yaml) -makedepends=(git) checkdepends=(python-boto3 python-lz4 python-treq python-txrequests - python-mock python-moto + python-mock python-moto python-parameterized python-buildbot-pkg=$pkgver buildbot-worker=$pkgver python-buildbot-www=$pkgver python-pip openssh) optdepends=( @@ -27,19 +24,27 @@ 'python-txrequests: for using HTTP requests as steps' 'python-pyopenssl: to use SSL/TLS in mail or IRC notifiers' ) -source=("git+https://github.com/buildbot/buildbot?signed#tag=$_tag_rev") -sha256sums=('SKIP') +source=("https://github.com/buildbot/buildbot/releases/download/v$pkgver/buildbot-v$pkgver.gitarchive.tar.gz"{,.sig} + install-test-files.patch) +sha256sums=('a15491995d9168e8e50c2f958ce4bfef2984ca25dee21bd694c8ea0a12e47509' + 'SKIP' + 'b6c583a85555c8dc20a84a0402539dbadd854408a15d6424841e59a6daa47fe2') validpgpkeys=( '390EB159056ED56F66AB1092AECD456B4D2531FC' # Pierre Tardy <tar...@gmail.com> ) +prepare() { + cd buildbot-$pkgver + patch -Np1 -i ../install-test-files.patch +} + build() { - cd buildbot/master + cd buildbot-$pkgver/master python setup.py build } check() { - cd buildbot/master + cd buildbot-$pkgver/master # https://github.com/spulec/moto/issues/1924 export AWS_SECRET_ACCESS_KEY=foobar_secret @@ -53,6 +58,6 @@ } package() { - cd buildbot/master + cd buildbot-$pkgver/master python setup.py install --root="$pkgdir" --optimize=1 --skip-build } Added: install-test-files.patch =================================================================== --- install-test-files.patch (rev 0) +++ install-test-files.patch 2019-03-11 07:36:46 UTC (rev 439693) @@ -0,0 +1,13 @@ +diff --git a/master/setup.py b/master/setup.py +index c4172be5a..4a89ac895 100755 +--- a/master/setup.py ++++ b/master/setup.py +@@ -217,6 +217,8 @@ setup_args = { + include("buildbot/spec/types", "*.raml"), + include("buildbot/test/unit/test_templates_dir", "*.html"), + include("buildbot/test/unit/test_templates_dir/plugin", "*.*"), ++ include("buildbot/test/integration/pki", "*.*"), ++ include("buildbot/test/integration/pki/ca", "*.*"), + ] + include_statics("buildbot/www/static"), + 'cmdclass': {'install_data': install_data_twisted, + 'sdist': our_sdist},