From nobody Sat Dec 14 16:57:24 2024 X-Original-To: dev-commits-ports-main@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 4Y9XSP15xMz5gTCc; Sat, 14 Dec 2024 16:57:25 +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 4Y9XSN6l80z57ZF; Sat, 14 Dec 2024 16:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734195444; 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=rBwTmhzy0/vn2ReR86MUn+/cTLW1/CNkU8UgQr5Db64=; b=JnzKsmsWDNEF8HU+0vSsHhwxtLQMfksttGOkgx+hy2Ii0gx7RlBlFIfgeUMnAhuGBkpPE2 yaC1/Fddjecs0K3nAJeTn8FF//0Q4Wcr9ZEKaqoRPL9fIPsf3FOQPMTbyUEhzmIdE68IpI +v4+iVdAQhNelwaM9CByzE0ZAn2XTtndJA0JjZM+MxdjnrQ2KaAt0g0h1As2MkCo9Jn3p6 NkfMc4Y9mVzcHx+JdAgPnsOE8+2d+dZ4eRsdx+GGoUdqXW8iBKi4WnLLFZItTky9Y6qaZk hmtoCb3dTtfClJISCL5DXDZahqRG0JkVoUYA4MYIveRyHp7zV/dbG8cxxno4Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734195444; 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=rBwTmhzy0/vn2ReR86MUn+/cTLW1/CNkU8UgQr5Db64=; b=GGHuTHWvCAmNvC96SuOnqsfkAwfUUgJRdnzcxzLIKOJ/FqF0L1WO+jPnEzFYpmbeaR1ZmV Ux+RbrADjIGHE+J0ATJpmBKFHFDn3HK/vyu6Gb+2eblOe+2rFwLBSI/NY5AD+5dQbRpRpu xdDRxVh9TEj1UnA8AKbpMpfWPJ1FTQF41UvjVay9yAWRzLmGKEe252J5myXj5HLfadqguP i8j5jRym3qczAmmkfE/hPsYVdoYAmsDOclPEBA+j0KYnmTPOheuKdES/S+5wIUzlbk0cq1 4XWK0PQP/qAuf0UYaVGeKshHrxGUi0jf6oCb4nVEoWLHfFjkECiQh7GJShCfDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734195444; a=rsa-sha256; cv=none; b=bjmR1R5ia0J01m0c/7EHcegN6M14kZ3AdF1GrtOUc60fLfMXs4Xy2kaT+XaMgGWCrdm9Dq c/ZJfBdxuiLfJ6WNyNHzdHpS/J0k4LM3phWqbJPsDqaDs0C71HMWhsIgo77Dfe7Bj2MKDo ZmnBF/kSEJyFlZNp5evqNTDFKxABrZ9hhn+E7z3e9z9WeXfqJH834WsZ8XBZHq+SzIRh51 Rhu9MM3GkP+273Rth/dPSMmO1vGIYiEuWmw2S8Pm6entcfUI4MpgU7X4Fi7HycjReLtywB OddjUeE0oPeY/LJVmaR6L8pOdk3Z6EITgTWrQWJbQ+EcDBzqbHS6qrAYoJhsIw== 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 4Y9XSN6MPPzWTM; Sat, 14 Dec 2024 16:57:24 +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 4BEGvOM9029753; Sat, 14 Dec 2024 16:57:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BEGvOMV029750; Sat, 14 Dec 2024 16:57:24 GMT (envelope-from git) Date: Sat, 14 Dec 2024 16:57:24 GMT Message-Id: <202412141657.4BEGvOMV029750@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: c0390c7452bc - main - devel/py-dj50-strawberry-graphql: Fix handling for CHANNELS option List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: c0390c7452bc8ec51e51f4e9cbd9db591bbe3746 Auto-Submitted: auto-generated The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=c0390c7452bc8ec51e51f4e9cbd9db591bbe3746 commit c0390c7452bc8ec51e51f4e9cbd9db591bbe3746 Author: James TD Smith AuthorDate: 2024-12-14 16:53:52 +0000 Commit: Kai Knoblich CommitDate: 2024-12-14 16:55:45 +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 --- 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 e2bf08616e0e..e8320fab75ee 100644 --- a/devel/py-dj50-strawberry-graphql/Makefile +++ b/devel/py-dj50-strawberry-graphql/Makefile @@ -1,5 +1,6 @@ PORTNAME= strawberry-graphql DISTVERSION= 0.251.0 +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} \