[arch-commits] Commit in buildbot/trunk (PKGBUILD graphql-core.diff influxdb.diff)

2022-08-25 Thread Chih-Hsuan Yen via arch-commits 
Date: Friday, August 26, 2022 @ 04:02:55
  Author: yan12125
Revision: 1280669

upgpkg: buildbot 3.6.0-1

* Drop merged patches
* Add more dependencies to make namcap happy; a patch for influxdb
  tests is needed after those changes

Added:
  buildbot/trunk/influxdb.diff
Modified:
  buildbot/trunk/PKGBUILD
Deleted:
  buildbot/trunk/graphql-core.diff

---+
 PKGBUILD  |   31 +++
 graphql-core.diff |   24 
 influxdb.diff |   21 +
 3 files changed, 32 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-08-26 02:49:54 UTC (rev 1280668)
+++ PKGBUILD2022-08-26 04:02:55 UTC (rev 1280669)
@@ -9,20 +9,21 @@
  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
+pkgver=3.6.0
 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
-pkgrel=3
+pkgrel=1
 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
+  python-unidiff python-psutil python-ruamel-yaml
   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-influxdb libvirt-python python-novaclient python-pypugjs 
python-aiohttp
  python-setuptools python-future
  python-sphinx-jinja
  python-sphinx_rtd_theme
@@ -30,18 +31,14 @@
 
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;
-
"buildbot-python-sphinx-jinja-2.0.patch::https://github.com/buildbot/buildbot/commit/58dad89ad5dfaabcb0d60cedc245d47f42641b1b.patch;
 "python310.diff"
-"graphql-core.diff")
-sha256sums=('53b58e056d7da5c83b669ce1bf213147beedba6fa6a60dadba3e80d385239ced'
+"influxdb.diff")
+sha256sums=('d63c8a9c810f628ddc4b5bc18671b4df9b02beb58710b82d55a6cf749b1cbb3f'
 'SKIP'
 'SKIP'
 '896eede4c33a8574d7c29ac4a28cebbe3d7e850931a86e945328f8ea358195a9'
-'e4902bca5d0098ed048d5a46edcc496c6260c5bd02394961bd6f8c47fbedda21'
-'05664cf8edd2a1787e833d94209cdf2bb1833d0c2e5d24ccd02d67910413c82b'
 '79bff19ba26d9ae97a9fffbbd8b83b21dcfba0a933c908176562906cf7432813'
-'9ed4f9f18f71558afc876c92206e4de213fa6a94305ad9d4d9115a041dd41b22')
+'2cbddb485730ab243967166970a22b61e76d5eda5a8ba3783e0ebf4342be44ee')
 validpgpkeys=(
   '390EB159056ED56F66AB1092AECD456B4D2531FC'  # Pierre Tardy 
 (@tardyp on GitHub)
   'FD0004A26EADFE43A4C3F249C6F7AE200374452D'  # Povilas Kanapickas 
 (@p12tic on GitHub)
@@ -73,17 +70,10 @@
   # 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
+  # Fixes tests when python-influxdb is installed. The latter requires ports 
to be integers since
+  # 
https://github.com/influxdata/influxdb-python/commit/4428208be690ab5399c4e1150c8f2b4d11d65f7d
+  patch -Np1 -i ../influxdb.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
-
-  # Backported from master branch "Fix error in documentation build"
-  # https://github.com/buildbot/buildbot/pull/6505
-  patch -Np1 -i ../buildbot-python-sphinx-jinja-2.0.patch
-
   cd "$srcdir"/buildbot-contrib
   patch -Np1 -i ../buildbot-contrib-systemd-common.patch
 }
@@ -185,6 +175,7 @@
 
 # misc
 'python-lz4: to compress logs using lz4'
+'python-aiohttp: for dev-proxy'
   )
 
   cd buildbot-$pkgver/master

Deleted: graphql-core.diff
===
--- graphql-core.diff   2022-08-26 02:49:54 UTC (rev 1280668)
+++ graphql-core.diff   2022-08-26 04:02:55 UTC (rev 1280669)
@@ -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

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

2022-07-11 Thread Chih-Hsuan Yen via arch-commits 
Date: Tuesday, July 12, 2022 @ 03:57:32
  Author: yan12125
Revision: 1249947

buildbot: backport an upstream commit to fix building docs

Modified:
  buildbot/trunk/PKGBUILD

--+
 PKGBUILD |6 ++
 1 file changed, 6 insertions(+)

Modified: PKGBUILD
===
--- PKGBUILD2022-07-12 02:14:20 UTC (rev 1249946)
+++ PKGBUILD2022-07-12 03:57:32 UTC (rev 1249947)
@@ -31,6 +31,7 @@
 
"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;
+
"buildbot-python-sphinx-jinja-2.0.patch::https://github.com/buildbot/buildbot/commit/58dad89ad5dfaabcb0d60cedc245d47f42641b1b.patch;
 "python310.diff"
 "graphql-core.diff")
 sha256sums=('53b58e056d7da5c83b669ce1bf213147beedba6fa6a60dadba3e80d385239ced'
@@ -38,6 +39,7 @@
 'SKIP'
 '896eede4c33a8574d7c29ac4a28cebbe3d7e850931a86e945328f8ea358195a9'
 'e4902bca5d0098ed048d5a46edcc496c6260c5bd02394961bd6f8c47fbedda21'
+'05664cf8edd2a1787e833d94209cdf2bb1833d0c2e5d24ccd02d67910413c82b'
 '79bff19ba26d9ae97a9fffbbd8b83b21dcfba0a933c908176562906cf7432813'
 '9ed4f9f18f71558afc876c92206e4de213fa6a94305ad9d4d9115a041dd41b22')
 validpgpkeys=(
@@ -78,6 +80,10 @@
   # https://github.com/buildbot/buildbot/pull/6509
   patch -Np1 -i ../buildbot-autobahn-22.4.patch
 
+  # Backported from master branch "Fix error in documentation build"
+  # https://github.com/buildbot/buildbot/pull/6505
+  patch -Np1 -i ../buildbot-python-sphinx-jinja-2.0.patch
+
   cd "$srcdir"/buildbot-contrib
   patch -Np1 -i ../buildbot-contrib-systemd-common.patch
 }

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

