Attachment #231882 for bug #259599

View | Details | Raw Unified | Return to bug 259599
Collapse All | Expand All

Lines 1-7 Link Here

(-)b/devel/py-buildbot-console-view/Makefile (-1 / +1 lines)
1	# Created by: Michael Gmelin <grembo@FreeBSD.org>	1	# Created by: Michael Gmelin <grembo@FreeBSD.org>
2		2
3	PORTNAME= buildbot-console-view	3	PORTNAME= buildbot-console-view
4	PORTVERSION= 2.10.5	4	PORTVERSION= 3.4.1
5	CATEGORIES= devel python	5	CATEGORIES= devel python
6	MASTER_SITES= CHEESESHOP	6	MASTER_SITES= CHEESESHOP
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

Lines 1-3 Link Here

(-)b/devel/py-buildbot-console-view/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1620730133	1	TIMESTAMP = 1645059655
2	SHA256 (buildbot-console-view-2.10.5.tar.gz) = 0cd0d288a4cc6b0a5a581a256b2698ec3af9b100daeb804fdabef8e7ec7a3a76	2	SHA256 (buildbot-console-view-3.4.1.tar.gz) = 42e57cd3c5a0f5ea428237a1b9468c2822cb4cb7c525558174a3f2f2c65f0588
3	SIZE (buildbot-console-view-2.10.5.tar.gz) = 18740	3	SIZE (buildbot-console-view-3.4.1.tar.gz) = 18730

Lines 1-5 Link Here

(-)b/devel/py-buildbot-grid-view/Makefile (-1 / +1 lines)
1	PORTNAME= buildbot-grid-view	1	PORTNAME= buildbot-grid-view
2	PORTVERSION= 2.10.5	2	PORTVERSION= 3.4.1
3	CATEGORIES= devel python	3	CATEGORIES= devel python
4	MASTER_SITES= CHEESESHOP	4	MASTER_SITES= CHEESESHOP
5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

Lines 1-3 Link Here

(-)b/devel/py-buildbot-grid-view/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1620730164	1	TIMESTAMP = 1645059817
2	SHA256 (buildbot-grid-view-2.10.5.tar.gz) = a11203ce066ed8fa1f37558280c17091332cca9aa4645a37695d692c1074a0bc	2	SHA256 (buildbot-grid-view-3.4.1.tar.gz) = 70d629b44a7df2969d6f2a18d439996e96840fb3b9a5f724f68323b2de111e72
3	SIZE (buildbot-grid-view-2.10.5.tar.gz) = 13712	3	SIZE (buildbot-grid-view-3.4.1.tar.gz) = 13700

Lines 1-7 Link Here

(-)b/devel/py-buildbot-pkg/Makefile (-1 / +1 lines)
1	# Created by: Michael Gmelin <grembo@FreeBSD.org>	1	# Created by: Michael Gmelin <grembo@FreeBSD.org>
2		2
3	PORTNAME= buildbot-pkg	3	PORTNAME= buildbot-pkg
4	PORTVERSION= 2.10.5	4	PORTVERSION= 3.4.1
5	CATEGORIES= devel python	5	CATEGORIES= devel python
6	MASTER_SITES= CHEESESHOP	6	MASTER_SITES= CHEESESHOP
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

Lines 1-3 Link Here

(-)b/devel/py-buildbot-pkg/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1620730187	1	TIMESTAMP = 1645059450
2	SHA256 (buildbot-pkg-2.10.5.tar.gz) = 479594ef245f1d27cd936e09c0e9b9bb54d52f19f04464a8837037be78a44b53	2	SHA256 (buildbot-pkg-3.4.1.tar.gz) = 0366b9ac42f930df6396ee6f5675082b1f666b61fac2e2405a392a2e942071f7
3	SIZE (buildbot-pkg-2.10.5.tar.gz) = 4783	3	SIZE (buildbot-pkg-3.4.1.tar.gz) = 4807

Lines 1-7 Link Here

(-)b/devel/py-buildbot-waterfall-view/Makefile (-1 / +1 lines)
1	# Created by: Michael Gmelin <grembo@FreeBSD.org>	1	# Created by: Michael Gmelin <grembo@FreeBSD.org>
2		2
3	PORTNAME= buildbot-waterfall-view	3	PORTNAME= buildbot-waterfall-view
4	PORTVERSION= 2.10.5	4	PORTVERSION= 3.4.1
5	CATEGORIES= devel python	5	CATEGORIES= devel python
6	MASTER_SITES= CHEESESHOP	6	MASTER_SITES= CHEESESHOP
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

Lines 1-3 Link Here

(-)b/devel/py-buildbot-waterfall-view/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1620730206	1	TIMESTAMP = 1645059883
2	SHA256 (buildbot-waterfall-view-2.10.5.tar.gz) = 3ea4fa216a0d5d8e642ec78be4cf2b57d8ae17889664307ca7bdc23e1c557f44	2	SHA256 (buildbot-waterfall-view-3.4.1.tar.gz) = a7c3d141a5ab3dbeb746b17816d4d7eb9a8cdc77732381a5e2d474cd33811442
3	SIZE (buildbot-waterfall-view-2.10.5.tar.gz) = 191704	3	SIZE (buildbot-waterfall-view-3.4.1.tar.gz) = 192451




