From nobody Sun Dec 15 11:03:36 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YB0Yh3TSkz5ggYq; Sun, 15 Dec 2024 11:03:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YB0Yh2cBgz4ZN2; Sun, 15 Dec 2024 11:03:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734260616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H4Myp+AhK0PACEYmIALmvcfhaqTPY3lQv5Kd3EiEKKY=; b=nN31pWqm/uJT60TuW+n+SmryHoRHP/56+ElepxhxFsg5+zoM6s66+dR2Tjrx1B7+mcwYXN 6Ay45AE7QOkZxApFFe96U3JQmrjax21uCX95vXa/Ff+3Sxoc9Q5KmNbQLsQZ7jDDlbNtTf 4JhgCXAnnrEeoj0BjN3GWMBNlS76mgXeHCqkTSIp9U5UqaR8a5uFBFfqLqs2RCGLBoUNSH ePpjyXVSNz1pwt6pig4TuWjFgsZYkZQvkKmxCRXIYk4rDTb0RzUR33gfd7WIV5AuCGm5LO KVHf3DKrCCDj2OoKipMrv6wpWG0pV44wmQOJmLdgIA68C48MZdZz0I/QdDAWwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734260616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H4Myp+AhK0PACEYmIALmvcfhaqTPY3lQv5Kd3EiEKKY=; b=coNl6z8pepzxXynu6PGt3bw/A56xLZ2KCIAR6CPgcXC9e8jvXN0AiIVN6nGXXE7T/jIalg ZsfI8Qr1lf1V3pe24t9HibvD2933nmJaeCMp0Wp4U7gEtTH456sc7mV8ZuEUYr5Tcjj+XC 7lniw9gy1xysShTuXvdNESe+Jt9H4MlwQGCFa/1iKqp/WX8p9tG0tzwFkgzKRX8ARMxfRJ DtdLw3JsvsMBkDEU7ZVnBBcgAk/XDQZPRbWNMDRySX2sFSjf/1tWTgAF5gAYXYo0QSYD1z KlkMaB/z49XY1lB1EevCHRwxGA4vCKKHtgl+R+2FUX8aI5vxia1XNTlvmNJ4mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734260616; a=rsa-sha256; cv=none; b=nXenmkrXDsirx7YPTw2k8GfKB9XR67/eMK07SKqb2NELca/NNf1A1eUOVBdMcC8vOYiCru f/w+hPAWyxjMWF9CH/IF/3bbEEevg2XlpOI0W5Un15WbP50CVyE8hyTl2Kz/oiRLxvCJQg p+mQpRHI586DpcDvBpnjNkjthGqMm8FM23WTRts2sf+MgQoxl2OLu0NakYkVBvtRAmbkPG kChtCIMhtt46gSSQqx4fy62iMR6EMN/T/Hj31Tn511IR8hlASK9vC2Ab22uXCuZOOFHe1m LLmRaGI+AmPq7eoiCAXc7ip8U5b+Wp+cZkg8fhq26+lj5ZUzMKo7WtZn94QCJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YB0Yh2CmPz15FK; Sun, 15 Dec 2024 11:03:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BFB3avc056091; Sun, 15 Dec 2024 11:03:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BFB3aog056088; Sun, 15 Dec 2024 11:03:36 GMT (envelope-from git) Date: Sun, 15 Dec 2024 11:03:36 GMT Message-Id: <202412151103.4BFB3aog056088@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kai Knoblich Subject: git: 5ca2026333e4 - 2024Q4 - devel/py-dj50-strawberry-graphql: Fix handling for CHANNELS option List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kai X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: 5ca2026333e4328d05ef459760d6eb0b997d851d Auto-Submitted: auto-generated The branch 2024Q4 has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=5ca2026333e4328d05ef459760d6eb0b997d851d commit 5ca2026333e4328d05ef459760d6eb0b997d851d Author: James TD Smith AuthorDate: 2024-12-14 16:53:52 +0000 Commit: Kai Knoblich 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 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} \