From nobody Mon Jan 24 14:12:52 2022 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 11C13198A302; Mon, 24 Jan 2022 14:12:53 +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 4JjBlS6kp4z4v0d; Mon, 24 Jan 2022 14:12:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643033573; 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=dW+ePgcBKRgfTJN2QQpSNpC2GAZF/sOEyTGMv23S4Q0=; b=sW3VnuIxWXID16TAcBP8aO1V8vxU5tvy1Q4E0Jz+mSw+jNGRBE16gKQ6gw/aUDGqrRG+1F n80J3NaQJeUDNNYy5tj96c6qzMS/RoBelGC/zuBo5VEhrr4EZM2MVdw8PPTk4+NGVKcLqV Mv4W5hoEM6ouVXHaCmLwz89fu4o9Pk+d5ecLCCqu+Dy61Hl/MBnR04c6CMxrPq+q1LjsK9 sI12bM1QhSfgbF5Ulpx271SiQFrAI6VmirdyBvXO/hHaa8sYVeVLluUqg3Blw7mNP5jMD+ J76ZdqDn5eZNr60PPLE6UkomRLsnffbydBbXsVod88Zvm4zATquqwNHEj9L8YQ== 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 90B91176B8; Mon, 24 Jan 2022 14:12:52 +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 20OECqb9033091; Mon, 24 Jan 2022 14:12:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20OECqLM033090; Mon, 24 Jan 2022 14:12:52 GMT (envelope-from git) Date: Mon, 24 Jan 2022 14:12:52 GMT Message-Id: <202201241412.20OECqLM033090@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 99cf88e18192 - main - devel/py-jaraco.functools: unbreak egg version after 87dd5acfed55 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 99cf88e18192f9aa8aad49c1d5e8923d96db5559 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643033573; 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=dW+ePgcBKRgfTJN2QQpSNpC2GAZF/sOEyTGMv23S4Q0=; b=rukpugp5JIqNxF5QGwz7SSb/6jiIezqzDH2CbouH45NzGS4W5LJEvLmJty9HSEZ4IQXMfj O58Kri8iWq6tJkia1fcjDH60YB8T8RMnf6/Zvwf01UK0Axha+CCns8MsufhMkl0mHoZOf9 xvYPii89ltO3H3rhnqE6sfm7gnwZbdrVPtO1U3qivVGQF9EFopEYtxMzDAI0ziZfz0PjZj 2lCL8wTkkAIrDP4wMxLYNwLK3FcvjAFrlhyO/yLWe3X5AT9RAqLFOSo9UCmTih2lIHVtEr AbIe8rFdRJz5Ph1b+ZXlTx4aSVniwYzuzsQV8mgiMrROuibQhywkvKcr63hJpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643033573; a=rsa-sha256; cv=none; b=OPoOG9CI57UCL8CdNdlFx/FTo4diPX4hL3mFVVw/37JZ7DsbGJVTwZvcr35COQj9caf1/C rKHerWKojUZuG5Wc4pADu5nkOe+S9XgoD7PuaKz6Yg1B5X3ETJ0cwCFgjdevxOw7vog2s5 cWusqiKMP8C8xb4Zn5rKsYRZCscR57P//gT4R84ml1yi9+vHsfr1vZkD6chRC2YbYG9vax bhJTvQUC7dR96Bz2n6hHCqUOkUtpsTJarIV5lRuuBtoa49H07gk4M+I/i0NAUFRt4v3McI xohxJryJ3N8EKIqkf+mY3c578PGSoT/b9xoySNe6W4NSgIVCkSABMMkqdKl0bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=99cf88e18192f9aa8aad49c1d5e8923d96db5559 commit 99cf88e18192f9aa8aad49c1d5e8923d96db5559 Author: Jan Beich AuthorDate: 2022-01-24 14:08:45 +0000 Commit: Jan Beich CommitDate: 2022-01-24 14:10:30 +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'}) --- 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 88869a67ae7b..9948decb2274 100644 --- a/devel/py-jaraco.functools/Makefile +++ b/devel/py-jaraco.functools/Makefile @@ -2,6 +2,7 @@ PORTNAME= jaraco.functools PORTVERSION= 3.5.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} \