[arch-commits] Commit in buildbot/repos/community-any (6 files)

Chih-Hsuan Yen yan12125 at gemini.archlinux.org
Mon May 16 15:56:22 UTC 2022


    Date: Monday, May 16, 2022 @ 15:56:21
  Author: yan12125
Revision: 1207551

archrelease: copy trunk to community-any

Added:
  buildbot/repos/community-any/PKGBUILD
    (from rev 1207550, buildbot/trunk/PKGBUILD)
  buildbot/repos/community-any/graphql-core.diff
    (from rev 1207550, buildbot/trunk/graphql-core.diff)
  buildbot/repos/community-any/python310.diff
    (from rev 1207550, buildbot/trunk/python310.diff)
Deleted:
  buildbot/repos/community-any/PKGBUILD
  buildbot/repos/community-any/graphql-core.diff
  buildbot/repos/community-any/python310.diff

-------------------+
 PKGBUILD          |  542 ++++++++++++++++++++++++++--------------------------
 graphql-core.diff |   48 ++--
 python310.diff    |   44 ++--
 3 files changed, 320 insertions(+), 314 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-16 15:56:03 UTC (rev 1207550)
+++ PKGBUILD	2022-05-16 15:56:21 UTC (rev 1207551)
@@ -1,268 +0,0 @@
-# Maintainer: Chih-Hsuan Yen <yan12125 at archlinux.org>
-# Contributor: xRemaLx <anton.komolov at gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgbase=buildbot
-pkgname=(buildbot buildbot-worker buildbot-docs buildbot-common
-         python-buildbot-www python-buildbot-waterfall-view
-         python-buildbot-console-view python-buildbot-grid-view
-         python-buildbot-wsgi-dashboards python-buildbot-badges)
-# https://github.com/buildbot/buildbot/releases
-pkgver=3.5.0
-_bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
-pkgrel=2
-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-unidiff python-psutil
-              openssh chromium)
-makedepends=(python-twisted python-jinja python-msgpack python-zope-interface python-sqlalchemy
-             python-alembic python-dateutil python-txaio
-             python-autobahn python-pyjwt python-yaml
-             python-graphql-core python-hvac
-             python-setuptools python-future
-             python-sphinx-jinja
-             python-sphinx_rtd_theme
-             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"
-        "python310.diff"
-        "graphql-core.diff")
-sha256sums=('53b58e056d7da5c83b669ce1bf213147beedba6fa6a60dadba3e80d385239ced'
-            'SKIP'
-            'SKIP'
-            '896eede4c33a8574d7c29ac4a28cebbe3d7e850931a86e945328f8ea358195a9'
-            '79bff19ba26d9ae97a9fffbbd8b83b21dcfba0a933c908176562906cf7432813'
-            '9ed4f9f18f71558afc876c92206e4de213fa6a94305ad9d4d9115a041dd41b22')
-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
-
-  # Some master tests use scripts from contrib
-  ln -s ../../buildbot-contrib/master/contrib master/contrib
-
-  # HACK: do not use virtualenv
-  sed -i -e 's#frontend_deps:.*#frontend_deps:#' Makefile
-
-  # HACK: Do not build JS again during install
-  # We take care about the command order manually
-  sed -i '/egg_info=EggInfoCommand/d' pkg/buildbot_pkg.py
-
-  sed -i '/buildbot_windows_service/d' master/setup.py
-  rm -v master/buildbot/scripts/windows_service.py
-  sed -i '/buildbot_worker_windows_service/d' worker/setup.py
-  rm -v worker/buildbot_worker/scripts/windows_service.py
-
-  # 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
-
-  # Fixes for Python 3.10 breakages:
-  # https://github.com/python/cpython/pull/20236
-  patch -Np1 -i ../python310.diff
-
-  # Fix test failures with newer python-graphql-core
-  patch -Np1 -i ../graphql-core.diff
-
-  cd "$srcdir"/buildbot-contrib
-  patch -Np1 -i ../buildbot-contrib-systemd-common.patch
-}
-
-build() {
-  export NODE_OPTIONS="--max-old-space-size=2048"
-
-  cd "$srcdir"/buildbot-$pkgver/pkg
-  python setup.py egg_info
-
-  #################### buildbot ########################
-  cd "$srcdir"/buildbot-$pkgver/master
-  python setup.py build
-
-  ################## buildbot-worker ###################
-  cd "$srcdir"/buildbot-$pkgver/worker
-  python setup.py build
-
-  ################### buildbot-www #####################
-  cd "$srcdir"/buildbot-$pkgver
-
-  # HACK: use system packages instead of ones via pip
-  make PIP=/usr/bin/true frontend_deps
-
-  export PYTHONPATH="$srcdir"/buildbot-$pkgver/pkg
-  for module in base waterfall_view console_view grid_view wsgi_dashboards badges
-  do
-    cd "$srcdir"/buildbot-$pkgver/www/$module
-    python setup.py build
-  done
-
-  ################### buildbot-docs ####################
-  cd "$srcdir"/buildbot-$pkgver/master/docs
-  # Default SPHINXOPTS used in upstream Makefile treats warnings as errors and may break the build when Arch uses newer sphinx
-  make SPHINXOPTS="-j$(nproc)" clean html singlehtml
-}
-
-check() {
-  # Install packages to a temp folder for tests
-  cd "$srcdir"/buildbot-$pkgver/master
-  python setup.py egg_info
-  python setup.py install_scripts --install-dir="$srcdir/tmp_install"
-
-  cd "$srcdir"/buildbot-$pkgver/worker
-  python setup.py egg_info
-
-  cd "$srcdir"/buildbot-$pkgver/www/base
-  python setup.py egg_info
-
-  # Run tests
-  _basedir="$srcdir/buildbot-$pkgver"
-  export PYTHONPATH="$_basedir/master:$_basedir/worker:$_basedir/www/base:$_basedir/pkg"
-  export PATH="$PATH:$srcdir/tmp_install"
-
-  cd "$srcdir"/buildbot-$pkgver/master
-  TZ=UTC trial --rterrors buildbot
-
-  cd "$srcdir"/buildbot-$pkgver/worker
-  PYTHONPATH=. trial buildbot_worker
-
-  for module in base waterfall_view console_view grid_view wsgi_dashboards
-  do
-    cd "$srcdir"/buildbot-$pkgver/www/$module
-    CHROME_BIN=/usr/bin/chromium yarn run test --browsers BBChromeHeadless
-  done
-}
-
-package_buildbot() {
-  pkgdesc='The Continuous Integration Framework'
-  # include setuptools as plugins are enumerated via pkg_resources
-  depends=(buildbot-common python-twisted python-jinja python-msgpack python-zope-interface python-sqlalchemy
-           python-alembic python-dateutil python-txaio
-           python-autobahn python-pyjwt python-yaml python-setuptools)
-  optdepends=(
-    # reporters
-    'python-pyopenssl: to use SSL/TLS in mail or IRC notifiers'
-    # secrets
-    'pass: to use SecretInPass provider'
-    'vault: to use HashiCorpVaultSecretProvider or HashiCorpVaultKvSecretProvider provider'
-    'python-hvac: to use HashiCorpVaultKvSecretProvider provider'
-    # statistics
-    'python-influxdb: for using InfluxDB to store statistics'
-    # steps
-    'python-subunit: for SubunitShellCommand'
-    'python-treq: for using HTTP requests as steps'
-    'python-requests: for using HTTP requests as steps'
-    'python-txrequests: for using HTTP requests as steps'
-    'python-unidiff: for GitDiffInfo'
-    # workers
-    'buildbot-worker: for local worker'
-    'libvirt-python: for libvirt worker'
-    'python-boto3: for AWS EC2 latent worker'
-    'python-docker: for Docker latent worker'
-    'python-novaclient: for OpenStack latent worker'
-    # www
-    'python-graphql-core: GraphQL API for buildbot'
-    'python-ldap3: to authenticate users via LDAP'
-    'python-pypugjs: to use custom Pug.js templates'
-
-    # misc
-    'python-lz4: to compress logs using lz4'
-  )
-
-  cd buildbot-$pkgver/master
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-  install -Dm644 "$srcdir"/buildbot-contrib/master/contrib/systemd/buildbot at .service \
-    -t "$pkgdir"/usr/lib/systemd/system/
-}
-
-package_buildbot-worker() {
-  pkgdesc='Buildbot worker daemon'
-  depends=(buildbot-common python-twisted python-future python-autobahn python-msgpack)
-
-  cd buildbot-$pkgver/worker
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-  install -Dm644 "$srcdir"/buildbot-contrib/worker/contrib/systemd/buildbot-worker at .service \
-    -t "$pkgdir"/usr/lib/systemd/system/
-}
-
-package_buildbot-docs() {
-  pkgdesc='Buildbot docs'
-
-  cd buildbot-$pkgver/master/docs
-  install -Ddm755 "$pkgdir"/usr/share/doc/buildbot
-  for kind in html singlehtml ; do
-    cp -dr --no-preserve=ownership _build/$kind "$pkgdir"/usr/share/doc/buildbot/$kind
-  done
-}
-
-package_buildbot-common() {
-  pkgdesc='Contributed scripts for Buildbot'
-
-  cd buildbot-contrib
-  install -Dm644 common/contrib/systemd/sysusers.d/buildbot.conf -t "$pkgdir"/usr/lib/sysusers.d/
-  install -Dm644 common/contrib/systemd/tmpfiles.d/buildbot.conf -t "$pkgdir"/usr/lib/tmpfiles.d/
-}
-
-package_python-buildbot-www() {
-  pkgdesc='Buildbot UI'
-  depends=(python buildbot)
-  optdepends=(
-    'python-buildbot-waterfall-view'
-    'python-buildbot-console-view'
-    'python-buildbot-grid-view'
-    'python-buildbot-badges'
-  )
-
-  cd buildbot-$pkgver/www/base
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-}
-
-package_python-buildbot-waterfall-view() {
-  pkgdesc='Buildbot Waterfall View plugin'
-  depends=(python-buildbot-www)
-
-  cd buildbot-$pkgver/www/waterfall_view
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-}
-
-package_python-buildbot-console-view() {
-  pkgdesc='Buildbot Console View plugin'
-  depends=(python-buildbot-www)
-
-  cd buildbot-$pkgver/www/console_view
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-}
-
-package_python-buildbot-grid-view() {
-  pkgdesc='Buildbot Grid View plugin'
-  depends=(python-buildbot-www)
-
-  cd buildbot-$pkgver/www/grid_view
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-}
-
-package_python-buildbot-wsgi-dashboards() {
-  pkgdesc='Buildbot plugin to integrate flask or bottle dashboards to buildbot UI'
-  depends=(python-buildbot-www)
-
-  cd buildbot-$pkgver/www/wsgi_dashboards
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-}
-
-package_python-buildbot-badges() {
-  pkgdesc='Buildbot badges'
-  depends=(python-buildbot-www python-klein python-cairosvg python-cairocffi python-jinja)
-  # https://github.com/buildbot/buildbot/blob/v1.6.0/www/badges/buildbot_badges/__init__.py#L40
-  optdepends=(
-    'ttf-dejavu: the default font for rendering badges as PNGs'
-  )
-
-  cd buildbot-$pkgver/www/badges
-  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
-}

