git: 5ca2026333e4 - 2024Q4 - devel/py-dj50-strawberry-graphql: Fix handling for CHANNELS option

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Kai Knoblich <kai_at_FreeBSD.org>
Date: Sun, 15 Dec 2024 11:03:36 UTC
The branch 2024Q4 has been updated by kai:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5ca2026333e4328d05ef459760d6eb0b997d851d

commit 5ca2026333e4328d05ef459760d6eb0b997d851d
Author:     James TD Smith <ahktenzero+freebsd@mohorovi.cc>
AuthorDate: 2024-12-14 16:53:52 +0000
Commit:     Kai Knoblich <kai@FreeBSD.org>
CommitDate: 2024-12-15 10:16:05 +0000

    devel/py-dj50-strawberry-graphql: Fix handling for CHANNELS option
    
    * The CHANNELS option, if enabled, installs www/py-channels, which
      pulls in www/py-django42.  The latter one conflicts with the
      DJANGO option, which installs www/py-django50, if enabled.
    
      Fix this issue by adjusting the CHANNELS option use the recently added
      www/py-dj50-channels, which uses www/py-django50, as a dependency.
    
    * Bump PORTREVISION due changed dependencies.
    
    Co-authored-by: Kai Knoblich <kai@FreeBSD.org>
    PR:             283045
    Reported by:    James TD Smith
    MFH:            2024Q4
    
    (cherry picked from commit c0390c7452bc8ec51e51f4e9cbd9db591bbe3746)
---
 devel/py-dj50-strawberry-graphql/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/devel/py-dj50-strawberry-graphql/Makefile b/devel/py-dj50-strawberry-graphql/Makefile
index f882219f53f8..6e1fbedf8f29 100644
--- a/devel/py-dj50-strawberry-graphql/Makefile
+++ b/devel/py-dj50-strawberry-graphql/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	strawberry-graphql
 DISTVERSION=	0.239.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}dj50-
@@ -43,7 +44,7 @@ AIOHTTP_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}aiohttp>=3.7.4:www/py-aiohttp@${PY_
 ASGI_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}multipart>=0.0.7:devel/py-multipart@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}starlette>=0.18.0:www/py-starlette@${PY_FLAVOR}
 CHANNELS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}asgiref>=3.2:www/py-asgiref@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}channels>=3.0.5:www/py-channels@${PY_FLAVOR}
+				${PYTHON_PKGNAMEPREFIX}dj50-channels>=3.0.5:www/py-dj50-channels@${PY_FLAVOR}
 CLI_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}libcst>=1.0.0:devel/py-libcst@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}pygments>=2.3:textproc/py-pygments@${PY_FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}rich>=12.0.0:textproc/py-rich@${PY_FLAVOR} \