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

[Chih-Hsuan Yen]

    Date: Friday, October 29, 2021 @ 17:14:55
  Author: yan12125
Revision: 1034915

upgpkg: buildbot 3.4.0-1

New dependencies:
* python-hvac: https://github.com/buildbot/buildbot/pull/6058

Removed dependencies:
* python-sphinxcontrib-blockdiag: https://github.com/buildbot/buildbot/pull/6223

Changed dependencies:
* python-sqlalchemy-migrate -> python-alembic: https://github.com/buildbot/buildbot/pull/6224
* python-graphql-core is now a runtime dependency: https://github.com/buildbot/buildbot/pull/5980

Other changes:
* Some hacks for Windows service files are upstreamed in https://github.com/buildbot/buildbot/pull/6178

Modified:
  buildbot/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-29 14:19:24 UTC (rev 1034914)
+++ PKGBUILD	2021-10-29 17:14:55 UTC (rev 1034915)
@@ -8,7 +8,7 @@
          python-buildbot-www python-buildbot-waterfall-view
          python-buildbot-console-view python-buildbot-grid-view
          python-buildbot-wsgi-dashboards python-buildbot-badges)
-pkgver=3.3.0
+pkgver=3.4.0
 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
 pkgrel=1
 arch=(any)
@@ -16,19 +16,20 @@
 license=(GPL2)
 checkdepends=(python-boto3 python-ldap3 python-lz4 python-treq python-txrequests
               python-moto python-docker python-parameterized python-mock python-subunit
-              python-graphql-core python-unidiff
+              python-unidiff
               openssh chromium)
 makedepends=(python-twisted python-jinja python-zope-interface python-sqlalchemy
-             python-sqlalchemy-migrate python-dateutil python-txaio
+             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-sphinxcontrib-blockdiag
+             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")
-sha256sums=('2ffa268d7c328545d7e93fce2de1167527a2119c4b4ff0b6faa6ccc257074191'
+sha256sums=('da729c7f4dc2e30f5a5d69e34dd629b0b3d97001b12d72aeb691bb2f0ef0efeb'
             'SKIP'
             'SKIP'
             '896eede4c33a8574d7c29ac4a28cebbe3d7e850931a86e945328f8ea358195a9')
@@ -50,9 +51,10 @@
   # 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
+  # https://github.com/buildbot/buildbot/pull/6178 removes Windows
+  # services from console scripts, while the following files still make
+  # namcap-git complain
   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
 
   cd "$srcdir"/buildbot-contrib
@@ -125,7 +127,7 @@
   pkgdesc='The Continuous Integration Framework'
   # include setuptools as plugins are enumerated via pkg_resources
   depends=(buildbot-common python-twisted python-jinja python-zope-interface python-sqlalchemy
-           python-sqlalchemy-migrate python-dateutil python-txaio
+           python-alembic python-dateutil python-txaio
            python-autobahn python-pyjwt python-yaml python-setuptools)
   optdepends=(
     # reporters
@@ -132,7 +134,8 @@
     'python-pyopenssl: to use SSL/TLS in mail or IRC notifiers'
     # secrets
     'pass: to use SecretInPass provider'
-    'vault: to use HashiCorpVaultSecretProvider provider'
+    'vault: to use HashiCorpVaultSecretProvider or HashiCorpVaultKvSecretProvider provider'
+    'python-hvac: to use HashiCorpVaultKvSecretProvider provider'
     # statistics
     'python-influxdb: for using InfluxDB to store statistics'
     # steps
@@ -148,6 +151,7 @@
     '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'