Copied: buildbot/repos/community-any/PKGBUILD (from rev 1207550, buildbot/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-05-16 15:56:21 UTC (rev 1207551)
@@ -0,0 +1,274 @@
+# Maintainer: Chih-Hsuan Yen <yan12125 at archlinux.org>
+# Contributor: xRemaLx <anton.komolov at gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgbase=buildbot
+pkgname=(buildbot buildbot-worker buildbot-docs buildbot-common
+         python-buildbot-www python-buildbot-waterfall-view
+         python-buildbot-console-view python-buildbot-grid-view
+         python-buildbot-wsgi-dashboards python-buildbot-badges)
+# https://github.com/buildbot/buildbot/releases
+pkgver=3.5.0
+_bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
+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-unidiff python-psutil
+              openssh chromium)
+makedepends=(python-twisted python-jinja python-msgpack python-zope-interface python-sqlalchemy
+             python-alembic python-dateutil python-txaio
+             python-autobahn python-pyjwt python-yaml
+             python-graphql-core python-hvac
+             python-setuptools python-future
+             python-sphinx-jinja
+             python-sphinx_rtd_theme
+             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-autobahn-22.4.patch::https://github.com/buildbot/buildbot/commit/7d0cd447cd302d8f97e7ee13aa15721b7a3b6d8c.patch"
+        "python310.diff"
+        "graphql-core.diff")
+sha256sums=('53b58e056d7da5c83b669ce1bf213147beedba6fa6a60dadba3e80d385239ced'
+            'SKIP'
+            'SKIP'
+            '896eede4c33a8574d7c29ac4a28cebbe3d7e850931a86e945328f8ea358195a9'
+            'e4902bca5d0098ed048d5a46edcc496c6260c5bd02394961bd6f8c47fbedda21'
+            '79bff19ba26d9ae97a9fffbbd8b83b21dcfba0a933c908176562906cf7432813'
+            '9ed4f9f18f71558afc876c92206e4de213fa6a94305ad9d4d9115a041dd41b22')
+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
+
+  # Some master tests use scripts from contrib
+  ln -s ../../buildbot-contrib/master/contrib master/contrib
+
+  # HACK: do not use virtualenv
+  sed -i -e 's#frontend_deps:.*#frontend_deps:#' Makefile
+
+  # HACK: Do not build JS again during install
+  # We take care about the command order manually
+  sed -i '/egg_info=EggInfoCommand/d' pkg/buildbot_pkg.py
+
+  sed -i '/buildbot_windows_service/d' master/setup.py
+  rm -v master/buildbot/scripts/windows_service.py
+  sed -i '/buildbot_worker_windows_service/d' worker/setup.py
+  rm -v worker/buildbot_worker/scripts/windows_service.py
+
+  # Don't treat warnings as errors. Arch often ships newer Python libraries than ones
+  # in upstream CI and introduces extra deprecation warnings
+  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
+  patch -Np1 -i ../python310.diff
+
+  # 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
+}
+
+build() {
+  export NODE_OPTIONS="--max-old-space-size=2048"
+
+  cd "$srcdir"/buildbot-$pkgver/pkg
+  python setup.py egg_info
+
+  #################### buildbot ########################
+  cd "$srcdir"/buildbot-$pkgver/master
+  python setup.py build
+
+  ################## buildbot-worker ###################
+  cd "$srcdir"/buildbot-$pkgver/worker
+  python setup.py build
+
+  ################### buildbot-www #####################
+  cd "$srcdir"/buildbot-$pkgver
+
+  # HACK: use system packages instead of ones via pip
+  make PIP=/usr/bin/true frontend_deps
+
+  export PYTHONPATH="$srcdir"/buildbot-$pkgver/pkg
+  for module in base waterfall_view console_view grid_view wsgi_dashboards badges
+  do
+    cd "$srcdir"/buildbot-$pkgver/www/$module
+    python setup.py build
+  done
+
+  ################### buildbot-docs ####################
+  cd "$srcdir"/buildbot-$pkgver/master/docs
+  # Default SPHINXOPTS used in upstream Makefile treats warnings as errors and may break the build when Arch uses newer sphinx
+  make SPHINXOPTS="-j$(nproc)" clean html singlehtml
+}
+
+check() {
+  # Install packages to a temp folder for tests
+  cd "$srcdir"/buildbot-$pkgver/master
+  python setup.py egg_info
+  python setup.py install_scripts --install-dir="$srcdir/tmp_install"
+
+  cd "$srcdir"/buildbot-$pkgver/worker
+  python setup.py egg_info
+
+  cd "$srcdir"/buildbot-$pkgver/www/base
+  python setup.py egg_info
+
+  # Run tests
+  _basedir="$srcdir/buildbot-$pkgver"
+  export PYTHONPATH="$_basedir/master:$_basedir/worker:$_basedir/www/base:$_basedir/pkg"
+  export PATH="$PATH:$srcdir/tmp_install"
+
+  cd "$srcdir"/buildbot-$pkgver/master
+  TZ=UTC trial --rterrors buildbot
+
+  cd "$srcdir"/buildbot-$pkgver/worker
+  PYTHONPATH=. trial buildbot_worker
+
+  for module in base waterfall_view console_view grid_view wsgi_dashboards
+  do
+    cd "$srcdir"/buildbot-$pkgver/www/$module
+    CHROME_BIN=/usr/bin/chromium yarn run test --browsers BBChromeHeadless
+  done
+}
+
+package_buildbot() {
+  pkgdesc='The Continuous Integration Framework'
+  # include setuptools as plugins are enumerated via pkg_resources
+  depends=(buildbot-common python-twisted python-jinja python-msgpack python-zope-interface python-sqlalchemy
+           python-alembic python-dateutil python-txaio
+           python-autobahn python-pyjwt python-yaml python-setuptools)
+  optdepends=(
+    # reporters
+    'python-pyopenssl: to use SSL/TLS in mail or IRC notifiers'
+    # secrets
+    'pass: to use SecretInPass provider'
+    'vault: to use HashiCorpVaultSecretProvider or HashiCorpVaultKvSecretProvider provider'
+    'python-hvac: to use HashiCorpVaultKvSecretProvider provider'
+    # statistics
+    'python-influxdb: for using InfluxDB to store statistics'
+    # steps
+    'python-subunit: for SubunitShellCommand'
+    'python-treq: for using HTTP requests as steps'
+    'python-requests: for using HTTP requests as steps'
+    'python-txrequests: for using HTTP requests as steps'
+    'python-unidiff: for GitDiffInfo'
+    # workers
+    'buildbot-worker: for local worker'
+    'libvirt-python: for libvirt worker'
+    'python-boto3: for AWS EC2 latent worker'
+    'python-docker: for Docker latent worker'
+    'python-novaclient: for OpenStack latent worker'
+    # www
+    'python-graphql-core: GraphQL API for buildbot'
+    'python-ldap3: to authenticate users via LDAP'
+    'python-pypugjs: to use custom Pug.js templates'
+
+    # misc
+    'python-lz4: to compress logs using lz4'
+  )
+
+  cd buildbot-$pkgver/master
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+  install -Dm644 "$srcdir"/buildbot-contrib/master/contrib/systemd/buildbot at .service \
+    -t "$pkgdir"/usr/lib/systemd/system/
+}
+
+package_buildbot-worker() {
+  pkgdesc='Buildbot worker daemon'
+  depends=(buildbot-common python-twisted python-future python-autobahn python-msgpack)
+
+  cd buildbot-$pkgver/worker
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+  install -Dm644 "$srcdir"/buildbot-contrib/worker/contrib/systemd/buildbot-worker at .service \
+    -t "$pkgdir"/usr/lib/systemd/system/
+}
+
+package_buildbot-docs() {
+  pkgdesc='Buildbot docs'
+
+  cd buildbot-$pkgver/master/docs
+  install -Ddm755 "$pkgdir"/usr/share/doc/buildbot
+  for kind in html singlehtml ; do
+    cp -dr --no-preserve=ownership _build/$kind "$pkgdir"/usr/share/doc/buildbot/$kind
+  done
+}
+
+package_buildbot-common() {
+  pkgdesc='Contributed scripts for Buildbot'
+
+  cd buildbot-contrib
+  install -Dm644 common/contrib/systemd/sysusers.d/buildbot.conf -t "$pkgdir"/usr/lib/sysusers.d/
+  install -Dm644 common/contrib/systemd/tmpfiles.d/buildbot.conf -t "$pkgdir"/usr/lib/tmpfiles.d/
+}
+
+package_python-buildbot-www() {
+  pkgdesc='Buildbot UI'
+  depends=(python buildbot)
+  optdepends=(
+    'python-buildbot-waterfall-view'
+    'python-buildbot-console-view'
+    'python-buildbot-grid-view'
+    'python-buildbot-badges'
+  )
+
+  cd buildbot-$pkgver/www/base
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+}
+
+package_python-buildbot-waterfall-view() {
+  pkgdesc='Buildbot Waterfall View plugin'
+  depends=(python-buildbot-www)
+
+  cd buildbot-$pkgver/www/waterfall_view
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+}
+
+package_python-buildbot-console-view() {
+  pkgdesc='Buildbot Console View plugin'
+  depends=(python-buildbot-www)
+
+  cd buildbot-$pkgver/www/console_view
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+}
+
+package_python-buildbot-grid-view() {
+  pkgdesc='Buildbot Grid View plugin'
+  depends=(python-buildbot-www)
+
+  cd buildbot-$pkgver/www/grid_view
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+}
+
+package_python-buildbot-wsgi-dashboards() {
+  pkgdesc='Buildbot plugin to integrate flask or bottle dashboards to buildbot UI'
+  depends=(python-buildbot-www)
+
+  cd buildbot-$pkgver/www/wsgi_dashboards
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+}
+
+package_python-buildbot-badges() {
+  pkgdesc='Buildbot badges'
+  depends=(python-buildbot-www python-klein python-cairosvg python-cairocffi python-jinja)
+  # https://github.com/buildbot/buildbot/blob/v1.6.0/www/badges/buildbot_badges/__init__.py#L40
+  optdepends=(
+    'ttf-dejavu: the default font for rendering badges as PNGs'
+  )
+
+  cd buildbot-$pkgver/www/badges
+  python setup.py install --root="$pkgdir" --optimize=1 --skip-build
+}