2022-05-16 Thread Chih-Hsuan Yen via arch-commits 
Date: Monday, May 16, 2022 @ 15:56:03
  Author: yan12125
Revision: 1207550

upgpkg: buildbot 3.5.0-3; backport a fix for autobahn 22.4.x compatibility [1]

Also fix the hack to get rid of test failures caused by warnings. This
time the warning is from cryptography 37.x, which is imported via
python-docker -> python-paramiko [2]

[1] https://github.com/buildbot/buildbot/pull/6509
[2] https://github.com/paramiko/paramiko/issues/2038

Modified:
  buildbot/trunk/PKGBUILD

--+
 PKGBUILD |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-05-16 15:46:40 UTC (rev 1207549)
+++ PKGBUILD2022-05-16 15:56:03 UTC (rev 1207550)
@@ -11,7 +11,7 @@
 # https://github.com/buildbot/buildbot/releases
 pkgver=3.5.0
 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
-pkgrel=2
+pkgrel=3
 arch=(any)
 url='https://buildbot.net'
 license=(GPL2)
@@ -30,6 +30,7 @@
 
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'
@@ -36,6 +37,7 @@
 'SKIP'
 'SKIP'
 '896eede4c33a8574d7c29ac4a28cebbe3d7e850931a86e945328f8ea358195a9'
+'e4902bca5d0098ed048d5a46edcc496c6260c5bd02394961bd6f8c47fbedda21'
 '79bff19ba26d9ae97a9fffbbd8b83b21dcfba0a933c908176562906cf7432813'
 '9ed4f9f18f71558afc876c92206e4de213fa6a94305ad9d4d9115a041dd41b22')
 validpgpkeys=(
@@ -63,7 +65,7 @@
 
   # 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
+  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
@@ -72,6 +74,10 @@
   # 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
 }

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

2022-04-03 Thread Chih-Hsuan Yen via arch-commits 
Date: Sunday, April 3, 2022 @ 10:19:22
  Author: yan12125
Revision: 1180966

upgpkg: buildbot 3.5.0-2; fix dependencies for buildbot-worker

Add stuffs for the new msgpack over websocket protocol; see
https://github.com/buildbot/buildbot/pull/6323

Modified:
  buildbot/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2022-04-03 10:17:38 UTC (rev 1180965)
+++ PKGBUILD2022-04-03 10:19:22 UTC (rev 1180966)
@@ -11,7 +11,7 @@
 # https://github.com/buildbot/buildbot/releases
 pkgver=3.5.0
 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
-pkgrel=1
+pkgrel=2
 arch=(any)
 url='https://buildbot.net'
 license=(GPL2)
@@ -183,7 +183,7 @@
 
 package_buildbot-worker() {
   pkgdesc='Buildbot worker daemon'
-  depends=(buildbot-common python-twisted python-future)
+  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

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

2022-03-06 Thread Chih-Hsuan Yen via arch-commits 
Date: Monday, March 7, 2022 @ 05:01:05
  Author: yan12125
Revision: 1144156

upgpkg: buildbot 3.5.0-1

Modified:
  buildbot/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-03-07 04:58:39 UTC (rev 1144155)
+++ PKGBUILD2022-03-07 05:01:05 UTC (rev 1144156)
@@ -9,7 +9,7 @@
  python-buildbot-console-view python-buildbot-grid-view
  python-buildbot-wsgi-dashboards python-buildbot-badges)
 # https://github.com/buildbot/buildbot/releases
-pkgver=3.4.1
+pkgver=3.5.0
 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
 pkgrel=1
 arch=(any)
@@ -17,9 +17,9 @@
 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-unidiff python-psutil
   openssh chromium)
-makedepends=(python-twisted python-jinja python-zope-interface 
python-sqlalchemy
+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
@@ -32,7 +32,7 @@
 
"buildbot-contrib-systemd-common.patch::https://github.com/buildbot/buildbot-contrib/pull/22.patch;
 "python310.diff"
 "graphql-core.diff")
