From nobody Sat Oct 8 15:11:19 2022 X-Original-To: dev-commits-ports-branches@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 4Ml7tH2z6Hz4fXs4; Sat, 8 Oct 2022 15:11:19 +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 4Ml7tH2T0Wz3s4J; Sat, 8 Oct 2022 15:11:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665241879; 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=uEVXXPehJ7gFkhvrSJYmVcZuI0/Bobw+oT/cs5DZfBg=; b=xP3ke2Wo1HMjvLjB91uHGPVuKSm8dAZJNE3M6HJ4nPS1PRzVmTiHL59ujTzOMG2huIqOj5 EqxVwmTXxVBPSsZUKb9AKQvipSdPpejHpzKLhDSyxKrwbJ61vSmKoYnaSbXMetLjafZY8V j8U5F5+QnH3uOnvHeGa5aWCGGBR/eaMPRrAk9logcl8+5tcutXEpy53SCsoZZRO+snpZxs ihKBYvO7dBVVBcgLqgxGV0AxYFARV95dop1OemNtfwKUI8s+VN1SL5KCfIW/3LjwCfbxiA Jz+tGBnUXbDqcHJVv/WPoK3wrdFLiSon23VDncPj+wbhYIrOwAGggt9Wjc+YWA== 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 4Ml7tH1WhVzyjR; Sat, 8 Oct 2022 15:11:19 +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 298FBJdO021937; Sat, 8 Oct 2022 15:11:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 298FBJsZ021936; Sat, 8 Oct 2022 15:11:19 GMT (envelope-from git) Date: Sat, 8 Oct 2022 15:11:19 GMT Message-Id: <202210081511.298FBJsZ021936@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: 00268359bcd9 - 2022Q4 - misc/py-dictdiffer: Fix build List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: 00268359bcd94c574829d58fe9722fec4bf23917 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665241879; 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=uEVXXPehJ7gFkhvrSJYmVcZuI0/Bobw+oT/cs5DZfBg=; b=BncY7BcvzDgfSxgx7PvQsEw3DZoo74zTlxy7BjJa/EP3OndhUz8HR6gOb5AWJELT3qSK6W plyS7ECQFcINBszFMNpUHjOnAsvlXq6AwlHfAbjEU52s4/INF4VhzvjbwY1wr/gOcpb/k3 VGJU0ITklke0q25/uHlCt5Dhii7aDLO6xHF+Quk0/lhnCi4DaYZth+CfxTSOvkchpPLihG YnQ2n4s4ByycacMVLeqrTuKnyNuzDgvGS7vVAm5fWAkq9CNOMaBKSKuwv3nPSz5lfnS/2E i/fRSXrq/4NjM5PnX6C1egdNMOM+Tq0dt4NuCKnrT2zqeERMMU4iWqZIcP6wyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665241879; a=rsa-sha256; cv=none; b=qpCpttOPZ/dFt2SQHXBYnhLqf2T5QD4vObEmQaBbdKMMzSr42DAxSkHvkF3HZXbMpFTmHx pD1J1LIhFQ8zZRYKoleNa+vxDgecR+HOQpKkl4hKaToF4GiHSL5HJ3ICwOGQDeg05isr1+ h96poHIerx74daetbPbWXHmOP2DJjZ65Cu1sAQnYwc4mu8+s2uy5iIjjwzXPKcxmv1A6F6 DnEqwPMzfJUzubqgpysy9z4BjR57XI5ryJU1NiSONymZdYjXCu+oQxPB/RWtOzFYMzbKtb nVC3MfctbwyAfXSlS7xgHjzYk8ytWJYvJ4nDZo0ZK8CnpGeyrTUOR/t2quU79A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=00268359bcd94c574829d58fe9722fec4bf23917 commit 00268359bcd94c574829d58fe9722fec4bf23917 Author: Yuri Victorovich AuthorDate: 2022-10-05 03:11:51 +0000 Commit: Yuri Victorovich CommitDate: 2022-10-08 15:11:16 +0000 misc/py-dictdiffer: Fix build Python version comparison procedure thinks that the version 2.7 is greater than 6.0.0 for some reason. (cherry picked from commit 089cd58ec806c6e6f7a22ab269f90401d77889b1) --- misc/py-dictdiffer/Makefile | 4 ++-- misc/py-dictdiffer/files/patch-setup.py | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/misc/py-dictdiffer/Makefile b/misc/py-dictdiffer/Makefile index 215a005b4c29..14843ac0277c 100644 --- a/misc/py-dictdiffer/Makefile +++ b/misc/py-dictdiffer/Makefile @@ -11,8 +11,8 @@ WWW= https://github.com/inveniosoftware/dictdiffer LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-runner>=2.7:devel/py-pytest-runner@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.1.0:devel/py-setuptools_scm@${PY_FLAVOR} USES= python:3.6+ USE_PYTHON= distutils autoplist diff --git a/misc/py-dictdiffer/files/patch-setup.py b/misc/py-dictdiffer/files/patch-setup.py new file mode 100644 index 000000000000..1c2800241c52 --- /dev/null +++ b/misc/py-dictdiffer/files/patch-setup.py @@ -0,0 +1,13 @@ +- fix the problem that Python thinks that the version 2.7 is greater than 6.0.0 for pytest-runner + +--- setup.py.orig 2022-10-04 20:58:57 UTC ++++ setup.py +@@ -54,7 +54,7 @@ for key, reqs in extras_require.items(): + extras_require['all'].extend(reqs) + + setup_requires = [ +- 'pytest-runner>=2.7', ++ 'pytest-runner', + 'setuptools_scm>=3.1.0', + ] +