From nobody Sat Aug 26 09:32:40 2023 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 4RXs6x3Pgfz4rXt1; Sat, 26 Aug 2023 09:32:41 +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 4RXs6x1FL7z4QZd; Sat, 26 Aug 2023 09:32:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693042361; 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=ddJeOX3CpF8T6Y31L6B2R3aaDgAGAerJz0JqqQuvcNk=; b=ddh4z4/K5hMCtfNP8joy75FREbg3EFv2BUKn8DLMzxF4K9gSig0qM29Ptw/dpSYHa8UGAF reaCtBZ0tmx3jiXJ6gBhjLGuqKwdjyIHbYDGDPkAwJTmKUKbsEhJHvZRm3L5g84SWC0RTu Si/F6FxM6sJbCunpihPeTSlrDZB82XiIHuanbzwR52KHrzazCQ7HwzpVtoOxVtvh9VerT4 +gJyoXWLd65Br71gttl3/Ua5gAYHClSPeviPVHRT37QaOqpVG6xJBVt/MZjDdXXYnMJekc kaC/rBKLjeSoaZuoi+MyDbCTQ47NTBOwLKRz0Llbhxj2DeIsRv7sfxTeuBVQ5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693042361; 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=ddJeOX3CpF8T6Y31L6B2R3aaDgAGAerJz0JqqQuvcNk=; b=iTUeeu/RhYCIBidBQVd09ZdgQHH7yFCPjZO5fL1GydtmpsSXctJGo22U8ia+0AhycZejbY za2cSpbj1k3gOHhDPRFvLl3BAXBSAfuB0DgKxzva2bT/ekB4qEx8p2T7lfQW78faKfOL3g VqRd6nvABdu9LAibEZ0sLrnJEx3KoyAnXfnxgeC1F0zMj15/3IpLwfJOuPUUz+UpXuwHsA auaiiWsVzMMnDAGWGm6XecqNwHREkZVOFhwNJV+lYbPXLbTX1Z/sLnW/goXHSfq7+5y0WC mmt+qQ5ml8n1ACCV0ckEk7nAS+R+Z4gQ0iYGAZcnWxqgL+tE6wqvOqIGGI8Hyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693042361; a=rsa-sha256; cv=none; b=GO0/Y8zzYNX9QInL61mXjURY5/+q6MsJ94SoP9nGV+I5Pru4Rzx1EYpzMtdpjANrTuZSLq h5KaSsUK9JXzjhK1wVbSDNpMS4C3QaZU/+UfgRdgZJQrukvML/+EjfkPO0RChAT/1C51Qd Wi+sWseoITYITZ3iYayeMkcgiDZ85mvI+TUAHcK1qOaNeZ0lm6tGabtcgGJki/DoEK9ti6 WgCF5nT7Hkz7RCITUJ7cpjzUgniPjqzeXvD2Qc9Nf2jvfw2Dp+Oo+NWMkTAewgFqec0XHA AePMkYF7S6ZSxZZHsizyVJEXmJHcFD7MwUvkuwa2GkLGLB9UppJ+LL4tigttSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RXs6w6VdnzVsv; Sat, 26 Aug 2023 09:32:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37Q9Wetx099675; Sat, 26 Aug 2023 09:32:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37Q9WeER099672; Sat, 26 Aug 2023 09:32:40 GMT (envelope-from git) Date: Sat, 26 Aug 2023 09:32:40 GMT Message-Id: <202308260932.37Q9WeER099672@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: ec89a81d865d - main - net-im/py-matrix-synapse: Allow build with py-poetry-core 1.7.0 and py-setuptools-rust 1.7.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: ec89a81d865d3cec29036c2e3d64d1e4612f4842 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=ec89a81d865d3cec29036c2e3d64d1e4612f4842 commit ec89a81d865d3cec29036c2e3d64d1e4612f4842 Author: Po-Chuan Hsieh AuthorDate: 2023-08-26 09:29:28 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-08-26 09:29:28 +0000 net-im/py-matrix-synapse: Allow build with py-poetry-core 1.7.0 and py-setuptools-rust 1.7.0 - While I'm here, remove blank lines among *_DEPENDS --- net-im/py-matrix-synapse/Makefile | 6 ++---- net-im/py-matrix-synapse/files/patch-pyproject.toml | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile index d90b38eab66e..e9367d6616ae 100644 --- a/net-im/py-matrix-synapse/Makefile +++ b/net-im/py-matrix-synapse/Makefile @@ -12,9 +12,8 @@ WWW= https://www.matrix.org LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.1.0<=1.6.1:devel/py-poetry-core@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}setuptools-rust>=1.3:devel/py-setuptools-rust@${PY_FLAVOR} - +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.1.0<1.7.0_99:devel/py-poetry-core@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools-rust>=1.3<1.7.0_99:devel/py-setuptools-rust@${PY_FLAVOR} # Keep the RUN_DEPENDS layout similar to the pyproject.toml file RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=3.0.0:devel/py-jsonschema@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}immutabledict>=2.0:devel/py-immutabledict@${PY_FLAVOR} \ @@ -46,7 +45,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=3.0.0:devel/py-jsonschema@${PY_F ${PYTHON_PKGNAMEPREFIX}pydantic>=1.7.4:devel/py-pydantic@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pysaml2>=4.5.0:security/py-pysaml2@${PY_FLAVOR} \ ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss - TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}virtualenv>=15.0:devel/py-virtualenv@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tox>=2.3.1:devel/py-tox@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ diff --git a/net-im/py-matrix-synapse/files/patch-pyproject.toml b/net-im/py-matrix-synapse/files/patch-pyproject.toml index 5686b1433743..ffcc044afac2 100644 --- a/net-im/py-matrix-synapse/files/patch-pyproject.toml +++ b/net-im/py-matrix-synapse/files/patch-pyproject.toml @@ -1,8 +1,8 @@ ---- pyproject.toml.orig 2023-05-09 16:38:29 UTC +--- pyproject.toml.orig 2023-07-04 15:35:46 UTC +++ pyproject.toml -@@ -209,17 +209,6 @@ importlib_metadata = { version = ">=1.4", python = "<3 - # This is the most recent version of Pydantic with available on common distros. - pydantic = ">=1.7.4" +@@ -210,17 +210,6 @@ importlib_metadata = { version = ">=1.4", python = "<3 + # We are currently incompatible with >=2.0.0: (https://github.com/matrix-org/synapse/issues/15858) + pydantic = "^1.7.4" -# This is for building the rust components during "poetry install", which -# currently ignores the `build-system.requires` directive (c.f. @@ -18,3 +18,12 @@ # Optional Dependencies # --------------------- matrix-synapse-ldap3 = { version = ">=0.1", optional = true } +@@ -370,7 +359,7 @@ furo = ">=2022.12.7,<2024.0.0" + # system changes. + # We are happy to raise these upper bounds upon request, + # provided we check that it's safe to do so (i.e. that CI passes). +-requires = ["poetry-core>=1.1.0,<=1.6.0", "setuptools_rust>=1.3,<=1.6.0"] ++requires = ["poetry-core>=1.1.0,<=1.7.0", "setuptools_rust>=1.3,<=1.7.0"] + build-backend = "poetry.core.masonry.api" + +