From nobody Mon Jul 31 16:55:25 2023 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 4RF4QH1cZbz4pLDg; Mon, 31 Jul 2023 17:06:15 +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 4RF49p1dLhz3Kt2; Mon, 31 Jul 2023 16:55:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690822526; 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=JFoeqKzD/q/wM+63jJgHbSgjWw0Zp2D6RVGD246zjL8=; b=H0yFVxuKgoVn42eZbYYLGYZ3d303OmzPlxkoCxue1wmYrRDArW7BWenGpL3XNlFD/umCyQ qZFyVtnNyHg7G66+MDCrRdnp/ZZlcsYzT9ja9zMp7sggqFPhchucLPqjWvA1Fco4P6Uvuz Wqc8oF1dG6hHolKgFX+aa1mtC1+QrWPoIBtYKG4Y5q2Gs/WfPQkU4o7PtaIt2tg1MV/3cM TsMWzI5E5H98CeSAc46qVIjlRzMVARcWZSPqMMWUWdi8T4UO7Y/TjSHk03qmV+u378OmJj IIBc3AVl/WrN/MxzYIz5wxSRxkww/pBS0cH072h9Wg1R77vU2kNyNUEap64ZEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690822526; 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=JFoeqKzD/q/wM+63jJgHbSgjWw0Zp2D6RVGD246zjL8=; b=UHY1bbpb1J6LQN2B7TPqMLKECzJkq5su/rkBxiP6DJKHqEzHMoQ3D+Z0RD36PIRcqGJSG9 VE2/+zxXiJSzJz2nwzVE6hrh0i80rke0hxK5ZONwJ+sorRwx23ZiIn9tUAk+78OA1Tktf7 IPZ2kpiNNojb6WZaDj/6c8NFL29Czg7jhlzudaG0g5ITkfgBUClSG5Du9Kh5+cB02rGXht auJVCKhdmS3xY3Mw3Z19t6Z2qjWUmVMkVqgi4ysEGnXLpsPqbF76Trx21Es++tqe3hoIBG TyEoBLV6Kv1wSn3rsA3vy255CqxUyjuGnfyxGVepUF3AgmW46l8KaOrU3mHGzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690822526; a=rsa-sha256; cv=none; b=gNzj+w19Wjg8WFeXmBcvkbonEcDDoAw+SFfAkWh2BHX/35aZYt5cmIkFM183FpWi8MrJ6G UiKq2zeP2ffjAnr/8ILX3LqhOKb0zVaU3rrIXvjgbTrhVlDewpfsBkHFqMEBXTW6TMf+i+ WsTq6BZ8vZTTylpV9RGfEVJpEGwoOazgsnRP5h+VM25C05cPKQRgNrbrthEIPcaUKC1EjW uW2a706XyHSwsJ6WJkvwn47cw9QiWv2N2kN1LDYGCNiLg+D3BNYPlSKpXs/E5xyz+dgNpO EpfgeMO2BCVt910u0rgk4DB2c8XrEVChZvZOuLazJ2XJ70RsdIK4C16hKrH6Xg== 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 4RF49n3HkMz13lH; Mon, 31 Jul 2023 16:55:25 +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 36VGtPHa004863; Mon, 31 Jul 2023 16:55:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VGtP9w004861; Mon, 31 Jul 2023 16:55:25 GMT (envelope-from git) Date: Mon, 31 Jul 2023 16:55:25 GMT Message-Id: <202307311655.36VGtP9w004861@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: ae49c5155a63 - main - www/py-adblock: Fix build with py-maturin 0.14.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: ae49c5155a63d975b00003a64b238268167b96b7 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=ae49c5155a63d975b00003a64b238268167b96b7 commit ae49c5155a63d975b00003a64b238268167b96b7 Author: Po-Chuan Hsieh AuthorDate: 2023-07-31 16:39:11 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-07-31 16:42:10 +0000 www/py-adblock: Fix build with py-maturin 0.14.0+ ===> Building for py39-adblock-0.5.0_44 💥 maturin failed Caused by: The following metadata fields in `package.metadata.maturin` section of Cargo.toml are removed since maturin 0.14.0: classifier, requires-python, please set them in pyproject.toml as PEP 621 specifies. *** Error code 1 Stop. make: stopped in /usr/ports/www/py-adblock Approved by: portmgr (blanket) Obtained from: https://github.com/ArniDagur/python-adblock/commit/7597cd0b841a0ede22ff4cec6b4b91fb7d26a805 --- www/py-adblock/files/patch-maturin | 59 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/www/py-adblock/files/patch-maturin b/www/py-adblock/files/patch-maturin new file mode 100644 index 000000000000..a66468ec42b7 --- /dev/null +++ b/www/py-adblock/files/patch-maturin @@ -0,0 +1,59 @@ +Obtained from: https://github.com/ArniDagur/python-adblock/commit/7597cd0b841a0ede22ff4cec6b4b91fb7d26a805 + +--- Cargo.toml.orig 2021-06-26 20:50:00 UTC ++++ Cargo.toml +@@ -9,15 +9,6 @@ readme = "README.md" + homepage = "https://github.com/ArniDagur/python-adblock" + repository = "https://github.com/ArniDagur/python-adblock" + +-[package.metadata.maturin] +-classifier = [ +- "Programming Language :: Python", +- "Programming Language :: Rust", +- "License :: OSI Approved :: MIT License", +- "License :: OSI Approved :: Apache Software License", +-] +-requires-python = ">=3.6" +- + [profile.release] + debug = true + +--- pyproject.toml.orig 2021-06-26 20:50:00 UTC ++++ pyproject.toml +@@ -1,8 +1,18 @@ +-[tool.poetry] ++[project] + name = "adblock" + version = "0.0.0" + description = "Brave's adblocking in Python" +-authors = ["Árni Dagur "] ++requires-python = ">=3.6" ++authors = [ ++ {email = "arni@dagur.eu"}, ++ {name = "Árni Dagur"} ++] ++classifiers = [ ++ "Programming Language :: Python", ++ "Programming Language :: Rust", ++ "License :: OSI Approved :: MIT License", ++ "License :: OSI Approved :: Apache Software License", ++] + + [tool.poetry.dependencies] + python = "^3.6" +--- tests/test_metadata.py.orig 2021-06-26 20:50:00 UTC ++++ tests/test_metadata.py +@@ -52,10 +52,10 @@ def test_required_python_version(): + Make sure that the Python interpreter we're running this test suite on + falls into the required Python range. + """ +- with open("Cargo.toml", encoding="utf-8") as f: +- cargo_toml = toml.loads(f.read()) ++ with open("pyproject.toml", encoding="utf-8") as f: ++ pyproject_toml = toml.loads(f.read()) + +- required_python = cargo_toml["package"]["metadata"]["maturin"]["requires-python"] ++ required_python = pyproject_toml["project"]["requires-python"] + assert required_python.startswith(">=") + required_python = required_python[2:] + assert get_current_python_version() >= required_python