Deleted: graphql-core.diff
===================================================================
--- graphql-core.diff	2022-05-16 15:56:03 UTC (rev 1207550)
+++ graphql-core.diff	2022-05-16 15:56:21 UTC (rev 1207551)
@@ -1,24 +0,0 @@
-diff --git a/master/buildbot/test/unit/www/test_graphql.py b/master/buildbot/test/unit/www/test_graphql.py
-index 787c0daf4..68b1ea266 100644
---- a/master/buildbot/test/unit/www/test_graphql.py
-+++ b/master/buildbot/test/unit/www/test_graphql.py
-@@ -224,7 +224,6 @@ class V3RootResource(TestReactorMixin, www.WwwTestMixin, unittest.TestCase):
-                 {
-                     "message": "Cannot query field 'notexistant' on type 'Query'.",
-                     "locations": [{"line": 1, "column": 2}],
--                    "path": None,
-                 }
-             ],
-             200,
-diff --git a/master/buildbot/test/unit/www/test_ws.py b/master/buildbot/test/unit/www/test_ws.py
-index 6b2627f4d..21cdc3330 100644
---- a/master/buildbot/test/unit/www/test_ws.py
-+++ b/master/buildbot/test/unit/www/test_ws.py
-@@ -269,7 +269,6 @@ class WsResource(TestReactorMixin, www.WwwTestMixin, unittest.TestCase):
-                         {
-                             "locations": [{"column": 11, "line": 1}],
-                             "message": "Cannot query field 'not_existing' on type 'Builder'.",
--                            "path": None,
-                         }
-                     ],
-                 },

