CVS commit: pkgsrc/net/py-flower

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb 15 16:38:15 UTC 2022

Modified Files:
        pkgsrc/net/py-flower: Makefile PLIST distinfo
Added Files:
        pkgsrc/net/py-flower/patches: patch-requirements_default.txt
Removed Files:
        pkgsrc/net/py-flower: ALTERNATIVES

Log Message:
py-flower: update to 1.0.0.

Changes not found. But note:

Important

Please note that from version 1.0.1 Flower uses Celery 5 and has
to be invoked in the same style as celery commands do.

The key takeaway here is that the Celery app's arguments have to
be specified after the celery command and Flower's arguments have
to be specified after the flower sub-command.

This is the template to follow:

celery [celery args] flower [flower args]


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 pkgsrc/net/py-flower/ALTERNATIVES
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/py-flower/Makefile \
    pkgsrc/net/py-flower/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/py-flower/PLIST
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/py-flower/patches/patch-requirements_default.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/py-flower/Makefile
diff -u pkgsrc/net/py-flower/Makefile:1.4 pkgsrc/net/py-flower/Makefile:1.5
--- pkgsrc/net/py-flower/Makefile:1.4   Wed Jan  5 20:47:36 2022
+++ pkgsrc/net/py-flower/Makefile       Tue Feb 15 16:38:15 2022
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2022/01/05 20:47:36 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2022/02/15 16:38:15 wiz Exp $
 
-DISTNAME=      flower-0.9.7
+DISTNAME=      flower-1.0.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=   2
 CATEGORIES=    net python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=f/flower/}
 
@@ -11,26 +10,22 @@ HOMEPAGE=   https://github.com/mher/flower
 COMMENT=       Real-time monitor and web admin for Celery task queue
 LICENSE=       modified-bsd
 
-# https://github.com/mher/flower/issues/1029
-BROKEN=                "Does not work with Celery 5.0"
-
-DEPENDS+=      ${PYPKGPREFIX}-celery>=4.3.0:../../net/py-celery
-DEPENDS+=      ${PYPKGPREFIX}-humanize-[0-9]*:../../textproc/py-humanize
+DEPENDS+=      ${PYPKGPREFIX}-celery>=5.0.5:../../net/py-celery
+DEPENDS+=      ${PYPKGPREFIX}-tornado>=5.0.0:../../www/py-tornado
 DEPENDS+=      ${PYPKGPREFIX}-prometheus_client>=0.8.0:../../net/py-prometheus_client
+DEPENDS+=      ${PYPKGPREFIX}-humanize-[0-9]*:../../textproc/py-humanize
 DEPENDS+=      ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
-DEPENDS+=      ${PYPKGPREFIX}-tornado>=5.0.0:../../www/py-tornado
-DEPENDS+=      ${PYPKGPREFIX}-vine>=1.3.0:../../devel/py-vine
 TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
+TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 
 USE_LANGUAGES= # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
-USE_PKG_RESOURCES=     yes
-
-post-install:
-       cd ${DESTDIR}${PREFIX}/bin && \
-       ${MV} flower flower-${PYVERSSUFFIX} || ${TRUE}
+# as of 1.0.0
+# 119 passed, 1 skipped, 752 warnings
+do-test:
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} pytest-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/py-flower/distinfo
diff -u pkgsrc/net/py-flower/distinfo:1.4 pkgsrc/net/py-flower/distinfo:1.5
--- pkgsrc/net/py-flower/distinfo:1.4   Tue Oct 26 11:06:36 2021
+++ pkgsrc/net/py-flower/distinfo       Tue Feb 15 16:38:15 2022
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:06:36 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/02/15 16:38:15 wiz Exp $
 
-BLAKE2s (flower-0.9.7.tar.gz) = 465d1d2f1a90cb212fb9662fdc63152913172a372b49518a16c797216b1dbf61
-SHA512 (flower-0.9.7.tar.gz) = ebb74e2b612962839fe4bc774f9bea98da08edf7804a6b7b2bdaafe5c9368312a05f3c9692204e25909dcdd8e9d15e6b6dd3eca829b5440af3e2b60d495602eb
-Size (flower-0.9.7.tar.gz) = 3526930 bytes
+BLAKE2s (flower-1.0.0.tar.gz) = 45b751898fd8a3de00ed9b63d813db74e409402d219f67139c0f7fc95f9c90db
+SHA512 (flower-1.0.0.tar.gz) = 9c4b93d0c7190d59c27cdeb43b193a71d4d5b07bac03a50591b87facb7bd17994799eb65cc37932c92c2eb699ba8424ef0d6c0a29433f1c231e012cbd0a284e8
+Size (flower-1.0.0.tar.gz) = 4266671 bytes
+SHA1 (patch-requirements_default.txt) = e842b396ca87f5489ce4e1655f7d7aa078eb7c2a

Index: pkgsrc/net/py-flower/PLIST
diff -u pkgsrc/net/py-flower/PLIST:1.2 pkgsrc/net/py-flower/PLIST:1.3
--- pkgsrc/net/py-flower/PLIST:1.2      Sat May  8 06:00:00 2021
+++ pkgsrc/net/py-flower/PLIST  Tue Feb 15 16:38:15 2022
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2021/05/08 06:00:00 adam Exp $
-bin/flower-${PYVERSSUFFIX}
+@comment $NetBSD: PLIST,v 1.3 2022/02/15 16:38:15 wiz Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt

Added files:

Index: pkgsrc/net/py-flower/patches/patch-requirements_default.txt
diff -u /dev/null pkgsrc/net/py-flower/patches/patch-requirements_default.txt:1.1
--- /dev/null   Tue Feb 15 16:38:15 2022
+++ pkgsrc/net/py-flower/patches/patch-requirements_default.txt Tue Feb 15 16:38:15 2022
@@ -0,0 +1,13 @@
+$NetBSD: patch-requirements_default.txt,v 1.1 2022/02/15 16:38:15 wiz Exp $
+
+Relax restrictions.
+
+--- requirements/default.txt.orig      2021-05-16 01:11:31.000000000 +0000
++++ requirements/default.txt
+@@ -1,5 +1,5 @@
+ celery>=5.0.5
+-tornado>=5.0.0,<7.0.0
++tornado>=5.0.0
+ prometheus_client>=0.8.0
+ humanize
+ pytz