-sha256sums=('16d604c0dfa7b673318e13fe2ef15199ac6f19863b0e4d4d2624705a5401720c'
+sha256sums=('53b58e056d7da5c83b669ce1bf213147beedba6fa6a60dadba3e80d385239ced'
 'SKIP'
 'SKIP'
 '896eede4c33a8574d7c29ac4a28cebbe3d7e850931a86e945328f8ea358195a9'
@@ -142,7 +142,7 @@
 package_buildbot() {
   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
+  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=(

[arch-commits] Commit in buildbot/trunk (PKGBUILD graphql-core.diff python310.diff)

2022-02-10 Thread Chih-Hsuan Yen via arch-commits 
Date: Friday, February 11, 2022 @ 05:20:51
  Author: yan12125
Revision: 1131810

upgpkg: buildbot 3.4.1-1

* Don't treat warnings as errors for tests and sphinx
* Bring back the hack for Windows service files. Upstream changes are reverted 
due to a regression [1]
* Patch tests for newer python-graphql-core
* Add a link for release notes

[1] https://github.com/buildbot/buildbot/issues/6294

Added:
  buildbot/trunk/graphql-core.diff
Modified:
  buildbot/trunk/PKGBUILD
  buildbot/trunk/python310.diff

---+
 PKGBUILD  |   29 +++--
 graphql-core.diff |   24 
 python310.diff|   11 ---
 3 files changed, 43 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-02-11 05:00:35 UTC (rev 1131809)
+++ PKGBUILD2022-02-11 05:20:51 UTC (rev 1131810)
@@ -8,9 +8,10 @@
  python-buildbot-www python-buildbot-waterfall-view
  python-buildbot-console-view python-buildbot-grid-view
  python-buildbot-wsgi-dashboards python-buildbot-badges)
-pkgver=3.4.0
+# https://github.com/buildbot/buildbot/releases
+pkgver=3.4.1
 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
-pkgrel=3
+pkgrel=1
 arch=(any)
 url='https://buildbot.net'
 license=(GPL2)
@@ -29,12 +30,14 @@
 
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")
-sha256sums=('da729c7f4dc2e30f5a5d69e34dd629b0b3d97001b12d72aeb691bb2f0ef0efeb'
+"python310.diff"
+"graphql-core.diff")
+sha256sums=('16d604c0dfa7b673318e13fe2ef15199ac6f19863b0e4d4d2624705a5401720c'
 'SKIP'
 'SKIP'
 '896eede4c33a8574d7c29ac4a28cebbe3d7e850931a86e945328f8ea358195a9'
-'7ca79a209e5f77dff01bef526d92a0ac08cf65a6ab22f32d03575c97a5b49ebd')
+'79bff19ba26d9ae97a9fffbbd8b83b21dcfba0a933c908176562906cf7432813'
+'9ed4f9f18f71558afc876c92206e4de213fa6a94305ad9d4d9115a041dd41b22')
 validpgpkeys=(
   '390EB159056ED56F66AB1092AECD456B4D2531FC'  # Pierre Tardy 
 (@tardyp on GitHub)
   'FD0004A26EADFE43A4C3F249C6F7AE200374452D'  # Povilas Kanapickas 
 (@p12tic on GitHub)
@@ -53,17 +56,22 @@
   # We take care about the command order manually
   sed -i '/egg_info=EggInfoCommand/d' pkg/buildbot_pkg.py
 
-  # https://github.com/buildbot/buildbot/pull/6178 removes Windows
-  # services from console scripts, while the following files still make
-  # namcap-git complain
+  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
-  # https://twistedmatrix.com/trac/ticket/10273
   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
 }
@@ -97,7 +105,8 @@
 
   ### buildbot-docs 
   cd "$srcdir"/buildbot-$pkgver/master/docs
-  make clean html singlehtml
+  # 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() {

Added: graphql-core.diff
===
--- graphql-core.diff   (rev 0)
+++ graphql-core.diff   2022-02-11 05:20:51 UTC (rev 1131810)
@@ -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

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

2021-12-04 Thread Felix Yan via arch-commits 
Date: Saturday, December 4, 2021 @ 20:59:29
  Author: felixonmars
Revision: 1065078

upgpkg: buildbot 3.4.0-3: Python 3.10 rebuild

Modified:
  buildbot/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-12-04 20:43:40 UTC (rev 1065077)
+++ PKGBUILD2021-12-04 20:59:29 UTC (rev 1065078)
@@ -10,7 +10,7 @@
  python-buildbot-wsgi-dashboards python-buildbot-badges)
 pkgver=3.4.0
 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
-pkgrel=2
+pkgrel=3
 arch=(any)
 url='https://buildbot.net'
 license=(GPL2)

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

2021-12-04 Thread Felix Yan via arch-commits 
Date: Saturday, December 4, 2021 @ 16:02:27
  Author: felixonmars
Revision: 1065037

upgpkg: buildbot 3.4.0-2: Python 3.10 rebuild

Modified:
  buildbot/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-12-04 15:48:10 UTC (rev 1065036)
+++ PKGBUILD2021-12-04 16:02:27 UTC (rev 1065037)
@@ -10,7 +10,7 @@
  python-buildbot-wsgi-dashboards python-buildbot-badges)
 pkgver=3.4.0
 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
-pkgrel=1
+pkgrel=2
 arch=(any)
 url='https://buildbot.net'
 license=(GPL2)

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

2021-12-04 Thread Chih-Hsuan Yen via arch-commits 
Date: Saturday, December 4, 2021 @ 15:48:10
  Author: yan12125
Revision: 1065036

buildbot: fix for Python 3.10

Related tickets/PRs:
* https://github.com/python/cpython/pull/20236
* https://twistedmatrix.com/trac/ticket/10273

Added:
  buildbot/trunk/python310.diff
Modified:
  buildbot/trunk/PKGBUILD

+
 PKGBUILD   |   11 +--
 python310.diff |   33 +
 2 files changed, 42 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-12-04 13:32:06 UTC (rev 1065035)
+++ PKGBUILD2021-12-04 15:48:10 UTC (rev 1065036)
@@ -28,11 +28,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;
+"python310.diff")
 sha256sums=('da729c7f4dc2e30f5a5d69e34dd629b0b3d97001b12d72aeb691bb2f0ef0efeb'
 'SKIP'
 'SKIP'
-'896eede4c33a8574d7c29ac4a28cebbe3d7e850931a86e945328f8ea358195a9')
+'896eede4c33a8574d7c29ac4a28cebbe3d7e850931a86e945328f8ea358195a9'
+'7ca79a209e5f77dff01bef526d92a0ac08cf65a6ab22f32d03575c97a5b49ebd')
 validpgpkeys=(
   '390EB159056ED56F66AB1092AECD456B4D2531FC'  # Pierre Tardy 
 (@tardyp on GitHub)
   'FD0004A26EADFE43A4C3F249C6F7AE200374452D'  # Povilas Kanapickas 
 (@p12tic on GitHub)
@@ -57,6 +59,11 @@
   rm -v master/buildbot/scripts/windows_service.py
   rm -v worker/buildbot_worker/scripts/windows_service.py
 
+  # Fixes for Python 3.10 breakages:
+  # https://github.com/python/cpython/pull/20236
+  # https://twistedmatrix.com/trac/ticket/10273
+  patch -Np1 -i ../python310.diff
+
   cd "$srcdir"/buildbot-contrib
   patch -Np1 -i ../buildbot-contrib-systemd-common.patch
 }

