devel/py-buildbot*: Update to 3.4.1

* This also should fix the regression caused after the switch from
  py-sqlalchemy12 to py-sqlalchemy14 in e3f7785e17.

Changelog since 2.10.5:

https://github.com/buildbot/buildbot/blob/v3.4.1/master/docs/relnotes/index.rst

PR:		259599
Reviewed by:	koobs (maintainer)
Approved by:	koobs (maintainer, implicit: MAINTAINER_POLICY)
MFH:		2022Q1 (fix regression with py-sqlalchemy14)
This commit is contained in:
Tomoyuki Sakurai 2022-02-25 07:36:21 +01:00 committed by Kai Knoblich
parent 6afa6b62b0
commit 81cb513d26
15 changed files with 49 additions and 43 deletions

View file

@ -1,7 +1,7 @@
# Created by: Michael Gmelin <grembo@FreeBSD.org>
PORTNAME= buildbot-console-view
PORTVERSION= 2.10.5
PORTVERSION= 3.4.1
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1620730133
SHA256 (buildbot-console-view-2.10.5.tar.gz) = 0cd0d288a4cc6b0a5a581a256b2698ec3af9b100daeb804fdabef8e7ec7a3a76
SIZE (buildbot-console-view-2.10.5.tar.gz) = 18740
TIMESTAMP = 1645059655
SHA256 (buildbot-console-view-3.4.1.tar.gz) = 42e57cd3c5a0f5ea428237a1b9468c2822cb4cb7c525558174a3f2f2c65f0588
SIZE (buildbot-console-view-3.4.1.tar.gz) = 18730

View file

@ -1,5 +1,5 @@
PORTNAME= buildbot-grid-view
PORTVERSION= 2.10.5
PORTVERSION= 3.4.1
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1620730164
SHA256 (buildbot-grid-view-2.10.5.tar.gz) = a11203ce066ed8fa1f37558280c17091332cca9aa4645a37695d692c1074a0bc
SIZE (buildbot-grid-view-2.10.5.tar.gz) = 13712
TIMESTAMP = 1645059817
SHA256 (buildbot-grid-view-3.4.1.tar.gz) = 70d629b44a7df2969d6f2a18d439996e96840fb3b9a5f724f68323b2de111e72
SIZE (buildbot-grid-view-3.4.1.tar.gz) = 13700

View file

@ -1,7 +1,7 @@
# Created by: Michael Gmelin <grembo@FreeBSD.org>
PORTNAME= buildbot-pkg
PORTVERSION= 2.10.5
PORTVERSION= 3.4.1
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1620730187
SHA256 (buildbot-pkg-2.10.5.tar.gz) = 479594ef245f1d27cd936e09c0e9b9bb54d52f19f04464a8837037be78a44b53
SIZE (buildbot-pkg-2.10.5.tar.gz) = 4783
TIMESTAMP = 1645059450
SHA256 (buildbot-pkg-3.4.1.tar.gz) = 0366b9ac42f930df6396ee6f5675082b1f666b61fac2e2405a392a2e942071f7
SIZE (buildbot-pkg-3.4.1.tar.gz) = 4807

View file

@ -1,7 +1,7 @@
# Created by: Michael Gmelin <grembo@FreeBSD.org>
PORTNAME= buildbot-waterfall-view
PORTVERSION= 2.10.5
PORTVERSION= 3.4.1
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1620730206
SHA256 (buildbot-waterfall-view-2.10.5.tar.gz) = 3ea4fa216a0d5d8e642ec78be4cf2b57d8ae17889664307ca7bdc23e1c557f44
SIZE (buildbot-waterfall-view-2.10.5.tar.gz) = 191704
TIMESTAMP = 1645059883
SHA256 (buildbot-waterfall-view-3.4.1.tar.gz) = a7c3d141a5ab3dbeb746b17816d4d7eb9a8cdc77732381a5e2d474cd33811442
SIZE (buildbot-waterfall-view-3.4.1.tar.gz) = 192451

View file

