From nobody Thu Aug 10 08:25:43 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 4RM0P40kYcz4TnX7; Thu, 10 Aug 2023 08:25:44 +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 4RM0P40CLzz4TfL; Thu, 10 Aug 2023 08:25:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691655944; 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=9pspi1MaxO7mCRJ6poihbW5ACcyxTjHwYzaX49BHeHk=; b=D8iLjS2N/Tzchn/PnncCuTUqdsMIiIymxBAkOGJ5HknecydVJDAiUvnkyB0MaHJR+ypVS/ 5m1wBlY2m1fMdwXU2h19rmF61psu0Fe/NHUDjHEwHvmXL8XOEfoHCLS6d+MgXgwN9Lvz8m 6+nvFv5T5ueYXPvTZmkEQsefziRvRN4LToMd7WfuXAVIMu+pWQdhqcNvlS3tAxpRJWGANT YEXXCkGtTMy28+vLWj+lsY4LqCLUSSRaVnqW8CuKb9/RHb/DIM8//qYnRDCxRArnZ/qcHD d676wljkyRqBqIjrmaE6ohB36ryTaosvm4xUb4weOq+HFjWz/ZpKLynuoQgMRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691655944; 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=9pspi1MaxO7mCRJ6poihbW5ACcyxTjHwYzaX49BHeHk=; b=gcFYo6iVn99ttyQptMQB/MgEmkDVe2oj4EgBhpzUXTZiOBY3d4UvzkIQlUaHkReT6ln7iW QbSwT698055+IwYrr0kmSzSxEZsJ4a+n4tjHc2eQc5NYdgWQyeORURsMXHK4HRTYd7uJUB D7i7sqaXmfJjgvoqG9hG8WfAluft8t7UqvfB8zDSWcJYgW3+sQnB7zh2TmXssWojzQSTEg n/L4wWH1pzZRgi5vBRKIGM+OfaBuG382z+Jluokr3A0oSgs775hPa2l1d2tr++Z2vatzN5 JGIcEwtWE9yd3ussmz+/gKRLQ2lYFLkfWfgU7x13XJN9ld5mFkVJB4JAEbbSeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691655944; a=rsa-sha256; cv=none; b=HH+bkZd6wNuNTYc3M93mmsrtg/aBZD+abhg6tBXsVLAyoFD87e+XZ/zh2Vm/hlbDnOyslZ c+90V8NjAoiJS6+EM/ngtJxsM7BvVrjsF0NwKYLUxJhCLJyveVkl7NGeHHPHi/AIjgv11a wkc9Kp0l3kcVrK3FNrOrAESQXBUMC9wT5UgUSl4svp//t4liLoM6HNbZAcdnywf26+Axhu CyiOmsPGOxscFlHQombUWKXEQiofH26PWQgcCLB4ByVC8ze/NlFabYBMsin+3iA1AvdzFf OsBXqaszRl8fT93xvgT3MqlP7uDYq1JaivnlnASwvvevMQxReEuNrY+kDsqcZg== 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 4RM0P36LkFzqQc; Thu, 10 Aug 2023 08:25:43 +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 37A8PhBS025844; Thu, 10 Aug 2023 08:25:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37A8PhNm025841; Thu, 10 Aug 2023 08:25:43 GMT (envelope-from git) Date: Thu, 10 Aug 2023 08:25:43 GMT Message-Id: <202308100825.37A8PhNm025841@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: 44ddc3426e2f - main - devel/py-jellyfish: Prepare for py-maturin >= 1.x 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: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 44ddc3426e2f6f576dd0931fd2d2e78c7335f7bd Auto-Submitted: auto-generated The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=44ddc3426e2f6f576dd0931fd2d2e78c7335f7bd commit 44ddc3426e2f6f576dd0931fd2d2e78c7335f7bd Author: Kai Knoblich AuthorDate: 2023-08-10 08:18:51 +0000 Commit: Kai Knoblich CommitDate: 2023-08-10 08:18:51 +0000 devel/py-jellyfish: Prepare for py-maturin >= 1.x * Relax version requirements and add the additional directive "modulename" to point newer versions of py-maturin to the symbols of the binary module. Otherwise it emits following warning and leads to runtime errors: [...] Warning: Couldn't find the symbol `PyInit_jellyfish` in the native library. Python will fail to import this module. If you're using pyo3, check that `#[pymodule]` uses `jellyfish` as module name [...] * No PORTREVISION bump as the package doesn't change. PR: 272570 Approved by: portmgr (buildfix blanket) --- devel/py-jellyfish/Makefile | 2 +- devel/py-jellyfish/files/patch-pyproject.toml | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/devel/py-jellyfish/Makefile b/devel/py-jellyfish/Makefile index bd4909e2809d..8669afa443a0 100644 --- a/devel/py-jellyfish/Makefile +++ b/devel/py-jellyfish/Makefile @@ -13,7 +13,7 @@ WWW= https://github.com/jamesturk/jellyfish LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}maturin>=0.13<0.15:devel/py-maturin@${PY_FLAVOR} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}maturin>=0.13<2:devel/py-maturin@${PY_FLAVOR} USES= cargo python USE_PYTHON= autoplist concurrent pep517 diff --git a/devel/py-jellyfish/files/patch-pyproject.toml b/devel/py-jellyfish/files/patch-pyproject.toml index 56e799e9595d..545bef7a4035 100644 --- a/devel/py-jellyfish/files/patch-pyproject.toml +++ b/devel/py-jellyfish/files/patch-pyproject.toml @@ -3,7 +3,12 @@ @@ -1,5 +1,5 @@ [build-system] -requires = ["maturin>=0.14,<0.15"] -+requires = ["maturin>=0.13,<0.15"] ++requires = ["maturin>=0.13,<2"] build-backend = "maturin" [project] +@@ -24,3 +24,4 @@ python-source = "python" + [tool.maturin] + features = ["pyo3/extension-module", "python"] + python-source = "python" ++module-name = "jellyfish._rustyfish"