[arch-commits] Commit in buildbot/repos (4 files)
Felix Yan
felixonmars at archlinux.org
Mon Nov 4 08:15:16 UTC 2019
Date: Monday, November 4, 2019 @ 08:15:16
Author: felixonmars
Revision: 523647
archrelease: copy trunk to community-staging-any
Added:
buildbot/repos/community-staging-any/
buildbot/repos/community-staging-any/PKGBUILD
(from rev 523646, buildbot/trunk/PKGBUILD)
buildbot/repos/community-staging-any/buildbot-automat-117.diff
(from rev 523646, buildbot/trunk/buildbot-automat-117.diff)
buildbot/repos/community-staging-any/buildbot-python38.diff
(from rev 523646, buildbot/trunk/buildbot-python38.diff)
---------------------------+
PKGBUILD | 71 ++++++++++++++++++++++++++++++++++++++++++++
buildbot-automat-117.diff | 10 ++++++
buildbot-python38.diff | 38 +++++++++++++++++++++++
3 files changed, 119 insertions(+)
Copied: buildbot/repos/community-staging-any/PKGBUILD (from rev 523646, buildbot/trunk/PKGBUILD)
===================================================================
--- community-staging-any/PKGBUILD (rev 0)
+++ community-staging-any/PKGBUILD 2019-11-04 08:15:16 UTC (rev 523647)
@@ -0,0 +1,71 @@
+# Maintainer: Chih-Hsuan Yen <yan12125 at gmail.com>
+# Contributor: xRemaLx <anton.komolov at gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=buildbot
+pkgdesc='The Continuous Integration Framework'
+pkgver=2.5.0
+pkgrel=2
+arch=(any)
+url='https://buildbot.net'
+license=(GPL2)
+depends=(python-twisted python-jinja python-zope-interface
+ python-sqlalchemy-migrate python-dateutil python-txaio
+ python-autobahn python-pyjwt python-yaml)
+checkdepends=(python-boto3 python-lz4 python-treq python-txrequests
+ python-mock python-moto python-parameterized
+ python-buildbot-pkg=$pkgver buildbot-worker=$pkgver python-buildbot-www=$pkgver
+ openssh git)
+makedepends=(python-setuptools)
+optdepends=(
+ 'python-boto3: for AWS EC2 latent worker'
+ 'python-lz4: to compress logs using lz4'
+ 'python-treq: for using HTTP requests as steps'
+ 'python-txrequests: for using HTTP requests as steps'
+ '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 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')
+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
+}
+
+check() {
+ cd buildbot-$pkgver/master
+
+ site_packages_path=$(python -c 'import site; print(site.getsitepackages()[0])')
+
+ python setup.py install --root="$srcdir"/tmp_install
+ # Copy files over for integration tests
+ cp -v buildbot/test/integration/*.tgz "$srcdir"/tmp_install$site_packages_path/buildbot/test/integration/
+
+ export PYTHONPATH="$srcdir"/tmp_install$site_packages_path
+ export PATH="$PATH:$srcdir/tmp_install/usr/bin"
+ TZ=UTC trial3 --rterrors buildbot
+}
+
+package() {
+ cd buildbot-$pkgver/master
+ python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+}
Copied: buildbot/repos/community-staging-any/buildbot-automat-117.diff (from rev 523646, buildbot/trunk/buildbot-automat-117.diff)
===================================================================
--- community-staging-any/buildbot-automat-117.diff (rev 0)
+++ community-staging-any/buildbot-automat-117.diff 2019-11-04 08:15:16 UTC (rev 523647)
@@ -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)
Copied: buildbot/repos/community-staging-any/buildbot-python38.diff (from rev 523646, buildbot/trunk/buildbot-python38.diff)
===================================================================
--- community-staging-any/buildbot-python38.diff (rev 0)
+++ community-staging-any/buildbot-python38.diff 2019-11-04 08:15:16 UTC (rev 523647)
@@ -0,0 +1,38 @@
+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
More information about the arch-commits
mailing list