Added: python310.diff
===
--- python310.diff  (rev 0)
+++ python310.diff  2021-12-04 15:48:10 UTC (rev 1065036)
@@ -0,0 +1,33 @@
+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",
+ },
+diff --git a/master/buildbot/test/__init__.py 
b/master/buildbot/test/__init__.py
+index 8c8f53823..0f176028a 100644
+--- a/master/buildbot/test/__init__.py
 b/master/buildbot/test/__init__.py
+@@ -128,3 +128,6 @@ warnings.filterwarnings('ignore', ".*Not importing 
directory .*/sphinxcontrib: m
+ # https://github.com/pypa/setuptools/issues/2086
+ warnings.filterwarnings('ignore', ".*lib2to3 package is deprecated",
+ category=PendingDeprecationWarning)
++
++warnings.filterwarnings('ignore', r".*currentThread\(\) is deprecated, use 
current_thread\(\) instead.*",
++category=DeprecationWarning)

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

2021-10-29 Thread Chih-Hsuan Yen via arch-commits 
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
===
--- PKGBUILD2021-10-29 14:19:24 UTC (rev 1034914)
+++ PKGBUILD2021-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'

[arch-commits] Commit in buildbot/trunk (PKGBUILD subunit-tests.diff)

2021-07-31 Thread Chih-Hsuan Yen via arch-commits 
Date: Saturday, July 31, 2021 @ 10:29:21
  Author: yan12125
Revision: 991075

upgpkg: buildbot 3.3.0-1; this version introduces compatibility with sqlalchemy 
1.4 [1], so there is no rebuild for python-sqlalchemy1.3

[1] https://github.com/buildbot/buildbot/pull/6156

Modified:
  buildbot/trunk/PKGBUILD
Deleted:
  buildbot/trunk/subunit-tests.diff

+
 PKGBUILD   |   17 +
 subunit-tests.diff |   37 -
 2 files changed, 5 insertions(+), 49 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-07-31 10:13:30 UTC (rev 991074)
+++ PKGBUILD2021-07-31 10:29:21 UTC (rev 991075)
@@ -8,9 +8,9 @@
  python-buildbot-www python-buildbot-waterfall-view
  python-buildbot-console-view python-buildbot-grid-view
  python-buildbot-wsgi-dashboards python-buildbot-badges)
-pkgver=3.2.0
+pkgver=3.3.0
 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
-pkgrel=2
+pkgrel=1
 arch=(any)
 url='https://buildbot.net'
 license=(GPL2)
@@ -18,7 +18,7 @@
   python-moto python-docker python-parameterized python-mock 
python-subunit
   python-graphql-core python-unidiff
   openssh chromium)
