From nobody Mon Jan 24 14:13:08 2022 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 A5F54198A271; Mon, 24 Jan 2022 14:13:09 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JjBln3Pndz4vLL; Mon, 24 Jan 2022 14:13:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643033589; 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=nCJTjx9+MpDMIuYK9xvXPU4KDWuoCRkAvkiH5OfSS/0=; b=rN6hskpse7HrRb9N+TEyNUrTjAQqWEWCy1wwnA9+Ck2H2gDypvHl6UryYlSSh0Pwvz4Wzy fzJ7HNi8e0PRrr4GjKyRrckZZNikq0tCahqWr8qE0NgrYsGfF5Ql7W8eQtV0wurnywAyDM VDOYI4tS4T0DzQXWxnnQW85I5AM9XUPhYs+tl+sQUYFMYeVlc3FwGP9yXvQ31/KRMK+dip 8SnD0E5QSpAHaAUioVNnmBsFp5Aa2wLrwAHMKN4Pw+fky9BlYWz9r9+oQAJ0ypAriCxmTw Cwp255pPn0M4CKwxloIcY172WC/yhZw9i8Q1KYycAVRHBbzuqAFpC/I7Sf8D6Q== 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 CBF21174F5; Mon, 24 Jan 2022 14:13:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20OED8Ea033335; Mon, 24 Jan 2022 14:13:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20OED83v033334; Mon, 24 Jan 2022 14:13:08 GMT (envelope-from git) Date: Mon, 24 Jan 2022 14:13:08 GMT Message-Id: <202201241413.20OED83v033334@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 82c6311d4ee6 - 2022Q1 - devel/py-jaraco.functools: unbreak egg version after 87dd5acfed55 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: 82c6311d4ee6a3380ed0b310d30c1f5eb3cf0b2e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643033589; 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=nCJTjx9+MpDMIuYK9xvXPU4KDWuoCRkAvkiH5OfSS/0=; b=ErSl2nNUWGU/y9//phKQ6C2ih9bYYBRQ+evrXsxv8qZkpQW3rAhH3+YKQuF2ejuqREMH0u bSwkAFSzMZY8qLwyxl8wDSiwoead+Q3kFuTWvdr3Kp8NwPvYXvalVnFpiNEtgw3w8+QiwP /ppszU0AG/TvxzdDoUbgSrsJHTAT0L1K8asNSvomX8BH+xhq1xhFTn1d/x13JKlT3+5bLV e9Qi0HiEFVRNOIiAfuSyfudFL3AdMVi3u0VhICk1Ctcg9hC0SeF1tV/t2LdNNJPO4U1d8S RxY2egXL0NLD3h4QPP43PEbwcyxaNLCkD8pxVLN4SyyedNyLD/JP3LmCm3DQUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643033589; a=rsa-sha256; cv=none; b=PbiTJqZk4mEndgoN8WDnATOu/tU00I1s90VcqpOTWM7K0EOQWelS64H0kCgO6MFTZ8Ckz5 CfTRAOj2eEB7Zedug4Ca/nr4D4edPFsReubeuiCFDICNCpaccFCeU57VpnZaqodi47LC3L IVYLsYTsOrwPXk2FeAX/ojpUYrQdCSu9EjCJmmaBCFOABKSjFHXKc7qPSzQ0y+CNhR4Uhc oCqQXfJCVffb3QMpT/UNrM8uLTDM3XThX+eL8l4xJAJGk5sTdEHiWbAIKbUYIlG8fft/7l dmgTOa/qsb94cMY0MWSRU/2v3OZrYLjCKkqtUdMt332e9PYz3osL3JXVjgODZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=82c6311d4ee6a3380ed0b310d30c1f5eb3cf0b2e commit 82c6311d4ee6a3380ed0b310d30c1f5eb3cf0b2e Author: Jan Beich AuthorDate: 2022-01-24 14:08:45 +0000 Commit: Jan Beich CommitDate: 2022-01-24 14:12:41 +0000 devel/py-jaraco.functools: unbreak egg version after 87dd5acfed55 $ flexget Traceback (most recent call last): File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line 568, in _build_master ws.require(__requires__) File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line 886, in require needed = self.resolve(parse_requirements(requirements)) File "/usr/local/lib/python3.8/site-packages/pkg_resources/__init__.py", line 777, in resolve raise VersionConflict(dist, req).with_context(dependent_req) pkg_resources.ContextualVersionConflict: (jaraco.functools 0.0.0 (/usr/local/lib/python3.8/site-packages), Requirement.parse('jaraco.functools>=1.20'), {'tempora'}) (cherry picked from commit 99cf88e18192f9aa8aad49c1d5e8923d96db5559) --- devel/py-jaraco.functools/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/devel/py-jaraco.functools/Makefile b/devel/py-jaraco.functools/Makefile index 34fedc1a3f04..576ed0f67f2c 100644 --- a/devel/py-jaraco.functools/Makefile +++ b/devel/py-jaraco.functools/Makefile @@ -2,6 +2,7 @@ PORTNAME= jaraco.functools PORTVERSION= 3.4.0 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,6 +13,7 @@ COMMENT= Additional functools for Python LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.4.1:devel/py-setuptools_scm@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jaraco>=0:devel/py-jaraco@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}more-itertools>=2.7:devel/py-more-itertools@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jaraco.classes>=0:devel/py-jaraco.classes@${PY_FLAVOR} \