diff --git a/devel/py-buildbot-console-view/Makefile b/devel/py-buildbot-console-view/Makefile index 3ccbe4a7e2c7..3080db431d31 100644 --- a/devel/py-buildbot-console-view/Makefile +++ b/devel/py-buildbot-console-view/Makefile @@ -1,23 +1,23 @@ # Created by: Michael Gmelin PORTNAME= buildbot-console-view -PORTVERSION= 2.10.5 +PORTVERSION= 3.4.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= koobs@FreeBSD.org COMMENT= Buildbot Console View plugin LICENSE= GPLv2 #LICENSE_FILE= Not packaged in sdist BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= autoplist distutils NO_ARCH= yes .include diff --git a/devel/py-buildbot-console-view/distinfo b/devel/py-buildbot-console-view/distinfo index 66ead39eec80..4df3bb3d4f2b 100644 --- a/devel/py-buildbot-console-view/distinfo +++ b/devel/py-buildbot-console-view/distinfo @@ -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 diff --git a/devel/py-buildbot-grid-view/Makefile b/devel/py-buildbot-grid-view/Makefile index 073bdc7bb049..07e4efb2dea1 100644 --- a/devel/py-buildbot-grid-view/Makefile +++ b/devel/py-buildbot-grid-view/Makefile @@ -1,21 +1,21 @@ PORTNAME= buildbot-grid-view -PORTVERSION= 2.10.5 +PORTVERSION= 3.4.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= koobs@FreeBSD.org COMMENT= Buildbot Grid View plugin LICENSE= GPLv2 #LICENSE_FILE= Not packaged in sdist BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= autoplist distutils NO_ARCH= yes .include diff --git a/devel/py-buildbot-grid-view/distinfo b/devel/py-buildbot-grid-view/distinfo index 823d51b11851..b78cc0f356a5 100644 --- a/devel/py-buildbot-grid-view/distinfo +++ b/devel/py-buildbot-grid-view/distinfo @@ -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 diff --git a/devel/py-buildbot-pkg/Makefile b/devel/py-buildbot-pkg/Makefile index 5afcd7b1116f..014cd9a4988a 100644 --- a/devel/py-buildbot-pkg/Makefile +++ b/devel/py-buildbot-pkg/Makefile @@ -1,20 +1,20 @@ # Created by: Michael Gmelin PORTNAME= buildbot-pkg -PORTVERSION= 2.10.5 +PORTVERSION= 3.4.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= koobs@FreeBSD.org COMMENT= Buildbot packaging tools LICENSE= GPLv2 #LICENSE_FILE= Not packaged in sdist USES= python:3.5+ USE_PYTHON= autoplist distutils NO_ARCH= yes .include diff --git a/devel/py-buildbot-pkg/distinfo b/devel/py-buildbot-pkg/distinfo index 7c18de26fbae..b8ce4bbe99b7 100644 --- a/devel/py-buildbot-pkg/distinfo +++ b/devel/py-buildbot-pkg/distinfo @@ -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 diff --git a/devel/py-buildbot-waterfall-view/Makefile b/devel/py-buildbot-waterfall-view/Makefile index c22c7adce5d2..aa8b7dc99ef8 100644 --- a/devel/py-buildbot-waterfall-view/Makefile +++ b/devel/py-buildbot-waterfall-view/Makefile @@ -1,23 +1,23 @@ # Created by: Michael Gmelin PORTNAME= buildbot-waterfall-view -PORTVERSION= 2.10.5 +PORTVERSION= 3.4.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= koobs@FreeBSD.org COMMENT= Buildbot Waterfall View plugin LICENSE= GPLv2 #LICENSE_FILE= Not packaged in sdist BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= autoplist distutils NO_ARCH= yes .include diff --git a/devel/py-buildbot-waterfall-view/distinfo b/devel/py-buildbot-waterfall-view/distinfo index 58364bc9466f..6a1c13df07bb 100644 --- a/devel/py-buildbot-waterfall-view/distinfo +++ b/devel/py-buildbot-waterfall-view/distinfo @@ -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 diff --git a/devel/py-buildbot-worker/Makefile b/devel/py-buildbot-worker/Makefile index 01df64b13844..f1b54feb270d 100644 --- a/devel/py-buildbot-worker/Makefile +++ b/devel/py-buildbot-worker/Makefile @@ -1,36 +1,43 @@ # Created by: Frederic Praca PORTNAME= buildbot-worker -PORTVERSION= 2.10.5 +PORTVERSION= 3.4.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= koobs@FreeBSD.org COMMENT= Buildbot Worker Daemon LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>=17.9.0:devel/py-twisted@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} USES= python:3.6+ 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 do-test: ${MKDIR} ${WRKDIR}/tmp cd ${WRKDIR}/tmp && PYTHONPATH=${WRKSRC} ${PYTHON_CMD} -m twisted.trial buildbot_worker.test .include diff --git a/devel/py-buildbot-worker/distinfo b/devel/py-buildbot-worker/distinfo index 9d16764d8429..8abe67d2d699 100644 --- a/devel/py-buildbot-worker/distinfo +++ b/devel/py-buildbot-worker/distinfo @@ -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 diff --git a/devel/py-buildbot-www/Makefile b/devel/py-buildbot-www/Makefile index 14b1543ceda2..31664fc20d66 100644 --- a/devel/py-buildbot-www/Makefile +++ b/devel/py-buildbot-www/Makefile @@ -1,28 +1,28 @@ # Created by: Michael Gmelin PORTNAME= buildbot-www -PORTVERSION= 2.10.5 +PORTVERSION= 3.4.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= koobs@FreeBSD.org COMMENT= Buildbot UI LICENSE= GPLv2 #LICENSE_FILE= Not packaged in sdist BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot>=${PORTVERSION}:devel/py-buildbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>=${PORTVERSION}:devel/py-buildbot-pkg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}buildbot-console-view>=${PORTVERSION}:devel/py-buildbot-console-view@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}buildbot-grid-view>=${PORTVERSION}:devel/py-buildbot-grid-view@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}buildbot-waterfall-view>=${PORTVERSION}:devel/py-buildbot-waterfall-view@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}service_identity>=16.0.0:security/py-service_identity@${PY_FLAVOR} USES= python:3.5+ USE_PYTHON= autoplist distutils NO_ARCH= yes .include diff --git a/devel/py-buildbot-www/distinfo b/devel/py-buildbot-www/distinfo index cef65c74cb2a..7fe8f1bc36ab 100644 --- a/devel/py-buildbot-www/distinfo +++ b/devel/py-buildbot-www/distinfo @@ -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 diff --git a/devel/py-buildbot/Makefile b/devel/py-buildbot/Makefile index 36afc1585f2c..c7ebfa8c1cfe 100644 --- a/devel/py-buildbot/Makefile +++ b/devel/py-buildbot/Makefile @@ -1,52 +1,62 @@ # Created by: Koop Mast PORTNAME= buildbot -PORTVERSION= 2.10.5 -PORTREVISION= 2 +PORTVERSION= 3.4.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= koobs@FreeBSD.org COMMENT= Continuous Integration Framework LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING 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}pyjwt1>=0:www/py-pyjwt1@${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} \ ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lz4>=0:archivers/py-lz4@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}buildbot-pkg>0:devel/py-buildbot-pkg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyjade>0:textproc/py-pyjade@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}parameterized>0:devel/py-parameterized@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}moto>0:devel/py-moto@${PY_FLAVOR} USES= cpe python:3.5+ USE_RC_SUBR= buildbot USE_PYTHON= autoplist concurrent distutils 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 # Old invocation that we will probably need later # ${MKDIR} ${WRKDIR}/tmp # cd ${WRKDIR}/tmp && TZ=UTC LANG=C PYTHONPATH=${WRKSRC} ${PYTHON_CMD} -m twisted.trial buildbot.test .include diff --git a/devel/py-buildbot/distinfo b/devel/py-buildbot/distinfo index 882fcfdec9c8..6e54364a558b 100644 --- a/devel/py-buildbot/distinfo +++ b/devel/py-buildbot/distinfo @@ -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 diff --git a/devel/py-buildbot/files/patch-setup.py b/devel/py-buildbot/files/patch-setup.py deleted file mode 100644 index 72d4d2091ad4..000000000000 --- a/devel/py-buildbot/files/patch-setup.py +++ /dev/null @@ -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,