-makedepends=(python-twisted python-jinja python-zope-interface 
python-sqlalchemy1.3
+makedepends=(python-twisted python-jinja python-zope-interface 
python-sqlalchemy
  python-sqlalchemy-migrate python-dateutil python-txaio
  python-autobahn python-pyjwt python-yaml
  python-setuptools python-future
@@ -27,12 +27,10 @@
  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;
-"subunit-tests.diff"
 
"buildbot-contrib-systemd-common.patch::https://github.com/buildbot/buildbot-contrib/pull/22.patch;)
-sha256sums=('b94c62cb92398d1e32d5796f493711ecc568b2430efc856d48912f05ea8afb09'
+sha256sums=('2ffa268d7c328545d7e93fce2de1167527a2119c4b4ff0b6faa6ccc257074191'
 'SKIP'
 'SKIP'
-'cd66bf65e45fa0a5916a6e0201dcebc4db001e4f47da856afbffc58a04356d55'
 '896eede4c33a8574d7c29ac4a28cebbe3d7e850931a86e945328f8ea358195a9')
 validpgpkeys=(
   '390EB159056ED56F66AB1092AECD456B4D2531FC'  # Pierre Tardy 
 (@tardyp on GitHub)
@@ -57,11 +55,6 @@
   sed -i '/buildbot_worker_windows_service/d' worker/setup.py
   rm -v worker/buildbot_worker/scripts/windows_service.py
 
-  # Subunit logs are from testtools. Arch Linux's testtools is patched to use
-  # traceback instead of traceback2, and causing a difference. See
-  # https://github.com/testing-cabal/testtools/pull/299 for more defailts.
-  patch -Np1 -i ../subunit-tests.diff
-
   cd "$srcdir"/buildbot-contrib
   patch -Np1 -i ../buildbot-contrib-systemd-common.patch
 }
@@ -134,7 +127,7 @@
 package_buildbot() {
   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-sqlalchemy1.3
+  depends=(buildbot-common python-twisted python-jinja python-zope-interface 
python-sqlalchemy
python-sqlalchemy-migrate python-dateutil python-txaio
python-autobahn python-pyjwt python-yaml python-setuptools)
   optdepends=(

Deleted: subunit-tests.diff
===
--- subunit-tests.diff  2021-07-31 10:13:30 UTC (rev 991074)
+++ subunit-tests.diff  2021-07-31 10:29:21 UTC (rev 991075)
@@ -1,37 +0,0 @@
-diff --git a/master/buildbot/test/unit/test_steps_subunit.py 
b/master/buildbot/test/unit/test_steps_subunit.py
-index 4e9f326b6..fdac4b17f 100644
 a/master/buildbot/test/unit/steps/test_subunit.py
-+++ b/master/buildbot/test/unit/steps/test_subunit.py
-@@ -120,8 +120,7 @@ class TestSubUnit(steps.BuildStepMixin, TestReactorMixin, 
unittest.TestCase):
- self.expectOutcome(result=FAILURE, state_string="shell Total 1 
test(s) 1 error (failure)")
- self.expectLogfile('problems', '''\
- test1
--testtools.testresult.real._StringException: Traceback (most recent call last):
--ValueError: invalid literal for int() with base 10: '_error1'
-+testtools.testresult.real._StringException: ValueError: invalid literal for 
int() with base 10: '_error1'
- 
- ''')
- return self.runStep()
-@@ -148,12 +147,10 @@ ValueError: invalid literal for int() with base 10: 
'_error1'
- self.expectOutcome(result=FAILURE, state_string="shell Total 2 
test(s) 2 errors (failure)")
- self.expectLogfile('problems', '''\
- test1
--testtools.testresult.real._StringException: Traceback (most recent call last):
--ValueError: invalid literal for int() with base 10: '_error1'
-+testtools.testresult.real._StringException: ValueError:

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

2021-06-20 Thread Chih-Hsuan Yen via arch-commits 
Date: Sunday, June 20, 2021 @ 10:23:08
  Author: yan12125
Revision: 965881

upgpkg: buildbot 3.2.0-2; rebuild for sqlalchemy 1.3

See: https://archlinux.org/todo/python-sqlalchemy-update-to-14/

Modified:
  buildbot/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-06-20 10:13:43 UTC (rev 965880)
+++ PKGBUILD2021-06-20 10:23:08 UTC (rev 965881)
@@ -10,7 +10,7 @@
  python-buildbot-wsgi-dashboards python-buildbot-badges)
 pkgver=3.2.0
 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
-pkgrel=1
+pkgrel=2
 arch=(any)
 url='https://buildbot.net'
 license=(GPL2)
@@ -18,7 +18,7 @@
   python-moto python-docker python-parameterized python-mock 
python-subunit
   python-graphql-core python-unidiff
   openssh chromium)
-makedepends=(python-twisted python-jinja python-zope-interface 
python-sqlalchemy
+makedepends=(python-twisted python-jinja python-zope-interface 
python-sqlalchemy1.3
  python-sqlalchemy-migrate python-dateutil python-txaio
  python-autobahn python-pyjwt python-yaml
  python-setuptools python-future
@@ -134,7 +134,7 @@
 package_buildbot() {
   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
+  depends=(buildbot-common python-twisted python-jinja python-zope-interface 
python-sqlalchemy1.3
python-sqlalchemy-migrate python-dateutil python-txaio
python-autobahn python-pyjwt python-yaml python-setuptools)
   optdepends=(

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

2021-06-20 Thread Chih-Hsuan Yen via arch-commits 
Date: Sunday, June 20, 2021 @ 10:13:28
  Author: yan12125
Revision: 965879

upgpkg: buildbot 3.2.0-1

Modified:
  buildbot/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-06-20 09:50:49 UTC (rev 965878)
+++ PKGBUILD2021-06-20 10:13:28 UTC (rev 965879)
@@ -8,9 +8,9 @@
  python-buildbot-www python-buildbot-waterfall-view
  python-buildbot-console-view python-buildbot-grid-view
  python-buildbot-wsgi-dashboards python-buildbot-badges)
-pkgver=3.1.1
+pkgver=3.2.0
 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
-pkgrel=2
+pkgrel=1
 arch=(any)
 url='https://buildbot.net'
 license=(GPL2)
@@ -18,7 +18,7 @@
   python-moto python-docker python-parameterized python-mock 
python-subunit
   python-graphql-core python-unidiff
   openssh chromium)
-makedepends=(python-twisted python-jinja python-zope-interface 
python-sqlalchemy1.3
+makedepends=(python-twisted python-jinja python-zope-interface 
python-sqlalchemy
  python-sqlalchemy-migrate python-dateutil python-txaio
  python-autobahn python-pyjwt python-yaml
  python-setuptools python-future
@@ -29,7 +29,7 @@
 
"git+https://github.com/buildbot/buildbot-contrib.git#commit=$_bb_contrib_commit;
 "subunit-tests.diff"
 
"buildbot-contrib-systemd-common.patch::https://github.com/buildbot/buildbot-contrib/pull/22.patch;)
-sha256sums=('ffa127b06f375908c7882c246402171d461eb92f4036023282328c0ed53f0db3'
+sha256sums=('b94c62cb92398d1e32d5796f493711ecc568b2430efc856d48912f05ea8afb09'
 'SKIP'
 'SKIP'
 'cd66bf65e45fa0a5916a6e0201dcebc4db001e4f47da856afbffc58a04356d55'
@@ -134,7 +134,7 @@
 package_buildbot() {
   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-sqlalchemy1.3
+  depends=(buildbot-common python-twisted python-jinja python-zope-interface 
python-sqlalchemy
python-sqlalchemy-migrate python-dateutil python-txaio
python-autobahn python-pyjwt python-yaml python-setuptools)
   optdepends=(

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

2021-04-30 Thread Chih-Hsuan Yen via arch-commits 
Date: Friday, April 30, 2021 @ 16:21:07
  Author: yan12125
Revision: 925376

upgpkg: buildbot 3.1.1-2; rebuild for sqlalchemy 1.4 migration

See: https://archlinux.org/todo/python-sqlalchemy-update-to-14/

Modified:
  buildbot/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-04-30 16:10:13 UTC (rev 925375)
+++ PKGBUILD2021-04-30 16:21:07 UTC (rev 925376)
@@ -10,7 +10,7 @@
  python-buildbot-wsgi-dashboards python-buildbot-badges)
 pkgver=3.1.1
 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
-pkgrel=1
+pkgrel=2
 arch=(any)
 url='https://buildbot.net'
 license=(GPL2)
@@ -18,7 +18,7 @@
   python-moto python-docker python-parameterized python-mock 
python-subunit
   python-graphql-core python-unidiff
   openssh chromium)
-makedepends=(python-twisted python-jinja python-zope-interface
+makedepends=(python-twisted python-jinja python-zope-interface 
python-sqlalchemy1.3
  python-sqlalchemy-migrate python-dateutil python-txaio
  python-autobahn python-pyjwt python-yaml
  python-setuptools python-future
@@ -134,7 +134,7 @@
 package_buildbot() {
   pkgdesc='The Continuous Integration Framework'
   # include setuptools as plugins are enumerated via pkg_resources
-  depends=(buildbot-common python-twisted python-jinja python-zope-interface
+  depends=(buildbot-common python-twisted python-jinja python-zope-interface 
python-sqlalchemy1.3
python-sqlalchemy-migrate python-dateutil python-txaio
python-autobahn python-pyjwt python-yaml python-setuptools)
   optdepends=(

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

2021-04-30 Thread Chih-Hsuan Yen via arch-commits 
Date: Friday, April 30, 2021 @ 16:09:57
  Author: yan12125
Revision: 925374

upgpkg: buildbot 3.1.1-1; bring back verbose test logs to identify skipped 
tests due to missing dependencies

See: https://github.com/buildbot/buildbot/pull/5857

Modified:
  buildbot/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2021-04-30 15:57:09 UTC (rev 925373)
+++ PKGBUILD2021-04-30 16:09:57 UTC (rev 925374)
@@ -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.1.0
+pkgver=3.1.1
 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
 pkgrel=1
 arch=(any)
@@ -29,7 +29,7 @@
 
"git+https://github.com/buildbot/buildbot-contrib.git#commit=$_bb_contrib_commit;
 "subunit-tests.diff"
 
"buildbot-contrib-systemd-common.patch::https://github.com/buildbot/buildbot-contrib/pull/22.patch;)
-sha256sums=('3def7d2a771bf958c55cb22ec0d1cc70952ff4918a9d978140b0e81636435c24'
+sha256sums=('ffa127b06f375908c7882c246402171d461eb92f4036023282328c0ed53f0db3'
 'SKIP'
 'SKIP'
 'cd66bf65e45fa0a5916a6e0201dcebc4db001e4f47da856afbffc58a04356d55'
@@ -116,10 +116,10 @@
   export PATH="$PATH:$srcdir/tmp_install"
 
   cd "$srcdir"/buildbot-$pkgver/master
-  TZ=UTC trial --reporter=summary --rterrors buildbot
+  TZ=UTC trial --rterrors buildbot
 
   cd "$srcdir"/buildbot-$pkgver/worker
-  PYTHONPATH=. trial --reporter=summary buildbot_worker
+  PYTHONPATH=. trial buildbot_worker
 
   for module in base waterfall_view console_view grid_view wsgi_dashboards
   do

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

2021-04-11 Thread Chih-Hsuan Yen via arch-commits 
Date: Monday, April 12, 2021 @ 01:30:49
  Author: yan12125
Revision: 915851

upgpkg: buildbot 3.1.0-1

See https://github.com/buildbot/buildbot/pull/5499 for the new unidiff 
dependency

Modified:
  buildbot/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-04-12 01:11:48 UTC (rev 915850)
+++ PKGBUILD2021-04-12 01:30:49 UTC (rev 915851)
@@ -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.0.2
+pkgver=3.1.0
 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
 pkgrel=1
 arch=(any)
@@ -16,6 +16,7 @@
 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
   openssh chromium)
 makedepends=(python-twisted python-jinja python-zope-interface
  python-sqlalchemy-migrate python-dateutil python-txaio
@@ -28,7 +29,7 @@
 
"git+https://github.com/buildbot/buildbot-contrib.git#commit=$_bb_contrib_commit;
 "subunit-tests.diff"
 
"buildbot-contrib-systemd-common.patch::https://github.com/buildbot/buildbot-contrib/pull/22.patch;)
-sha256sums=('1515c06fb3bc6fa7151093d80e3e44b689669545c3a84b4c4d2dd01c4bbe2ee3'
+sha256sums=('3def7d2a771bf958c55cb22ec0d1cc70952ff4918a9d978140b0e81636435c24'
 'SKIP'
 'SKIP'
 'cd66bf65e45fa0a5916a6e0201dcebc4db001e4f47da856afbffc58a04356d55'
@@ -149,6 +150,7 @@
 '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'

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

2021-03-27 Thread Chih-Hsuan Yen via arch-commits 
Date: Saturday, March 27, 2021 @ 13:03:18
  Author: yan12125
Revision: 905062

buildbot: fix tests with testing/python-twisted

I assume those who build packages for stable repos will use repos/community-any 
instead of trunk/ :)

Modified:
  buildbot/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2021-03-27 12:52:48 UTC (rev 905061)
+++ PKGBUILD2021-03-27 13:03:18 UTC (rev 905062)
@@ -115,10 +115,10 @@
   export PATH="$PATH:$srcdir/tmp_install"
 
   cd "$srcdir"/buildbot-$pkgver/master
-  TZ=UTC trial3 --reporter=summary --rterrors buildbot
+  TZ=UTC trial --reporter=summary --rterrors buildbot
 
   cd "$srcdir"/buildbot-$pkgver/worker
-  PYTHONPATH=. trial3 --reporter=summary buildbot_worker
+  PYTHONPATH=. trial --reporter=summary buildbot_worker
 
   for module in base waterfall_view console_view grid_view wsgi_dashboards
   do

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

2021-03-16 Thread Chih-Hsuan Yen via arch-commits 
Date: Wednesday, March 17, 2021 @ 04:21:25
  Author: yan12125
Revision: 892932

upgpkg: buildbot 3.0.2-1

Modified:
  buildbot/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2021-03-17 04:20:02 UTC (rev 892931)
+++ PKGBUILD2021-03-17 04:21:25 UTC (rev 892932)
@@ -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=2.10.4
+pkgver=3.0.2
 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
 pkgrel=1
 arch=(any)
@@ -28,7 +28,7 @@
 
"git+https://github.com/buildbot/buildbot-contrib.git#commit=$_bb_contrib_commit;
 "subunit-tests.diff"
 
"buildbot-contrib-systemd-common.patch::https://github.com/buildbot/buildbot-contrib/pull/22.patch;)
-sha256sums=('4bd2c4ea6ad7ef5e1126c0b18a44860b76a07bb367359ae6501ca7616277'
+sha256sums=('1515c06fb3bc6fa7151093d80e3e44b689669545c3a84b4c4d2dd01c4bbe2ee3'
 'SKIP'
 'SKIP'
 'cd66bf65e45fa0a5916a6e0201dcebc4db001e4f47da856afbffc58a04356d55'

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

2021-03-16 Thread Chih-Hsuan Yen via arch-commits 
Date: Wednesday, March 17, 2021 @ 04:11:47
  Author: yan12125
Revision: 892918

upgpkg: buildbot 2.10.4-1; bump 2.x version for sqlalchemy incompatibility

Modified:
  buildbot/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2021-03-17 04:11:07 UTC (rev 892917)
+++ PKGBUILD2021-03-17 04:11:47 UTC (rev 892918)
@@ -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.0.1
+pkgver=2.10.4
 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
 pkgrel=1
 arch=(any)
@@ -28,7 +28,7 @@
 
"git+https://github.com/buildbot/buildbot-contrib.git#commit=$_bb_contrib_commit;
 "subunit-tests.diff"
 
"buildbot-contrib-systemd-common.patch::https://github.com/buildbot/buildbot-contrib/pull/22.patch;)
-sha256sums=('2398434aa637b51fdb52c96580ab9a70d2b9604b2b2745d34a80fe7f319ce7d9'
+sha256sums=('4bd2c4ea6ad7ef5e1126c0b18a44860b76a07bb367359ae6501ca7616277'
 'SKIP'
 'SKIP'
 'cd66bf65e45fa0a5916a6e0201dcebc4db001e4f47da856afbffc58a04356d55'

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

2021-03-16 Thread Chih-Hsuan Yen via arch-commits 
Date: Tuesday, March 16, 2021 @ 08:29:09
  Author: yan12125
Revision: 891749

upgpkg: buildbot 3.0.1-1

Modified:
  buildbot/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2021-03-16 08:26:32 UTC (rev 891748)
+++ PKGBUILD2021-03-16 08:29:09 UTC (rev 891749)
@@ -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.0.0
+pkgver=3.0.1
 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
 pkgrel=1
 arch=(any)
@@ -28,7 +28,7 @@
 
"git+https://github.com/buildbot/buildbot-contrib.git#commit=$_bb_contrib_commit;
 "subunit-tests.diff"
 
"buildbot-contrib-systemd-common.patch::https://github.com/buildbot/buildbot-contrib/pull/22.patch;)
-sha256sums=('3f2597c038d8e1c5094e9018991b3eef5b03814bef836aeb0de992e931b07775'
+sha256sums=('2398434aa637b51fdb52c96580ab9a70d2b9604b2b2745d34a80fe7f319ce7d9'
 'SKIP'
 'SKIP'
 'cd66bf65e45fa0a5916a6e0201dcebc4db001e4f47da856afbffc58a04356d55'

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

2021-03-12 Thread Chih-Hsuan Yen via arch-commits 
Date: Saturday, March 13, 2021 @ 05:50:19
  Author: yan12125
Revision: 890009

upgpkg: buildbot 3.0.0-1

Modified:
  buildbot/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2021-03-13 02:26:01 UTC (rev 890008)
+++ PKGBUILD2021-03-13 05:50:19 UTC (rev 890009)
@@ -8,13 +8,13 @@
  python-buildbot-www python-buildbot-waterfall-view
  python-buildbot-console-view python-buildbot-grid-view
  python-buildbot-wsgi-dashboards python-buildbot-badges)
-pkgver=2.10.1
+pkgver=3.0.0
 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
-pkgrel=2
+pkgrel=1
 arch=(any)
 url='https://buildbot.net'
 license=(GPL2)
-checkdepends=(python-boto3 python-lz4 python-treq python-txrequests
+checkdepends=(python-boto3 python-ldap3 python-lz4 python-treq 
python-txrequests
   python-moto python-docker python-parameterized python-mock 
python-subunit
   openssh chromium)
 makedepends=(python-twisted python-jinja python-zope-interface
@@ -28,7 +28,7 @@
 
"git+https://github.com/buildbot/buildbot-contrib.git#commit=$_bb_contrib_commit;
 "subunit-tests.diff"
 
"buildbot-contrib-systemd-common.patch::https://github.com/buildbot/buildbot-contrib/pull/22.patch;)
-sha256sums=('33beb2428dea4bee638d8b2b6088c3b59fe0495a53bb332acea6bdb96f0a8a7e'
+sha256sums=('3f2597c038d8e1c5094e9018991b3eef5b03814bef836aeb0de992e931b07775'
 'SKIP'
 'SKIP'
 'cd66bf65e45fa0a5916a6e0201dcebc4db001e4f47da856afbffc58a04356d55'

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

2021-03-01 Thread Chih-Hsuan Yen via arch-commits 
Date: Monday, March 1, 2021 @ 15:40:56
  Author: yan12125
Revision: 876399

upgpkg: buildbot 2.10.1-2; let systemd manage the buildbot user and its $HOME

Before this change, buildbot and buildbot-worker systemd services run
with the `buildbot` user and the working directory /var/lib/buildbot as
per upstream unit files, while the packages do not create the user and
the directory and users need to do that manually. This commit fills the
gap.

Note that this should not be a breaking change as the user should have
been running with the specified user and directory. If a user overrides
systemd configurations, they need to also override tmpfiles and sysusers
configurations from now on.

This commit also fixes a test failure with python-moto 2.0.0.

Modified:
  buildbot/trunk/PKGBUILD

--+
 PKGBUILD |   27 ---
 1 file changed, 20 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-03-01 15:29:24 UTC (rev 876398)
+++ PKGBUILD2021-03-01 15:40:56 UTC (rev 876399)
@@ -4,18 +4,18 @@
 # Contributor: William Rea 
 
 pkgbase=buildbot
-pkgname=(buildbot buildbot-worker buildbot-docs
+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)
 pkgver=2.10.1
 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
-pkgrel=1
+pkgrel=2
 arch=(any)
 url='https://buildbot.net'
 license=(GPL2)
 checkdepends=(python-boto3 python-lz4 python-treq python-txrequests
-  python-moto python-parameterized python-mock python-subunit
+  python-moto python-docker python-parameterized python-mock 
python-subunit
   openssh chromium)
 makedepends=(python-twisted python-jinja python-zope-interface
  python-sqlalchemy-migrate python-dateutil python-txaio
@@ -26,11 +26,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;
-"subunit-tests.diff")
+"subunit-tests.diff"
+
"buildbot-contrib-systemd-common.patch::https://github.com/buildbot/buildbot-contrib/pull/22.patch;)
 sha256sums=('33beb2428dea4bee638d8b2b6088c3b59fe0495a53bb332acea6bdb96f0a8a7e'
 'SKIP'
 'SKIP'
-'cd66bf65e45fa0a5916a6e0201dcebc4db001e4f47da856afbffc58a04356d55')
+'cd66bf65e45fa0a5916a6e0201dcebc4db001e4f47da856afbffc58a04356d55'
+'896eede4c33a8574d7c29ac4a28cebbe3d7e850931a86e945328f8ea358195a9')
 validpgpkeys=(
   '390EB159056ED56F66AB1092AECD456B4D2531FC'  # Pierre Tardy 
 (@tardyp on GitHub)
   'FD0004A26EADFE43A4C3F249C6F7AE200374452D'  # Povilas Kanapickas 
 (@p12tic on GitHub)
@@ -58,6 +60,9 @@
   # traceback instead of traceback2, and causing a difference. See
   # https://github.com/testing-cabal/testtools/pull/299 for more defailts.
   patch -Np1 -i ../subunit-tests.diff
+
+  cd "$srcdir"/buildbot-contrib
+  patch -Np1 -i ../buildbot-contrib-systemd-common.patch
 }
 
 build() {
@@ -128,7 +133,7 @@
 package_buildbot() {
   pkgdesc='The Continuous Integration Framework'
   # include setuptools as plugins are enumerated via pkg_resources
-  depends=(python-twisted python-jinja python-zope-interface
+  depends=(buildbot-common python-twisted python-jinja python-zope-interface
python-sqlalchemy-migrate python-dateutil python-txaio
python-autobahn python-pyjwt python-yaml python-setuptools)
   optdepends=(
@@ -166,7 +171,7 @@
 
 package_buildbot-worker() {
   pkgdesc='Buildbot worker daemon'
-  depends=(python-twisted python-future)
+  depends=(buildbot-common python-twisted python-future)
 
   cd buildbot-$pkgver/worker
   python setup.py install --root="$pkgdir" --optimize=1 --skip-build
@@ -184,6 +189,14 @@
   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)

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

2021-01-29 Thread Chih-Hsuan Yen via arch-commits 
Date: Friday, January 29, 2021 @ 16:50:33
  Author: yan12125
Revision: 835404

upgpkg: buildbot 2.10.1-1; use archlinux.org email address

Modified:
  buildbot/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-01-29 16:49:21 UTC (rev 835403)
+++ PKGBUILD2021-01-29 16:50:33 UTC (rev 835404)
@@ -1,4 +1,4 @@
-# Maintainer: Chih-Hsuan Yen 
+# Maintainer: Chih-Hsuan Yen 
 # Contributor: xRemaLx 
 # Contributor: Sergej Pupykin 
 # Contributor: William Rea 
@@ -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=2.10.0
+pkgver=2.10.1
 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
 pkgrel=1
 arch=(any)
@@ -27,7 +27,7 @@
 
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;
 "subunit-tests.diff")
-sha256sums=('e381f282e789d83e3157761066e6fdf38090243187626cf0c2527a1f2c82bd5d'
+sha256sums=('33beb2428dea4bee638d8b2b6088c3b59fe0495a53bb332acea6bdb96f0a8a7e'
 'SKIP'
 'SKIP'
 'cd66bf65e45fa0a5916a6e0201dcebc4db001e4f47da856afbffc58a04356d55')

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

2021-01-05 Thread Chih-Hsuan Yen via arch-commits 
Date: Tuesday, January 5, 2021 @ 13:56:56
  Author: yan12125
Revision: 809168

upgpkg: buildbot 2.10.0-1

Modified:
  buildbot/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2021-01-05 13:56:32 UTC (rev 809167)
+++ PKGBUILD2021-01-05 13:56:56 UTC (rev 809168)
@@ -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=2.9.4
+pkgver=2.10.0
 _bb_contrib_commit=4c8615db51253f0be4bfd08210a3aaf903a74b4f
 pkgrel=1
 arch=(any)
@@ -27,7 +27,7 @@
 
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;
 "subunit-tests.diff")
-sha256sums=('9ffa555c328da9770960fd034d5d730a8fb13a00cbe28db431b30904aa65f4c5'
+sha256sums=('e381f282e789d83e3157761066e6fdf38090243187626cf0c2527a1f2c82bd5d'
 'SKIP'
 'SKIP'
 'cd66bf65e45fa0a5916a6e0201dcebc4db001e4f47da856afbffc58a04356d55')