[arch-commits] Commit in buildbot/trunk (PKGBUILD)

[Chih-Hsuan Yen]

    Date: Monday, May 16, 2022 @ 15:56:03
  Author: yan12125
Revision: 1207550

upgpkg: buildbot 3.5.0-3; backport a fix for autobahn 22.4.x compatibility [1]

Also fix the hack to get rid of test failures caused by warnings. This
time the warning is from cryptography 37.x, which is imported via
python-docker -> python-paramiko [2]

[1] https://github.com/buildbot/buildbot/pull/6509
[2] https://github.com/paramiko/paramiko/issues/2038

Modified:
  buildbot/trunk/PKGBUILD

----------+
 PKGBUILD |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-16 15:46:40 UTC (rev 1207549)
+++ PKGBUILD	2022-05-16 15:56:03 UTC (rev 1207550)
@@ -11,7 +11,7 @@
 # https://github.com/buildbot/buildbot/releases
 pkgver=3.5.0
 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
-pkgrel=2
+pkgrel=3
 arch=(any)
 url='https://buildbot.net'
 license=(GPL2)
@@ -30,6 +30,7 @@
 source=("https://github.com/buildbot/buildbot/releases/download/v$pkgver/buildbot-v$pkgver.gitarchive.tar.gz"{,.asc}
         "git+https://github.com/buildbot/buildbot-contrib.git#commit=$_bb_contrib_commit"
         "buildbot-contrib-systemd-common.patch::https://github.com/buildbot/buildbot-contrib/pull/22.patch"
+        "buildbot-autobahn-22.4.patch::https://github.com/buildbot/buildbot/commit/7d0cd447cd302d8f97e7ee13aa15721b7a3b6d8c.patch"
         "python310.diff"
         "graphql-core.diff")
 sha256sums=('53b58e056d7da5c83b669ce1bf213147beedba6fa6a60dadba3e80d385239ced'
@@ -36,6 +37,7 @@
             'SKIP'
             'SKIP'
             '896eede4c33a8574d7c29ac4a28cebbe3d7e850931a86e945328f8ea358195a9'
+            'e4902bca5d0098ed048d5a46edcc496c6260c5bd02394961bd6f8c47fbedda21'
             '79bff19ba26d9ae97a9fffbbd8b83b21dcfba0a933c908176562906cf7432813'
             '9ed4f9f18f71558afc876c92206e4de213fa6a94305ad9d4d9115a041dd41b22')
 validpgpkeys=(
@@ -63,7 +65,7 @@
 
   # Don't treat warnings as errors. Arch often ships newer Python libraries than ones
   # in upstream CI and introduces extra deprecation warnings
-  sed -i "s#warnings\\.filterwarnings\\('error'\\)##" master/buildbot/test/__init__.py
+  sed -r -i "s#warnings\\.filterwarnings\\('error'\\)##" master/buildbot/test/__init__.py
 
   # Fixes for Python 3.10 breakages:
   # https://github.com/python/cpython/pull/20236
@@ -72,6 +74,10 @@
   # Fix test failures with newer python-graphql-core
   patch -Np1 -i ../graphql-core.diff
 
+  # Backported from master branch "wamp: Remove unused config attribute to fix compat with new autobahn"
+  # https://github.com/buildbot/buildbot/pull/6509
+  patch -Np1 -i ../buildbot-autobahn-22.4.patch
+
   cd "$srcdir"/buildbot-contrib
   patch -Np1 -i ../buildbot-contrib-systemd-common.patch
 }