Date: Sunday, October 13, 2019 @ 14:44:56 Author: yan12125 Revision: 515315
buildbot: fix build * Add a workaround for incompatibility between automat and attrs [1]. Discovered by reproducible builds [2]. * Also fixes the vault secret provider name [3] [1] https://github.com/glyph/automat/issues/117 [2] https://tests.reproducible-builds.org/archlinux/community/buildbot/build1.log [3] https://github.com/buildbot/buildbot/issues/4510 Added: buildbot/trunk/buildbot-automat-117.diff Modified: buildbot/trunk/PKGBUILD ---------------------------+ PKGBUILD | 13 ++++++++++--- buildbot-automat-117.diff | 10 ++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-10-13 14:31:31 UTC (rev 515314) +++ PKGBUILD 2019-10-13 14:44:56 UTC (rev 515315) @@ -26,16 +26,23 @@ 'python-pyopenssl: to use SSL/TLS in mail or IRC notifiers' 'python-docker: for Docker latent worker' 'pass: to use SecretInPass provider' - 'vault: to use SecretInVault provider' + 'vault: to use HashiCorpVaultSecretProvider provider' ) -source=("https://github.com/buildbot/buildbot/releases/download/v$pkgver/buildbot-v$pkgver.gitarchive.tar.gz"{,.sig}) +source=("https://github.com/buildbot/buildbot/releases/download/v$pkgver/buildbot-v$pkgver.gitarchive.tar.gz"{,.sig} + $pkgname-automat-117.diff) sha256sums=('6237a4c61a6208324ca246b328ba01660fa40a40cce20430963b33901cd80672' - 'SKIP') + 'SKIP' + '00587459a73af8faabcef08b80fd83270f22907238111abaa4edf57c80e992f3') validpgpkeys=( '390EB159056ED56F66AB1092AECD456B4D2531FC' # Pierre Tardy <[email protected]> (@tardyp on GitHub) 'FD0004A26EADFE43A4C3F249C6F7AE200374452D' # Povilas Kanapickas <[email protected]> (@p12tic on GitHub) ) +prepare() { + cd buildbot-$pkgver/master + patch -Np2 -i ../../$pkgname-automat-117.diff +} + build() { cd buildbot-$pkgver/master python setup.py build Added: buildbot-automat-117.diff =================================================================== --- buildbot-automat-117.diff (rev 0) +++ buildbot-automat-117.diff 2019-10-13 14:44:56 UTC (rev 515315) @@ -0,0 +1,10 @@ +--- buildbot/master/buildbot/test/__init__.py 2019-10-10 20:56:41.191340974 +0800 ++++ buildbot/master/buildbot/test/__init__.py 2019-10-10 20:57:49.008283272 +0800 +@@ -119,3 +119,7 @@ + + # sqlalchemy-migrate uses deprecated api from sqlalchemy https://review.openstack.org/#/c/648072/ + warnings.filterwarnings('ignore', ".*Engine.contextual_connect.*", DeprecationWarning) ++ ++# automat not fully compatible with attrs 19.2 yet ++# https://github.com/glyph/automat/issues/117 ++warnings.filterwarnings('ignore', ".*The usage of `cmp` is deprecated.*", DeprecationWarning)