Copied: buildbot/repos/community-any/graphql-core.diff (from rev 1207550, buildbot/trunk/graphql-core.diff)
===================================================================
--- graphql-core.diff	                        (rev 0)
+++ graphql-core.diff	2022-05-16 15:56:21 UTC (rev 1207551)
@@ -0,0 +1,24 @@
+diff --git a/master/buildbot/test/unit/www/test_graphql.py b/master/buildbot/test/unit/www/test_graphql.py
+index 787c0daf4..68b1ea266 100644
+--- a/master/buildbot/test/unit/www/test_graphql.py
++++ b/master/buildbot/test/unit/www/test_graphql.py
+@@ -224,7 +224,6 @@ class V3RootResource(TestReactorMixin, www.WwwTestMixin, unittest.TestCase):
+                 {
+                     "message": "Cannot query field 'notexistant' on type 'Query'.",
+                     "locations": [{"line": 1, "column": 2}],
+-                    "path": None,
+                 }
+             ],
+             200,
+diff --git a/master/buildbot/test/unit/www/test_ws.py b/master/buildbot/test/unit/www/test_ws.py
+index 6b2627f4d..21cdc3330 100644
+--- a/master/buildbot/test/unit/www/test_ws.py
++++ b/master/buildbot/test/unit/www/test_ws.py
+@@ -269,7 +269,6 @@ class WsResource(TestReactorMixin, www.WwwTestMixin, unittest.TestCase):
+                         {
+                             "locations": [{"column": 11, "line": 1}],
+                             "message": "Cannot query field 'not_existing' on type 'Builder'.",
+-                            "path": None,
+                         }
+                     ],
+                 },

