From nobody Wed Aug 14 15:41:43 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 4WkXYM5RxRz5SLgv; Wed, 14 Aug 2024 15:41:43 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WkXYM4vskz4y8h; Wed, 14 Aug 2024 15:41:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723650103; 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=Z7rctEgIWNEk8kAzqeO4JKm+jk7SorqwOgOrMS720wo=; b=u+R3vwdTU3EO8+fbiUqlC4MR0/RnPXVWZrp/j42cwY0XPSCZRQBQeX00T+A3Se7vfbrOPZ nJtwv951hqJHucJkWQQfFGJrRYXIqPfUqFmgSrZkpEhqVQRV3ua7cd2M1JAog3iXIwgRkV nCYjyntBqcoaCQnYSNlRjeF1FFfKKhHJ0HuGrHkyQ+RQbeuWqk8Z8orn5X1p9uBIyvd426 mcoc7yAGktM6VYzeZs5RcVh/InacFz9QSxE+FPTYe9JiBnbzPA4BcjRco/KpClPYrVnvkM j52AkTZSQ1pE9AfeFvIuRUsnNi/y4/yt4at7t++Ld2unp86fsp2lByy2ZGBAcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723650103; a=rsa-sha256; cv=none; b=TNZ3uSVZIuzRS8hQdOiGqRoyRll9u9EzUy+GKTDVJ6DYfy6o5q5TAZCde0rHzcXjYBvtnJ /3lbYlSoq+eMiSvjG0+ueA89TMgylf3T+TTw34MUvns/JzmPq5SS7s5i8u3CwLrswKhmPy 7fh7IRBR+ugboBWylOkuXGjQxzmJx3avBgnbKMwa6xeD2lcUxhSwJGg/CJJlmi2WrqiEDx UeFtMgMLYn/uSrVXXj/mYCDV6bBB0fjLJ4fPo0pL/yqdb0hvmWPHZhhngNxVS21Wpr91BV u6A+RBJTO9Kig+U27D/2NKpqfLmfRgDyI/id6fx23Gi/p5iszcLehwRS8OCUnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723650103; 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=Z7rctEgIWNEk8kAzqeO4JKm+jk7SorqwOgOrMS720wo=; b=xGx3ZAUkjrndHcSbMDTzes0ORWBpwLA/RdKZixDU/E5+Fxw7oZgf3iPI32rgLBx1JBbkrV eNy9gAQO/A7u5pQK5qSHkCOrDYbpr09irgb79fdWHaJ8hpd3P2NtdnlyLaeTDkz51APvJ3 mtweNMVimwJTqak3cngQLcGJkYAf+JVB4Y69pM3yGKIKaHMqnx+oy41zu74WIZUg/eiekF IuMoNUM8ukxRc4bF11IjYRVXcyu3VweWc1utrVFwgpq03AkMsvot63cgT8sL1c10iALtzv fLkdH+ymXnUY1iPoZ0K06h0nxHzITNa1gvVBzRhZd7U8p0NoTYZ/dEjwabQsKQ== 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 4WkXYM4RTxz10gh; Wed, 14 Aug 2024 15:41:43 +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 47EFfhxk099528; Wed, 14 Aug 2024 15:41:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47EFfh0N099525; Wed, 14 Aug 2024 15:41:43 GMT (envelope-from git) Date: Wed, 14 Aug 2024 15:41:43 GMT Message-Id: <202408141541.47EFfh0N099525@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nicola Vitale Subject: git: 060ca335549e - main - devel/py-virtualenv: Fix build caused by conflicting dependencies 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: nivit X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 060ca335549ee124e729c771477913eb7dff1882 Auto-Submitted: auto-generated The branch main has been updated by nivit: URL: https://cgit.FreeBSD.org/ports/commit/?id=060ca335549ee124e729c771477913eb7dff1882 commit 060ca335549ee124e729c771477913eb7dff1882 Author: Nicola Vitale AuthorDate: 2024-08-14 15:20:34 +0000 Commit: Nicola Vitale CommitDate: 2024-08-14 15:39:08 +0000 devel/py-virtualenv: Fix build caused by conflicting dependencies - Temporarly disable DOCS option due to the conflit between the docs build-dependency textproc/py-towncrier with textproc/py-towncrier23, which the other dependency py-sphinxcontrib-towncrier now depends on. I prefer to disable this option instead of changing the dependency to py-towncrier23 because a user may have already installed py-towncrier in the system for other reasons before updating. Other reference: https://github.com/sphinx-contrib/sphinxcontrib-towncrier/issues/92 - Bump PORTREVISION PR: 280687 --- devel/py-virtualenv/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/devel/py-virtualenv/Makefile b/devel/py-virtualenv/Makefile index 7f36b46ce631..14ae2d969e66 100644 --- a/devel/py-virtualenv/Makefile +++ b/devel/py-virtualenv/Makefile @@ -1,5 +1,7 @@ PORTNAME= virtualenv +# Check XXX below before updating to see if that condition is still valid PORTVERSION= 20.26.3 +PORTREVISION= 1 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -45,8 +47,12 @@ TEST_ENV= PYTHONIOENCODING=utf-8 \ NO_ARCH= yes -OPTIONS_DEFINE= DOCS +# XXX: Temporarly disable DOCS option due to the issue reported at +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=280687 +# https://github.com/sphinx-contrib/sphinxcontrib-towncrier/issues/92 +#OPTIONS_DEFINE= DOCS +DOCS_BINARY_ALIAS= towncrier=towncrier-${PYTHON_VER} DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click-default-group>=1.2.4:devel/py-click-default-group@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}filelock>=3.12.2:sysutils/py-filelock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}furo>=2023.7.26:textproc/py-furo@${PY_FLAVOR} \ @@ -56,7 +62,6 @@ DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click-default-group>=1.2.4:devel/py-c ${PYTHON_PKGNAMEPREFIX}sphinx>=5.3.0:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-towncrier>=0.3.2a0:textproc/py-sphinxcontrib-towncrier@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}towncrier>=22.12.0:textproc/py-towncrier@${PY_FLAVOR} -DOCS_BINARY_ALIAS= towncrier=towncrier-${PYTHON_VER} DOCS_PLIST_FILES= share/man/man1/virtualenv.1.gz DOCS_PORTDOCS= * .buildinfo