From nobody Sat Mar 9 14:19:01 2024 X-Original-To: dev-commits-ports-all@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 4TsQBt1HN9z5DJ2R; Sat, 9 Mar 2024 14:19:02 +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 4TsQBt0YM1z49RY; Sat, 9 Mar 2024 14:19:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709993942; 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=5fmyuuQ+a3uTTfmcU1ZjIcaoNU9V1xApPOUV8dRIwMc=; b=VTXdRMH8DxdyM4UTq+xY4PyJtImvZOBl21UZbYrbQ120LV/6x8ykcwpZ3bzOlq2YihghD2 W3DGKUyKDv1HZQiW0QkcXijfgN6Zc8WpfAEttMvKtJ3dRqgaTTtrTlb9sxB/u9uOROIcG4 afPuKumI8TmHXV7N+oBc7+M3FZ+bLwZgWgG1drmy+a+78u79o6D9VUbAShByeao/tuaMf/ gz0e2sUsM57Sm21kRhO6ccKn7dU/sfPGCfez3+Q0Q0IX3W8fQ2/kxvLs3S09FCid7Fb5f/ yeeMyLTNy0qs8c8Cs81XIt/ugaQze4srXI7swYmYytqPtCnCO45Nx3n3P1QT1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709993942; a=rsa-sha256; cv=none; b=H/BwtqxZbg7c0TT73LPaRolzCc+bTfj8aoQnLhvH7jyC3kfJr0pd1jUawxu0Tw60CN4Z8Z 6003CBPiIaIWs9AjC8Fr3UAGshOYHy+6Ocq8LKIOf9C4UlkPUooN0IAsSX7fs6elk3mI/t CvwPoah33CDz+hQtsU9kUKiCKQhIX6dhtK3evRlPOkWITXulcmzh9ZfvqNMkUheQIDRjI9 vj0j/fTsR1PFcMD7dtsMnm69HcC0CNTUOPOguNHtJytRHroHuEe4X7guwlSL07agBW07bM L4olXxmQYHtQqV64CviUuNsbv7K240YEWKSyXCKa9V62mGLGdBqiw27qcddQzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709993942; 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=5fmyuuQ+a3uTTfmcU1ZjIcaoNU9V1xApPOUV8dRIwMc=; b=aZUKEMm4XgW+P8IRdvIBnAXUfJmFKxhoOQWKjgPlNPxFrFBTi7KQXGsd4fozlFYxqe3vpX G9H4ganLD8IaFZfBVdmDkXk0pDhB3H6TpIE9XsGw4ru7RzUC1roc98F2+d6Hy0PCk/Q/xE KOvdfjkrzZXh9yNg4PmcygiovbYSB7t4o6eapbJYlYLtWMC9rTzOi7347abbxfBAtVaYFK e7Oh17TNrmaUlkVs/N97BfC6+sh033Fup8WJ0MkwyHOSoFG1W3LBexVqR78ZfLheLxxXUl Jfrz//PUImsA4MUUv76qy/20R1eZ5pnZCvuvN3yls4NMBDPZThraXb6EzquS3Q== 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 4TsQBs73H7z15Nl; Sat, 9 Mar 2024 14:19:01 +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 429EJ1lS028930; Sat, 9 Mar 2024 14:19:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 429EJ1Pg028927; Sat, 9 Mar 2024 14:19:01 GMT (envelope-from git) Date: Sat, 9 Mar 2024 14:19:01 GMT Message-Id: <202403091419.429EJ1Pg028927@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: be25bb2a2d2b - main - net-im/py-matrix-synapse: Allow build with py-poetry-core 1.9.0 and py-setuptools-rust 1.9.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: be25bb2a2d2bf5f4854595713605b513800756b5 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=be25bb2a2d2bf5f4854595713605b513800756b5 commit be25bb2a2d2bf5f4854595713605b513800756b5 Author: Po-Chuan Hsieh AuthorDate: 2024-03-09 13:57:31 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-03-09 14:07:22 +0000 net-im/py-matrix-synapse: Allow build with py-poetry-core 1.9.0 and py-setuptools-rust 1.9.0 --- net-im/py-matrix-synapse/Makefile | 4 ++-- net-im/py-matrix-synapse/files/patch-pyproject.toml | 13 +++++++++++-- net-im/py-matrix-synapse/files/patch-setup.py | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile index c7e897c557bf..9be42abad62c 100644 --- a/net-im/py-matrix-synapse/Makefile +++ b/net-im/py-matrix-synapse/Makefile @@ -13,8 +13,8 @@ WWW= https://www.matrix.org LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.1.0<=1.8.1:devel/py-poetry-core@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}setuptools-rust>=1.3<=1.8.1_99:devel/py-setuptools-rust@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.1.0<1.9.0_99:devel/py-poetry-core@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools-rust>=1.3<1.9.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} \ diff --git a/net-im/py-matrix-synapse/files/patch-pyproject.toml b/net-im/py-matrix-synapse/files/patch-pyproject.toml index a264188218ba..0289fd6dd633 100644 --- a/net-im/py-matrix-synapse/files/patch-pyproject.toml +++ b/net-im/py-matrix-synapse/files/patch-pyproject.toml @@ -1,6 +1,6 @@ ---- pyproject.toml.orig 2023-10-31 14:05:31 UTC +--- pyproject.toml.orig 2023-12-12 15:52:05 UTC +++ pyproject.toml -@@ -216,17 +216,6 @@ packaging = ">=20.0" +@@ -216,17 +216,6 @@ pydantic = ">=1.7.4, <3" # See https://github.com/matrix-org/synapse/issues/15858 pydantic = ">=1.7.4, <3" @@ -18,3 +18,12 @@ # Optional Dependencies # --------------------- matrix-synapse-ldap3 = { version = ">=0.1", optional = true } +@@ -382,7 +371,7 @@ furo = ">=2022.12.7,<2024.0.0" + # runtime errors caused by build 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.8.1", "setuptools_rust>=1.3,<=1.8.1"] ++requires = ["poetry-core>=1.1.0,<=1.9.0", "setuptools_rust>=1.3,<=1.9.0"] + build-backend = "poetry.core.masonry.api" + + diff --git a/net-im/py-matrix-synapse/files/patch-setup.py b/net-im/py-matrix-synapse/files/patch-setup.py index 5b7664929f74..7b58e4d5030c 100644 --- a/net-im/py-matrix-synapse/files/patch-setup.py +++ b/net-im/py-matrix-synapse/files/patch-setup.py @@ -1,6 +1,6 @@ --- setup.py.orig 1970-01-01 00:00:00 UTC +++ setup.py -@@ -175,7 +175,6 @@ install_requires = \ +@@ -172,7 +172,6 @@ install_requires = \ 'pydantic>=1.7.4,<3', 'pymacaroons>=0.13.0', 'service-identity>=18.1.0',