Deleted: python310.diff
===================================================================
--- python310.diff	2022-05-16 15:56:03 UTC (rev 1207550)
+++ python310.diff	2022-05-16 15:56:21 UTC (rev 1207551)
@@ -1,22 +0,0 @@
-diff --git a/master/buildbot/test/unit/www/test_ws.py b/master/buildbot/test/unit/www/test_ws.py
-index 43dfce5a7..21f4b3b5c 100644
---- a/master/buildbot/test/unit/www/test_ws.py
-+++ b/master/buildbot/test/unit/www/test_ws.py
-@@ -92,7 +92,7 @@ class WsResource(TestReactorMixin, www.WwwTestMixin, unittest.TestCase):
-             {
-                 "_id": 1,
-                 "code": 400,
--                "error": "Invalid method argument 'cmd_ping() got an unexpected keyword "
-+                "error": "Invalid method argument 'WsProtocol.cmd_ping() got an unexpected keyword "
-                 "argument 'foo''",
-             },
-         )
-@@ -106,7 +106,7 @@ class WsResource(TestReactorMixin, www.WwwTestMixin, unittest.TestCase):
-             self.proto.sendMessage,
-             {
-                 "id": None,
--                "message": "Invalid method argument 'graphql_cmd_connection_init() got an "
-+                "message": "Invalid method argument 'WsProtocol.graphql_cmd_connection_init() got an "
-                 "unexpected keyword argument 'foo''",
-                 "type": "error",
-             },

