python/buildbot: updated for version 3.4.1 and python3

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

3 files changed, 65 insertions, 26 deletions

diff --git a/python/buildbot/README b/python/buildbot/README
index 6e3d4e8b32..c8c4221914 100644
--- a/python/buildbot/README
+++ b/python/buildbot/README
@@ -11,4 +11,4 @@ lint checks, image size, compile time, and other build parameters can be
 tracked over time, are more visible, and are therefore easier to
 improve.
 
-See also buildbot-slave (the slave component of BuildBot).
+See also buildbot-worker (the worker component of BuildBot).
diff --git a/python/buildbot/buildbot.SlackBuild b/python/buildbot/buildbot.SlackBuild
index ba5f6128b0..957e4b2407 100644
--- a/python/buildbot/buildbot.SlackBuild
+++ b/python/buildbot/buildbot.SlackBuild
@@ -1,9 +1,8 @@
 #!/bin/bash
 
-# Slackware build script for buildbot
+# Slackware build script for python3 buildbot
 
-# Copyright 2021 Yth | Pont-en-Royans, France | yth@ythogtha.org
-# Copyright 2016 David Spencer, Baildon, West Yorkshire, U.K.
+# Copyright 2022 Yth | Pont-en-Royans, France | yth@ythogtha.org
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -12,21 +11,24 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=buildbot
-VERSION=${VERSION:-0.8.14}
+SRCNAM=${PRGNAM#python-*}
+# "pkg" stays first
+PACKAGES="pkg www console-view grid-view waterfall-view badges wsgi-dashboards"
+VERSION=${VERSION:-3.4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -70,9 +72,13 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+mkdir $SRCNAM-$VERSION
+cd $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+for pkg in $PACKAGES; do
+  tar xvf $CWD/$SRCNAM-$pkg-$VERSION.tar.gz
+done
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -80,19 +86,38 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python2 setup.py install --root=$PKG
+cd $SRCNAM-$VERSION
+python3 setup.py install --root=$PKG
+cd ..
+# Packages needs the buildbot-pkg package to be available
+# Using the one from the installation (first one to be built)
+OLD_PYTHONPATH=$PYTHONPATH
+export PYTHONPATH=$(find $PKG -type d -name site-packages)
+for pkg in $PACKAGES; do
+  cd $SRCNAM-$pkg-$VERSION
+  python3 setup.py install --root=$PKG
+  cd ..
+done
+export PYTHONPATH=$OLD_PYTHONPATH
+unset OLD_PYTHONPATH
 
+cd $SRCNAM-$VERSION
 mkdir -p $PKG/usr/man/man1
 gzip -9 < docs/buildbot.1 > $PKG/usr/man/man1/buildbot.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  COPYING CREDITS NEWS README UPGRADING \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+   docs/ COPYING* NEWS* PKG-INFO* README* UPGRADING* \
+   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cd ..
+
+for pkg in $PACKAGES; do
+  cp $SRCNAM-$pkg-$VERSION/PKG-INFO $PKG/usr/doc/$PRGNAM-$VERSION/PKG-INFO-$pkg
+done
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/python/buildbot/buildbot.info b/python/buildbot/buildbot.info
index f50db475eb..3bdf74e42e 100644
--- a/python/buildbot/buildbot.info
+++ b/python/buildbot/buildbot.info
@@ -1,10 +1,24 @@
 PRGNAM="buildbot"
-VERSION="0.8.14"
-HOMEPAGE="http://buildbot.net/"
-DOWNLOAD="https://pypi.python.org/packages/39/19/c8f8845d302b7df9d44a86a00911ccd12c0f8835bd6c562ae57b826fda29/buildbot-0.8.14.tar.gz"
-MD5SUM="a915481515675800448d3e6a99a15e14"
+VERSION="3.4.1"
+HOMEPAGE="https://buildbot.net/"
+DOWNLOAD="https://pypi.python.org/packages/source/b/buildbot/buildbot-3.4.1.tar.gz \
+          https://pypi.python.org/packages/source/b/buildbot-pkg/buildbot-pkg-3.4.1.tar.gz \
+          https://pypi.python.org/packages/source/b/buildbot-www/buildbot-www-3.4.1.tar.gz \
+          https://pypi.python.org/packages/source/b/buildbot-console-view/buildbot-console-view-3.4.1.tar.gz \
+          https://pypi.python.org/packages/source/b/buildbot-grid-view/buildbot-grid-view-3.4.1.tar.gz \
+          https://pypi.python.org/packages/source/b/buildbot-waterfall-view/buildbot-waterfall-view-3.4.1.tar.gz \
+	  https://pypi.python.org/packages/source/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.1.tar.gz \
+	  https://pypi.python.org/packages/source/b/buildbot-badges/buildbot-badges-3.4.1.tar.gz"
+MD5SUM="3ab72220d09f5db25cd5b891ee5e7d0b \
+        ac3970c9c93450979a986aaa9791c7f7 \
+        23c60c7b65d12dce5de3ffdf779d9322 \
+        630ef1f6ddcf848a4c12bf9436a2546a \
+        beaca67b6e10a09f8c092bae37b97af3 \
+        4a4de008755a06f10a9900ec337688c8 \
+        318c3d02b7715cf1c60795b241adae84 \
+        cb69c54aa1d8d70bb4ac395648daadc3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python2-dateutil sqlalchemy-migrate sqlparse python2-twisted"
+REQUIRES="python-twisted python-autobahn python-pyjwt python3-dateutil greenlet typing-extensions SQLAlchemy"
 MAINTAINER="Yth - Arnaud"
 EMAIL="yth@ythogtha.org"