Date: Monday, May 8, 2023 @ 15:02:58
  Author: yan12125
Revision: 1459456

upgpkg: buildbot 3.8.0-3; cherry-pick a PR to get rid of python-mock

See: https://github.com/buildbot/buildbot/pull/6780
See: https://archlinux.org/todo/drop-python-mock-checkdepends/

Modified:
  buildbot/trunk/PKGBUILD

----------+
 PKGBUILD |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-05-08 12:16:54 UTC (rev 1459455)
+++ PKGBUILD    2023-05-08 15:02:58 UTC (rev 1459456)
@@ -13,12 +13,12 @@
 # https://github.com/buildbot/buildbot/releases
 pkgver=3.8.0
 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
-pkgrel=2
+pkgrel=3
 arch=(any)
 url='https://buildbot.net'
 license=(GPL2)
 checkdepends=(python-boto3 python-ldap3 python-lz4 python-treq 
python-txrequests
-              python-moto python-docker python-parameterized python-mock 
python-subunit
+              python-moto python-docker python-parameterized python-subunit
               python-unidiff python-psutil python-ruamel-yaml
               openssh chromium)
 makedepends=(python-twisted python-jinja python-msgpack python-zope-interface 
python-sqlalchemy
@@ -32,11 +32,13 @@
              git yarn)
 
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-contrib-systemd-common.patch::https://github.com/buildbot/buildbot-contrib/pull/22.patch";
+        
"buildbot-unittest-mock.patch::https://github.com/buildbot/buildbot/commit/c8d0eb3fa4150969ae546a80844e8c8c58529c7f.patch";)
 sha256sums=('48a35cc3f47552a94c6eb7543c3b25fe7ef2da052028057754402652c060a92c'
             'SKIP'
             'SKIP'
-            '896eede4c33a8574d7c29ac4a28cebbe3d7e850931a86e945328f8ea358195a9')
+            '896eede4c33a8574d7c29ac4a28cebbe3d7e850931a86e945328f8ea358195a9'
+            '7d37a1d712f050e9c62a30f23a574204595e78d45032a41dd86fe34ed0ddd4b7')
 validpgpkeys=(
   '390EB159056ED56F66AB1092AECD456B4D2531FC'  # Pierre Tardy 
<[email protected]> (@tardyp on GitHub)
   'FD0004A26EADFE43A4C3F249C6F7AE200374452D'  # Povilas Kanapickas 
<[email protected]> (@p12tic on GitHub)
@@ -68,6 +70,9 @@
   # in upstream CI and introduces extra deprecation warnings
   sed -r -i "s#warnings\\.filterwarnings\\('error'\\)##" 
master/buildbot/test/__init__.py
 
+  # https://github.com/buildbot/buildbot/pull/6780 (not merged yet)
+  patch -Np1 -i ../buildbot-unittest-mock.patch
+
   cd "$srcdir"/buildbot-contrib
   patch -Np1 -i ../buildbot-contrib-systemd-common.patch
 }

Reply via email to