From nobody Tue Oct 04 23:20:59 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 4Mhtx75h8Kz4dxbD; Tue, 4 Oct 2022 23:20:59 +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 4Mhtx74vp3z3RBs; Tue, 4 Oct 2022 23:20:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664925659; 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=MZZzyiUR756CqsaJb6JNdiLyBK8/3a1XlW//7v4uEhc=; b=jicONbbRZvSjy4tBUypx+EylGz9RJ+ML0UrHtuBdNZJLLiAcc/WoeJ+5NwhP51OPDGvebX yi7a4MxosjHZJFgvZEX8gVj/ud19ENTs+7Aq96al8w5wC8yuACGpA49ha6wnKQkEPkhOS1 i8Bq3vlAa2u3epXl0U6S6JUIkdKIi1meVkx6ZSZbzW2NDkjMiAghTZ3skhbs3bADV5Exw+ IZXPzzDegod82aSzqCmqCSOriqTbJ7N7QO1Q+B/+b+0tTiWs0pVivU+WHRmcgt4NF18qJj 2P3vP9eyHsz1FuqmevmsjoTzsUGSR1kZKY45wxSKAKbxFlClMg6aMIrQVP/llQ== 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 4Mhtx73ykWzjYv; Tue, 4 Oct 2022 23:20:59 +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 294NKxbI069674; Tue, 4 Oct 2022 23:20:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 294NKxh4069673; Tue, 4 Oct 2022 23:20:59 GMT (envelope-from git) Date: Tue, 4 Oct 2022 23:20:59 GMT Message-Id: <202210042320.294NKxh4069673@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 089cd58ec806 - main - misc/py-dictdiffer: Fix build 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 089cd58ec806c6e6f7a22ab269f90401d77889b1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664925659; 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=MZZzyiUR756CqsaJb6JNdiLyBK8/3a1XlW//7v4uEhc=; b=cQawFaAjCtGxKn6RDuDg0hYtppaw4z/0D3For0QyWJCKVVcBTkGYnvhoNEEp1JqvSStWVm be+vAJ4iAk1JzdjGR6ZkBi/j5HMlxiEwexnWr1J8QGB9yrvOupKh1fOMw50QW8u+RedGtc vNrkauXeEyQxBr5eSlc64AsUigh4fZtpKHP6Lax07akkWAYGJLY8E516UUMJYOzQYk+/UT 0NDu7pmza9UQhn16NTqtnhILZeoGLUN2eG8pw4TmspPnjvbQh5gUxVygFSdBbJg/qvmdhD sJnrvb22d8Uk1WqCYGkHDScBWjAp4DD63vVK7wxsrMIGbIJCizLqfal5zAB5HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664925659; a=rsa-sha256; cv=none; b=IDMojXXHzyViutBX1DEe13Sw2E13F6q556l9NvqJCKAdmyJWejSvV4i9tp+SvYdahtE3gS aMypxEWIzaClsnNKG6p72lf1jSxdZ86PimKB61dmOg+YuD1+L0raBulLqW7YCp2icrQsy7 2iZ6Pn4veRDuPYNeQVTDkGbAwXtxre+TwDVP1+qta9OiUoazV101eY8buJxxuxVOE7svFG X7eqmRdrpuaOiXwpT9C967VlOZs6xeIPhCQ6AM9Ct2LhIfaiMUSUAbLn7xazaRgnZl8yEW VPiHSjdxr5uyZZzEmrKOznYjP8aY3dn38mqKO+milG2FVpvxuurnRMaKaYnn7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=089cd58ec806c6e6f7a22ab269f90401d77889b1 commit 089cd58ec806c6e6f7a22ab269f90401d77889b1 Author: Yuri Victorovich AuthorDate: 2022-10-05 03:11:51 +0000 Commit: Yuri Victorovich CommitDate: 2022-10-04 23:20:42 +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. --- 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', + ] +