# Created by: Frederic Praca <frederic.praca@freebsd-fr.org>

PORTNAME=	buildbot-worker
PORTVERSION=	3.4.1
CATEGORIES=	devel python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

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

Lines 1-3 Link Here

(-)b/devel/py-buildbot-worker/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1620730224	1	TIMESTAMP = 1645059919
2	SHA256 (buildbot-worker-2.10.5.tar.gz) = ae9af1fa992915538c38d5e8067922d1a1a57114e45ca789cbc6a422de1feae1	2	SHA256 (buildbot-worker-3.4.1.tar.gz) = f70754be9d34bee3fba5e27e3a8e20b872df233d18587c29eaaff394a38ea178
3	SIZE (buildbot-worker-2.10.5.tar.gz) = 108798	3	SIZE (buildbot-worker-3.4.1.tar.gz) = 103123

Lines 1-7 Link Here

(-)b/devel/py-buildbot-www/Makefile (-1 / +1 lines)
1	# Created by: Michael Gmelin <grembo@FreeBSD.org>	1	# Created by: Michael Gmelin <grembo@FreeBSD.org>
2		2
3	PORTNAME= buildbot-www	3	PORTNAME= buildbot-www
4	PORTVERSION= 2.10.5	4	PORTVERSION= 3.4.1
5	CATEGORIES= devel python	5	CATEGORIES= devel python
6	MASTER_SITES= CHEESESHOP	6	MASTER_SITES= CHEESESHOP
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

Lines 1-3 Link Here

(-)b/devel/py-buildbot-www/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1620730243	1	TIMESTAMP = 1645059947
2	SHA256 (buildbot-www-2.10.5.tar.gz) = 47f3665a90224a3523684306fca60c7726e5d8b93e91ef5608e3402b2ce5ab76	2	SHA256 (buildbot-www-3.4.1.tar.gz) = 1e5cb577051b59b947a0ffae7e3c72cf86e85dbcbc9317854872cc1dc0a9735a
3	SIZE (buildbot-www-2.10.5.tar.gz) = 3180604	3	SIZE (buildbot-www-3.4.1.tar.gz) = 3182413




# Created by: Koop Mast <kwm@FreeBSD.org>

PORTNAME=	buildbot
PORTVERSION=	3.4.1
PORTREVISION=	3
CATEGORIES=	devel python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

		${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.3.0<1.5:databases/py-sqlalchemy14@${PY_FLAVOR} \
		${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.13:databases/py-sqlalchemy-migrate@${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}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} \


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


Lines 1-3 Link Here

(-)b/devel/py-buildbot/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1620730101	1	TIMESTAMP = 1645060080
2	SHA256 (buildbot-2.10.5.tar.gz) = 4675aa52a2b5642a9f3c4a5d2a4e1eaaa7d42da161aee78aeb8ed2e99351f2f5	2	SHA256 (buildbot-3.4.1.tar.gz) = 1a628ca9e8c78ed12212d9597dfcdeecf18d8d5c14281fd972f5202780e87834
3	SIZE (buildbot-2.10.5.tar.gz) = 2276252	3	SIZE (buildbot-3.4.1.tar.gz) = 2447498

Removed Link Here

(-)a/devel/py-buildbot/files/patch-setup.py (-11 lines)
1	--- setup.py.orig 2021-04-05 11:58:43 UTC
2	+++ setup.py
3	@@ -496,7 +496,7 @@ setup_args['install_requires'] = [
4	'Jinja2 >= 2.1',
5	# required for tests, but Twisted requires this anyway
6	'zope.interface >= 4.1.1',
7	- 'sqlalchemy >= 1.2.0, < 1.4',
8	+ 'sqlalchemy >= 1.2.0, < 1.5',
9	'sqlalchemy-migrate>=0.13',
10	'python-dateutil>=1.5',
11	'txaio ' + txaio_ver,

Return to bug 259599

Lines 1-7 Link Here

(-)b/devel/py-buildbot-worker/Makefile (-1 / +8 lines)
1	# Created by: Frederic Praca <frederic.praca@freebsd-fr.org>	1	# Created by: Frederic Praca <frederic.praca@freebsd-fr.org>
2		2
3	PORTNAME= buildbot-worker	3	PORTNAME= buildbot-worker
4	PORTVERSION= 2.10.5	4	PORTVERSION= 3.4.1
5	CATEGORIES= devel python	5	CATEGORIES= devel python
6	MASTER_SITES= CHEESESHOP	6	MASTER_SITES= CHEESESHOP
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 21-30 USE_PYTHON= autoplist concurrent distutils Link Here
21	USE_RC_SUBR= buildbot-worker	21	USE_RC_SUBR= buildbot-worker
22		22
23	SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} PYTHON_VER=${PYTHON_VER}	23	SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} PYTHON_VER=${PYTHON_VER}
		24	BUILDBOT_REMOVE_ME= ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/buildbot_worker