Copied: buildbot/repos/community-any/python310.diff (from rev 1207550, buildbot/trunk/python310.diff)
===================================================================
--- python310.diff	                        (rev 0)
+++ python310.diff	2022-05-16 15:56:21 UTC (rev 1207551)
@@ -0,0 +1,22 @@
+diff --git a/master/buildbot/test/unit/www/test_ws.py b/master/buildbot/test/unit/www/test_ws.py
+index 43dfce5a7..21f4b3b5c 100644
+--- a/master/buildbot/test/unit/www/test_ws.py
++++ b/master/buildbot/test/unit/www/test_ws.py
+@@ -92,7 +92,7 @@ class WsResource(TestReactorMixin, www.WwwTestMixin, unittest.TestCase):
+             {
+                 "_id": 1,
+                 "code": 400,
+-                "error": "Invalid method argument 'cmd_ping() got an unexpected keyword "
++                "error": "Invalid method argument 'WsProtocol.cmd_ping() got an unexpected keyword "
+                 "argument 'foo''",
+             },
+         )
+@@ -106,7 +106,7 @@ class WsResource(TestReactorMixin, www.WwwTestMixin, unittest.TestCase):
+             self.proto.sendMessage,
+             {
+                 "id": None,
+-                "message": "Invalid method argument 'graphql_cmd_connection_init() got an "
++                "message": "Invalid method argument 'WsProtocol.graphql_cmd_connection_init() got an "
+                 "unexpected keyword argument 'foo''",
+                 "type": "error",
+             },



More information about the arch-commits mailing list