From nobody Mon Oct 03 02:28:19 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 4MglBD1khGz4fBLP; Mon, 3 Oct 2022 02:28:20 +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 4MglBD0cKLz4P26; Mon, 3 Oct 2022 02:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664764100; 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=pYcPjGCmnKFjipOUmNmg9XTnm4h1SVALBU9Ryrv90MY=; b=wpR0OUOOAcVsC8E+2bw3ICswCttLAqYvhBJ+9HIJABXJcWbCBMiHPcgfQTpDYvmk+nmYIR J/VLSKnttlj748Ka0LIga5TwwXhdYn09lHqdc3nAdX6knsnJBuuUe+SAo7i447A733Tr4L DIAcL5EYucQGMTwIQO7PKELBgcY3FIBv4Yij0oT5wB0Bhhwn7yeaIYDIdl8A/vE/zNcsx/ A+vIv+xHPFXoEPnhu5OLCOE4TavRF8A/QB51C6U0HW0P89t6LK0fZLfjOtsbyoX7fCOzjs sNesDgDnBshYM1nVqMZqjbC5GOvateQ9OAuqe13h7Y6l6CmzFlzcm/fP6/Tv5Q== 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 4MglBC6fX7z13f9; Mon, 3 Oct 2022 02:28: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 2932SJwb002133; Mon, 3 Oct 2022 02:28:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2932SJ1j002132; Mon, 3 Oct 2022 02:28:19 GMT (envelope-from git) Date: Mon, 3 Oct 2022 02:28:19 GMT Message-Id: <202210030228.2932SJ1j002132@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 4c3ba3f3a06d - main - sysutils/conan: Allow build with py-yaml 6.0 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c3ba3f3a06df5c2c85eaa826bc04c0c25670156 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664764100; 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=pYcPjGCmnKFjipOUmNmg9XTnm4h1SVALBU9Ryrv90MY=; b=XPqdOv+R4QIfe0Z8+gDYFuMHeF9ip8wvm/mMuaq8WK/56CPI5nfniXHG1X6BujwPnY+HXV OnVYBpGMJ1qgoY8lmmLIKHotpX6FcCTRvsEMCzOXyd1OKmhzv39R6ujoqQW/1jwNTiZtoy /3/mb6ZPJ2KAOgX9iO3Js3DaKomcRHtbwQf7KF//BgrWaQufiBcvz9LDAfQ5mcKriLiwyY nICuiXgXBPMcgl1wZuFRQfI1hN73n2aS8QdCU2AGYJRo0W47m3n6yPvjHai7rTKggcbg6g yHRgEYVBz/tV9Fz4Wv9n6oC9cqJatizRjYs3NYU8zRIdqX7oEft18bRn5D6kAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664764100; a=rsa-sha256; cv=none; b=JRguB/c9gW1qK8GRAw72kys03zWFtUVzfdi1ifuo/loPsyDcxjwdMv5fPFFAsKemMaqrWp 9gVjViX5Vc5pFedVuWo3GPEL+aB2yvjBo1clqawX3pY5NkE0u9xbmLRkJHT3XHt6K8i5rA 4gepmg4nAaDRX71p86hELQQLpV1hocMaLx7dcieXjotjOct+/+f8SpEcyaw+Lin5hUTA3J eeJv3BAbwB7VWBL6rjf6zlMsZLOhw54GwMiRI/zHI/+zRlXqlqltLPFhp60LlLC/ruzCpq ED0lQtOfqE390qHbKQHaAlTXXYXVlu3jrfiUSlyBcSXDAj81Qao+lBE8R6aZBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=4c3ba3f3a06df5c2c85eaa826bc04c0c25670156 commit 4c3ba3f3a06df5c2c85eaa826bc04c0c25670156 Author: Po-Chuan Hsieh AuthorDate: 2022-10-03 02:18:13 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-10-03 02:22:56 +0000 sysutils/conan: Allow build with py-yaml 6.0 - While I'm here, remove superfluous , in *_DEPENDS from conans/requirements.txt: PyYAML>=3.11, <=6.0 Approved by: portmgr (blanket) With hat: python --- sysutils/conan/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sysutils/conan/Makefile b/sysutils/conan/Makefile index 03ba6759b992..88a299aaf382 100644 --- a/sysutils/conan/Makefile +++ b/sysutils/conan/Makefile @@ -12,24 +12,24 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md PY_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}bottle>=0.12.8:www/py-bottle@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.3,<0.5.0:devel/py-colorama@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.0,<3:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}colorama>=0.3.3<0.5.0:devel/py-colorama@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.0<3:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}deprecation>=2.0:devel/py-deprecation@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}distro>=1.0.2:sysutils/py-distro@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}fasteners>=0.14.1:devel/py-fasteners@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}future>=0.16.0,<0.19.0:devel/py-future@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}future>=0.16.0<0.19.0:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.9:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}node-semver>=0.6.1:devel/py-node-semver@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}patch-ng>=1.17.4,<1.18:devel/py-patch-ng@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}patch-ng>=1.17.4<1.18:devel/py-patch-ng@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pluginbase>=0.5:devel/py-pluginbase@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pygments>=2.0,<3.0:textproc/py-pygments@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyjwt>=2.4.0,<3.0.0:www/py-pyjwt@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.25,<3.0.0:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.10.0,<=1.16.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>=2.0<3.0:textproc/py-pygments@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyjwt>=2.4.0<3.0.0:www/py-pyjwt@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.25<3.0.0:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.10.0<=1.16.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}urllib3>=1.26.6,1<1.27,1:net/py-urllib3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tqdm>=4.28.1,<5:misc/py-tqdm@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}yaml>=3.11,<6.0:devel/py-yaml@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}tqdm>=4.28.1<5:misc/py-tqdm@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=3.11<6.0_99:devel/py-yaml@${PY_FLAVOR} BUILD_DEPENDS= ${PY_DEPENDS} RUN_DEPENDS= ${PY_DEPENDS}