@ -1,7 +1,7 @@
# Created by: Frederic Praca <frederic.praca@freebsd-fr.org>
PORTNAME= buildbot-worker
PORTVERSION= 2.10.5
PORTVERSION= 3.4.1
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -21,10 +21,17 @@ USE_PYTHON= autoplist concurrent distutils
USE_RC_SUBR= buildbot-worker
SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} PYTHON_VER=${PYTHON_VER}
BUILDBOT_REMOVE_ME= ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/buildbot_worker
NO_ARCH= yes
PLIST_FILES= man/man1/buildbot-worker.1.gz
POST_PLIST+= fix-plist
# XXX fixup plist. see:
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=205056
fix-plist:
${REINPLACE_CMD} -e 's|^${BUILDBOT_REMOVE_ME}$$||' ${TMPPLIST}
post-install:
${INSTALL_MAN} ${WRKSRC}/docs/buildbot-worker.1 ${STAGEDIR}${MANPREFIX}/man/man1

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1620730224
SHA256 (buildbot-worker-2.10.5.tar.gz) = ae9af1fa992915538c38d5e8067922d1a1a57114e45ca789cbc6a422de1feae1
SIZE (buildbot-worker-2.10.5.tar.gz) = 108798
TIMESTAMP = 1645059919
SHA256 (buildbot-worker-3.4.1.tar.gz) = f70754be9d34bee3fba5e27e3a8e20b872df233d18587c29eaaff394a38ea178
SIZE (buildbot-worker-3.4.1.tar.gz) = 103123

View file

@ -1,7 +1,7 @@
# Created by: Michael Gmelin <grembo@FreeBSD.org>
PORTNAME= buildbot-www
PORTVERSION= 2.10.5
PORTVERSION= 3.4.1
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1620730243
SHA256 (buildbot-www-2.10.5.tar.gz) = 47f3665a90224a3523684306fca60c7726e5d8b93e91ef5608e3402b2ce5ab76
SIZE (buildbot-www-2.10.5.tar.gz) = 3180604
TIMESTAMP = 1645059947
SHA256 (buildbot-www-3.4.1.tar.gz) = 1e5cb577051b59b947a0ffae7e3c72cf86e85dbcbc9317854872cc1dc0a9735a
SIZE (buildbot-www-3.4.1.tar.gz) = 3182413

View file

@ -1,8 +1,7 @@
# Created by: Koop Mast <kwm@FreeBSD.org>
PORTNAME= buildbot
PORTVERSION= 2.10.5
PORTREVISION= 3
PORTVERSION= 3.4.1
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -17,13 +16,13 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:devel/py-Jinja2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}autobahn>=0.16.0:www/py-autobahn@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}twisted>=17.9.0:devel/py-twisted@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.1:devel/py-zope.interface@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.2.0<1.5:databases/py-sqlalchemy14@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.13:databases/py-sqlalchemy-migrate@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.3.0<1.5:databases/py-sqlalchemy14@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}txaio>=2.2.2:devel/py-txaio@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}alembic>=1.6.0:databases/py-alembic@${PY_FLAVOR}
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}txrequests>0:www/py-txrequests@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
@ -42,6 +41,17 @@ SUB_LIST= PYTHON_CMD=${PYTHON_CMD} PYTHON_VER=${PYTHON_VER}
NO_ARCH= yes
# the directory was removed, but MANIFEST.in still references it
# https://github.com/buildbot/buildbot/commit/9251a994e7ba5f8ab9e678b49920bdc38cd52b3d
BUILDBOT_REMOVE_ME= ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/buildbot/reporters/templates
POST_PLIST+= fix-plist
fix-plist:
${REINPLACE_CMD} -e 's|^${BUILDBOT_REMOVE_ME}$$||' ${TMPPLIST}
post-install:
${RM} -r ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/buildbot/reporters/templates
do-test:
@cd ${WRKSRC} && PYTHONPATH=${WRKSRC} TZ=UTC ${LOCALBASE}/bin/trial-${PYTHON_VER} buildbot

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1620730101
SHA256 (buildbot-2.10.5.tar.gz) = 4675aa52a2b5642a9f3c4a5d2a4e1eaaa7d42da161aee78aeb8ed2e99351f2f5
SIZE (buildbot-2.10.5.tar.gz) = 2276252
TIMESTAMP = 1645060080
SHA256 (buildbot-3.4.1.tar.gz) = 1a628ca9e8c78ed12212d9597dfcdeecf18d8d5c14281fd972f5202780e87834
SIZE (buildbot-3.4.1.tar.gz) = 2447498

View file

@ -1,11 +0,0 @@
--- setup.py.orig 2021-04-05 11:58:43 UTC
+++ setup.py
@@ -496,7 +496,7 @@ setup_args['install_requires'] = [
'Jinja2 >= 2.1',
# required for tests, but Twisted requires this anyway
'zope.interface >= 4.1.1',
- 'sqlalchemy >= 1.2.0, < 1.4',
+ 'sqlalchemy >= 1.2.0, < 1.5',
'sqlalchemy-migrate>=0.13',
'python-dateutil>=1.5',
'txaio ' + txaio_ver,