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

[Chih-Hsuan Yen]

    Date: Monday, November 25, 2019 @ 06:20:28
  Author: yan12125
Revision: 533195

upgpkg: buildbot 2.5.1-1

All patches are upstreamed [1][2]

[1] https://github.com/buildbot/buildbot/pull/5037
[2] https://github.com/buildbot/buildbot/pull/5063

Modified:
  buildbot/trunk/PKGBUILD
Deleted:
  buildbot/trunk/buildbot-automat-117.diff
  buildbot/trunk/buildbot-python38.diff

---------------------------+
 PKGBUILD                  |   20 +++++---------------
 buildbot-automat-117.diff |   10 ----------
 buildbot-python38.diff    |   38 --------------------------------------
 3 files changed, 5 insertions(+), 63 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-25 06:18:53 UTC (rev 533194)
+++ PKGBUILD	2019-11-25 06:20:28 UTC (rev 533195)
@@ -5,8 +5,8 @@
 
 pkgname=buildbot
 pkgdesc='The Continuous Integration Framework'
-pkgver=2.5.0
-pkgrel=2
+pkgver=2.5.1
+pkgrel=1
 arch=(any)
 url='https://buildbot.net'
 license=(GPL2)
@@ -28,24 +28,14 @@
   'pass: to use SecretInPass provider'
   'vault: to use HashiCorpVaultSecretProvider provider'
 )
-source=("https://github.com/buildbot/buildbot/releases/download/v$pkgver/buildbot-v$pkgver.gitarchive.tar.gz"{,.sig}
-        $pkgname-automat-117.diff
-        $pkgname-python38.diff)
-sha256sums=('b5af824031c2bac87a73cd580fe597b439c113352f3f5d8c8146afbbf077fc77'
-            'SKIP'
-            '00587459a73af8faabcef08b80fd83270f22907238111abaa4edf57c80e992f3'
-            'cb09b08ff40283b8931da446282e6e31f3a46b1912177d93c62ba4b6575e1654')
+source=("https://github.com/buildbot/buildbot/releases/download/v$pkgver/buildbot-v$pkgver.gitarchive.tar.gz"{,.sig})
+sha256sums=('cee691d3e04481ff5b5ad3514d7fe0d5e3971c0dd9a4f67640e7dae7af6826a5'
+            'SKIP')
 validpgpkeys=(
   '390EB159056ED56F66AB1092AECD456B4D2531FC'  # Pierre Tardy <tardyp at gmail.com> (@tardyp on GitHub)
   'FD0004A26EADFE43A4C3F249C6F7AE200374452D'  # Povilas Kanapickas <povilas at radix.lt> (@p12tic on GitHub)
 )
 
-prepare() {
-  cd buildbot-$pkgver/master
-  patch -Np2 -i ../../$pkgname-automat-117.diff
-  patch -Np2 -i ../../$pkgname-python38.diff
-}
-
 build() {
   cd buildbot-$pkgver/master
   python setup.py build

Deleted: buildbot-automat-117.diff
===================================================================
--- buildbot-automat-117.diff	2019-11-25 06:18:53 UTC (rev 533194)
+++ buildbot-automat-117.diff	2019-11-25 06:20:28 UTC (rev 533195)
@@ -1,10 +0,0 @@
---- 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)

Deleted: buildbot-python38.diff
===================================================================
--- buildbot-python38.diff	2019-11-25 06:18:53 UTC (rev 533194)
+++ buildbot-python38.diff	2019-11-25 06:20:28 UTC (rev 533195)
@@ -1,38 +0,0 @@
-diff --git a/master/buildbot/changes/bitbucket.py b/master/buildbot/changes/bitbucket.py
-index 8a3c2067d..5e8d43954 100644
---- a/master/buildbot/changes/bitbucket.py
-+++ b/master/buildbot/changes/bitbucket.py
-@@ -89,7 +89,7 @@ class BitbucketPullrequestPoller(base.PollingChangeSource):
- 
-     @defer.inlineCallbacks
-     def _processChanges(self, page):
--        result = json.loads(page, encoding=self.encoding)
-+        result = json.loads(page)
-         for pr in result['values']:
-             branch = pr['source']['branch']['name']
-             nr = int(pr['id'])
-@@ -106,7 +106,7 @@ class BitbucketPullrequestPoller(base.PollingChangeSource):
-                 if not current or current[0:12] != revision[0:12]:
-                     # parse pull request api page (required for the filter)
-                     page = yield client.getPage(str(pr['links']['self']['href']))
--                    pr_json = json.loads(page, encoding=self.encoding)
-+                    pr_json = json.loads(page)
- 
-                     # filter pull requests by user function
-                     if not self.pullrequest_filter(pr_json):
-@@ -127,13 +127,13 @@ class BitbucketPullrequestPoller(base.PollingChangeSource):
-                     title = pr['title']
-                     # parse commit api page
-                     page = yield client.getPage(str(pr['source']['commit']['links']['self']['href']))
--                    commit_json = json.loads(page, encoding=self.encoding)
-+                    commit_json = json.loads(page)
-                     # use the full-length hash from now on
-                     revision = commit_json['hash']
-                     revlink = commit_json['links']['html']['href']
-                     # parse repo api page
-                     page = yield client.getPage(str(pr['source']['repository']['links']['self']['href']))
--                    repo_json = json.loads(page, encoding=self.encoding)
-+                    repo_json = json.loads(page)
-                     repo = repo_json['links']['html']['href']
- 
-                     # update database