Re: [PR PATCH] [Updated] buildbot: update to 2.4.1

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 367 bytes --]

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages buildbot-2.4.1
https://github.com/void-linux/void-packages/pull/14427

buildbot: update to 2.4.1
also add python3-PyJWT, a new dependency.

A patch file from https://github.com/void-linux/void-packages/pull/14427.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-buildbot-2.4.1-14427.patch --]
[-- Type: text/x-diff, Size: 4822 bytes --]

From 6d55017190a7f1eb95fd29534a42013b36f2fb5b Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 10:40:50 +1000
Subject: [PATCH 1/2] New package: python3-PyJWT-1.7.1

---
 srcpkgs/python3-PyJWT/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-PyJWT/template

diff --git a/srcpkgs/python3-PyJWT/template b/srcpkgs/python3-PyJWT/template
new file mode 100644
index 00000000000..6f0830125c1
--- /dev/null
+++ b/srcpkgs/python3-PyJWT/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-PyJWT'
+pkgname=python3-PyJWT
+version=1.7.1
+revision=1
+wrksrc="PyJWT-${version}"
+build_style=python3-module
+pycompile_module="PyJWT.py"
+hostmakedepends="python3-setuptools"
+short_desc="Platform independent file lock"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="Unlicense"
+homepage="https://filelock.readthedocs.io/en/latest/"
+distfiles="${PYPI_SITE}/P/PyJWT/PyJWT-${version}.tar.gz"
+checksum=8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96

From ab97db37fa3bc46df80ca4d0eadc7347b8342418 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 13 Sep 2019 10:41:04 +1000
Subject: [PATCH 2/2] buildbot: update to 2.4.1

---
 srcpkgs/buildbot/patches/terse-irc.patch | 38 ------------------------
 srcpkgs/buildbot/template                | 27 +++++------------
 2 files changed, 8 insertions(+), 57 deletions(-)
 delete mode 100644 srcpkgs/buildbot/patches/terse-irc.patch

diff --git a/srcpkgs/buildbot/patches/terse-irc.patch b/srcpkgs/buildbot/patches/terse-irc.patch
deleted file mode 100644
index 5036cd9ebfe..00000000000
--- a/srcpkgs/buildbot/patches/terse-irc.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- buildbot/status/words.py.orig
-+++ buildbot/status/words.py
-@@ -439,9 +439,9 @@
-         self.send(r)
- 
-     results_descriptions = {
--        SUCCESS: ("Success", 'GREEN'),
--        WARNINGS: ("Warnings", 'YELLOW'),
--        FAILURE: ("Failure", 'RED'),
-+        SUCCESS: ("OK", 'GREEN'),
-+        WARNINGS: ("Warn", 'YELLOW'),
-+        FAILURE: ("Fail", 'RED'),
-         EXCEPTION: ("Exception", 'PURPLE'),
-         RETRY: ("Retry", 'AQUA_LIGHT'),
-     }
-@@ -466,19 +466,18 @@
-         results = self.getResultsDescriptionAndColor(build.getResults())
-         if self.reportBuild(builder_name, buildnum):
-             if self.useRevisions:
--                r = "build containing revision(s) [%s] on %s is complete: %s" % \
-+                r = "%s/%s: %s" % \
-                     (buildrevs, builder_name, results[0])
-             else:
-                 r = "build #%d of %s is complete: %s" % \
-                     (buildnum, builder_name, results[0])
- 
--            r += ' [%s]' % maybeColorize(" ".join(build.getText()), results[1], self.useColors)
-             buildurl = self.bot.status.getURLForThing(build)
-             if buildurl:
--                r += "  Build details are at %s" % buildurl
-+                r += ": %s" % buildurl
- 
-             if self.bot.showBlameList and build.getResults() != SUCCESS and len(build.changes) != 0:
--                r += '  blamelist: ' + ', '.join(list(set([c.who for c in build.changes])))
-+                r += '  blame: ' + ', '.join(list(set([c.who for c in build.changes])))
- 
-             self.send(r)
- 
diff --git a/srcpkgs/buildbot/template b/srcpkgs/buildbot/template
index c753cd7c502..c5f52759cc9 100644
--- a/srcpkgs/buildbot/template
+++ b/srcpkgs/buildbot/template
@@ -1,27 +1,16 @@
 # Template file for 'buildbot'
 pkgname=buildbot
-version=0.8.14
-revision=3
+version=2.4.1
+revision=1
 archs=noarch
-build_style=python2-module
+build_style=python3-module
 pycompile_module="buildbot"
 pycompile_dirs="usr/share/buildbot/contrib"
-hostmakedepends="python"
-depends="python-setuptools python-dateutil python-Jinja2 python-sqlalchemy-migrate python-Twisted"
-short_desc="A system to automate the compile/test cycle"
+hostmakedepends="python3 python3-setuptools"
+depends="python3-autobahn python3-dateutil python3-Jinja2 python3-PyJWT python3-sqlalchemy-migrate python3-Twisted"
+short_desc="System to automate the compile/test cycle"
 maintainer="Orphaned <orphan@voidlinux.org>"
+license="GPL-2.0-only"
 homepage="https://buildbot.net/"
-license="GPL-2"
 distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=331efd07bd7522c222a8fb258801e8d78332c88d778ee76416b9e1028676e964
-
-pre_install() {
-	sed -i 's,#!/usr/bin/env jython,#!/usr/bin/python2,' contrib/run_maxq.py
-}
-post_install() {
-	# Install all contrib modules.
-	local contribdir=${DESTDIR}/usr/share/buildbot/contrib
-
-	vmkdir usr/share/buildbot/contrib
-	install -m755 ${wrksrc}/contrib/*.py ${contribdir}
-}
+checksum=a8330baef61bd9035a9f51a717a28706a4374222f4781d2c22bbbc3ae3b91a6b