24		25
25	NO_ARCH= yes	26	NO_ARCH= yes
26		27
27	PLIST_FILES= man/man1/buildbot-worker.1.gz	28	PLIST_FILES= man/man1/buildbot-worker.1.gz
		29	POST_PLIST+= fix-plist
		30
		31	# XXX fixup plist. see:
		32	# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=205056
		33	fix-plist:
		34	${REINPLACE_CMD} -e 's\|^${BUILDBOT_REMOVE_ME}$$\|\|' ${TMPPLIST}
28		35
29	post-install:	36	post-install:
30	${INSTALL_MAN} ${WRKSRC}/docs/buildbot-worker.1 ${STAGEDIR}${MANPREFIX}/man/man1	37	${INSTALL_MAN} ${WRKSRC}/docs/buildbot-worker.1 ${STAGEDIR}${MANPREFIX}/man/man1

Lines 1-8 Link Here

(-)b/devel/py-buildbot/Makefile (-5 / +15 lines)
1	# Created by: Koop Mast <kwm@FreeBSD.org>	1	# Created by: Koop Mast <kwm@FreeBSD.org>
2		2
3	PORTNAME= buildbot	3	PORTNAME= buildbot
4	PORTVERSION= 2.10.5	4	PORTVERSION= 3.4.1
5	PORTREVISION= 3
6	CATEGORIES= devel python	5	CATEGORIES= devel python
7	MASTER_SITES= CHEESESHOP	6	MASTER_SITES= CHEESESHOP
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Lines 17-29 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:devel/py-Jinja2@${PY_FLAVOR} \ Link Here
17	${PYTHON_PKGNAMEPREFIX}autobahn>=0.16.0:www/py-autobahn@${PY_FLAVOR} \	16	${PYTHON_PKGNAMEPREFIX}autobahn>=0.16.0:www/py-autobahn@${PY_FLAVOR} \
18	${PYTHON_PKGNAMEPREFIX}twisted>=17.9.0:devel/py-twisted@${PY_FLAVOR} \	17	${PYTHON_PKGNAMEPREFIX}twisted>=17.9.0:devel/py-twisted@${PY_FLAVOR} \
19	${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.1:devel/py-zope.interface@${PY_FLAVOR} \	18	${PYTHON_PKGNAMEPREFIX}zope.interface>=4.1.1:devel/py-zope.interface@${PY_FLAVOR} \
20	${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.2.0<1.5:databases/py-sqlalchemy14@${PY_FLAVOR} \	19	${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.3.0<1.5:databases/py-sqlalchemy14@${PY_FLAVOR} \
21	${PYTHON_PKGNAMEPREFIX}sqlalchemy-migrate>=0.13:databases/py-sqlalchemy-migrate@${PY_FLAVOR} \
22	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${PY_FLAVOR} \	20	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${PY_FLAVOR} \
23	${PYTHON_PKGNAMEPREFIX}txaio>=2.2.2:devel/py-txaio@${PY_FLAVOR} \	21	${PYTHON_PKGNAMEPREFIX}txaio>=2.2.2:devel/py-txaio@${PY_FLAVOR} \
24	${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \	22	${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \
25	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \	23	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
26	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}	24	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
		25	${PYTHON_PKGNAMEPREFIX}alembic>=1.6.0:databases/py-alembic@${PY_FLAVOR}
27	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq@${PY_FLAVOR} \	26	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}treq>0:www/py-treq@${PY_FLAVOR} \
28	${PYTHON_PKGNAMEPREFIX}txrequests>0:www/py-txrequests@${PY_FLAVOR} \	27	${PYTHON_PKGNAMEPREFIX}txrequests>0:www/py-txrequests@${PY_FLAVOR} \
29	${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \	28	${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
Lines 42-47 SUB_LIST= PYTHON_CMD=${PYTHON_CMD} PYTHON_VER=${PYTHON_VER} Link Here
42		41
43	NO_ARCH= yes	42	NO_ARCH= yes
44		43
		44	# the directory was removed, but MANIFEST.in still references it
		45	# https://github.com/buildbot/buildbot/commit/9251a994e7ba5f8ab9e678b49920bdc38cd52b3d
		46	BUILDBOT_REMOVE_ME= ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/buildbot/reporters/templates
		47	POST_PLIST+= fix-plist
		48
		49	fix-plist:
		50	${REINPLACE_CMD} -e 's\|^${BUILDBOT_REMOVE_ME}$$\|\|' ${TMPPLIST}
		51
		52	post-install:
		53	${RM} -r ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/buildbot/reporters/templates
		54
45	do-test:	55	do-test:
46	@cd ${WRKSRC} && PYTHONPATH=${WRKSRC} TZ=UTC ${LOCALBASE}/bin/trial-${PYTHON_VER} buildbot	56	@cd ${WRKSRC} && PYTHONPATH=${WRKSRC} TZ=UTC ${LOCALBASE}/bin/trial-${PYTHON_VER} buildbot
47		57